merging latest dev

Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-12-18 10:34:49 -08:00
parent 874bbbfca3 798a8478ed
commit 8b041f5280
696 changed files with 130352 additions and 13278 deletions
@@ -58,7 +58,10 @@ def launch_and_validate_results(request, test_directory, editor, editor_script,
    if null_renderer:
        editor.args.extend(["-rhi=Null"])
    if enable_prefab_system:
-        editor.args.extend(["--regset=/Amazon/Preferences/EnablePrefabSystem=true"])
+        from os import path
+        editor.args.extend([
+            "--regset=/Amazon/Preferences/EnablePrefabSystem=true",
+            f"--regset-file={os.path.join(workspace.paths.engine_root(), 'Registry', 'prefab.test.setreg')}"])
    else:
        editor.args.extend(["--regset=/Amazon/Preferences/EnablePrefabSystem=false"])

@@ -39,7 +39,6 @@ def get_prefab_file_path(prefab_path):
        prefab_path = name + ".prefab"
    return prefab_path

-
 def get_all_entity_ids():
    return entity.SearchBus(bus.Broadcast, 'SearchEntities', entity.SearchFilter())