merge from development

Signed-off-by: sweeneys <sweeneys@amazon.com>
2021-11-12 14:47:08 -08:00
parent 10619d53bf 57adfd795e
commit 3ae8f8b199
1676 changed files with 212117 additions and 6819 deletions
@@ -31,4 +31,4 @@ class TestAutomation(TestAutomationBase):

        from . import Editor_NewExistingLevels_Works as test_module

-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module, extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=false"])