Merge branch 'main' into LoadPipelineFromGitHub

This commit is contained in:
Brian Herrera
2021-03-26 17:05:57 -07:00
765 changed files with 11513 additions and 20246 deletions
+1 -1
View File
@@ -69,7 +69,7 @@ def override_bootstrap_cfg(package_env):
print('Override values in bootstrap.cfg')
engine_root = package_env.get('ENGINE_ROOT')
bootstrap_path = os.path.join(engine_root, 'bootstrap.cfg')
replace_values = {'sys_game_folder':'{}'.format(package_env.get('BOOTSTRAP_CFG_GAME_FOLDER'))}
replace_values = {'project_path':'{}'.format(package_env.get('BOOTSTRAP_CFG_GAME_FOLDER'))}
try:
with open(bootstrap_path, 'r') as bootstrap_cfg:
content = bootstrap_cfg.read()
@@ -9,6 +9,7 @@
".p4ignore": "#exclude",
".submodules": "#exclude",
"**/*.pyc": "#exclude",
"**/*.pdb": "#exclude"
"**/*.pdb": "#exclude",
"build/*/packages/*/*.stamp": "#exclude"
}
}