Merge branch 'main' into JsonSerializationTypeIdBug

AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py

@@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 from ActorSplitsAfterDamage import Tests
 
-def run():
-    from ActorSplitsAfterDamage import run as internal_run
-    from editor_python_test_tools.utils import Constants
+def ActorSplitsAfterCapsuleDamage():
+    from ActorSplitsAfterDamage import base_run as internal_run
+    from BlastUtils import Constants
 
     def CapsuleDamage(target_id, position0):
         position1 = azlmbr.object.construct('Vector3', position0.x + 1.0, position0.y, position0.z)
@@ -30,4 +30,8 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+
+    from editor_python_test_tools.utils import Report
+    Report.start_test(ActorSplitsAfterCapsuleDamage)

AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py

@@ -22,7 +22,7 @@ class Tests():
 # fmt: on
 
 
-def run():
+def ActorSplitsAfterCollision():
 
     """
     Summary:
@@ -60,8 +60,8 @@ def run():
     import azlmbr.legacy.general as general
     import azlmbr.bus
 
-    from editor_python_test_tools.utils import CollisionHandler
-    from editor_python_test_tools.utils import BlastNotificationHandler
+    from BlastUtils import CollisionHandler
+    from BlastUtils import BlastNotificationHandler
 
     # Constants
     TIMEOUT = 2.0
@@ -107,4 +107,8 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+
+    from editor_python_test_tools.utils import Report
+    Report.start_test(ActorSplitsAfterCollision)

AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py

@@ -20,7 +20,7 @@ class Tests():
 # fmt: on
 
 
-def run(damage_func):
+def base_run(damage_func):
 
     """
     Summary:
@@ -56,7 +56,7 @@ def run(damage_func):
     import azlmbr.legacy.general as general
     import azlmbr.bus
 
-    from editor_python_test_tools.utils import BlastNotificationHandler
+    from BlastUtils import BlastNotificationHandler
 
     # Constants
     TIMEOUT = 2.0

AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py

@@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 from ActorSplitsAfterDamage import Tests
 
-def run():
-    from ActorSplitsAfterDamage import run as internal_run
-    from editor_python_test_tools.utils import Constants
+def ActorSplitsAfterImpactSpreadDamage():
+    from ActorSplitsAfterDamage import base_run as internal_run
+    from BlastUtils import Constants
 
     def ImpactSpreadDamage(target_id, position):
         azlmbr.destruction.BlastFamilyDamageRequestBus(azlmbr.bus.Event, "Impact Spread Damage", target_id,
@@ -28,4 +28,8 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+
+    from editor_python_test_tools.utils import Report
+    Report.start_test(ActorSplitsAfterImpactSpreadDamage)

AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py

@@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 from ActorSplitsAfterDamage import Tests
 
-def run():
-    from ActorSplitsAfterDamage import run as internal_run
-    from editor_python_test_tools.utils import Constants
+def ActorSplitsAfterRadialDamage():
+    from ActorSplitsAfterDamage import base_run as internal_run
+    from BlastUtils import Constants
 
     def RadialDamage(target_id, position):
         azlmbr.destruction.BlastFamilyDamageRequestBus(azlmbr.bus.Event, "Radial Damage", target_id,
@@ -28,4 +28,8 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+
+    from editor_python_test_tools.utils import Report
+    Report.start_test(ActorSplitsAfterRadialDamage)

AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py

@@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 from ActorSplitsAfterDamage import Tests
 
-def run():
-    from ActorSplitsAfterDamage import run as internal_run
-    from editor_python_test_tools.utils import Constants
+def ActorSplitsAfterShearDamage():
+    from ActorSplitsAfterDamage import base_run as internal_run
+    from BlastUtils import Constants
 
     def ShearDamage(target_id, position):
         normal = azlmbr.object.construct('Vector3', 1.0, 0.0, 0.0)
@@ -29,4 +29,8 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+
+    from editor_python_test_tools.utils import Report
+    Report.start_test(ActorSplitsAfterShearDamage)

AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py

@@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 from ActorSplitsAfterDamage import Tests
 
-def run():
-    from ActorSplitsAfterDamage import run as internal_run
-    from editor_python_test_tools.utils import Constants
+def ActorSplitsAfterStressDamage():
+    from ActorSplitsAfterDamage import base_run as internal_run
+    from BlastUtils import Constants
 
     def StressDamage(target_id, position):
         force = azlmbr.object.construct('Vector3', 0.0, 0.0, -100.0)  # Should be enough to break `brittle` objects
@@ -28,4 +28,8 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+
+    from editor_python_test_tools.utils import Report
+    Report.start_test(ActorSplitsAfterStressDamage)

AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py

@@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 from ActorSplitsAfterDamage import Tests
 
-def run():
-    from ActorSplitsAfterDamage import run as internal_run
-    from editor_python_test_tools.utils import Constants
+def ActorSplitsAfterTriangleDamage():
+    from ActorSplitsAfterDamage import base_run as internal_run
+    from BlastUtils import Constants
 
     def TriangleDamage(target_id, position):
         # Some points that form a triangle that contains the given position
@@ -32,4 +32,8 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+
+    from editor_python_test_tools.utils import Report
+    Report.start_test(ActorSplitsAfterTriangleDamage)

AutomatedTesting/Gem/PythonTests/CMakeLists.txt

@@ -19,37 +19,50 @@ add_subdirectory(assetpipeline)
 add_subdirectory(atom_renderer)
 
 ## Physics ##
-# DISABLED - see LYN-2536
-#if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
-#    ly_add_pytest(
-#        NAME AutomatedTesting::PhysicsTests
-#        TEST_SUITE main
-#        TEST_SERIAL
-#        PATH ${CMAKE_CURRENT_LIST_DIR}/physics/TestSuite_Active.py
-#        TIMEOUT 3600
-#        RUNTIME_DEPENDENCIES
-#            Legacy::Editor
-#            Legacy::CryRenderNULL
-#            AZ::AssetProcessor
-#            AutomatedTesting.Assets
-#        COMPONENT
-#            Physics
-#    )
-#    ly_add_pytest(
-#        NAME AutomatedTesting::PhysicsTests_Sandbox
-#        TEST_SUITE sandbox
-#        TEST_SERIAL
-#        PATH ${CMAKE_CURRENT_LIST_DIR}/physics/TestSuite_Sandbox.py
-#        TIMEOUT 3600
-#        RUNTIME_DEPENDENCIES
-#            Legacy::Editor
-#            Legacy::CryRenderNULL
-#            AZ::AssetProcessor
-#            AutomatedTesting.Assets
-#        COMPONENT
-#            Physics
-#    )
-#endif()
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
+    ly_add_pytest(
+        NAME AutomatedTesting::PhysicsTests_Main
+        TEST_SUITE main
+        TEST_SERIAL
+        PATH ${CMAKE_CURRENT_LIST_DIR}/physics/TestSuite_Main.py
+        TIMEOUT 3600
+        RUNTIME_DEPENDENCIES
+            Legacy::Editor
+            Legacy::CryRenderNULL
+            AZ::AssetProcessor
+            AutomatedTesting.Assets
+        COMPONENT
+            Physics
+    )
+    ly_add_pytest(
+        NAME AutomatedTesting::PhysicsTests_Periodic
+        TEST_SUITE periodic
+        TEST_SERIAL
+        PATH ${CMAKE_CURRENT_LIST_DIR}/physics/TestSuite_Periodic.py
+        TIMEOUT 3600
+        RUNTIME_DEPENDENCIES
+            Legacy::Editor
+            Legacy::CryRenderNULL
+            AZ::AssetProcessor
+            AutomatedTesting.Assets
+        COMPONENT
+            Physics
+    )
+    ly_add_pytest(
+        NAME AutomatedTesting::PhysicsTests_Sandbox
+        TEST_SUITE sandbox
+        TEST_SERIAL
+        PATH ${CMAKE_CURRENT_LIST_DIR}/physics/TestSuite_Sandbox.py
+        TIMEOUT 3600
+        RUNTIME_DEPENDENCIES
+            Legacy::Editor
+            Legacy::CryRenderNULL
+            AZ::AssetProcessor
+            AutomatedTesting.Assets
+        COMPONENT
+            Physics
+    )
+endif()
 
 ## ScriptCanvas ##
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
@@ -82,23 +95,22 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
 endif()
 
 ## White Box ##
-# DISABLED - See LYN-2663
-#if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
-#    ly_add_pytest(
-#        NAME AutomatedTesting::WhiteBoxTests
-#        TEST_SUITE main
-#        TEST_SERIAL
-#        PATH ${CMAKE_CURRENT_LIST_DIR}/WhiteBox/TestSuite_Active.py
-#        TIMEOUT 3600
-#        RUNTIME_DEPENDENCIES
-#            Legacy::Editor
-#            Legacy::CryRenderNULL
-#            AZ::AssetProcessor
-#            AutomatedTesting.Assets
-#        COMPONENT
-#            WhiteBox
-#    )
-#endif()
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
+    ly_add_pytest(
+        NAME AutomatedTesting::WhiteBoxTests
+        TEST_SUITE main
+        TEST_SERIAL
+        PATH ${CMAKE_CURRENT_LIST_DIR}/WhiteBox/TestSuite_Active.py
+        TIMEOUT 3600
+        RUNTIME_DEPENDENCIES
+            Legacy::Editor
+            Legacy::CryRenderNULL
+            AZ::AssetProcessor
+            AutomatedTesting.Assets
+        COMPONENT
+            WhiteBox
+    )
+endif()
 
 ## NvCloth ##
 # [TODO LYN-1928] Enable when AutomatedTesting runs with Atom
@@ -158,7 +170,7 @@ endif()
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_pytest(
         NAME AutomatedTesting::BlastTests
-        TEST_SUITE periodic
+        TEST_SUITE main
         TEST_SERIAL TRUE
         PATH ${CMAKE_CURRENT_LIST_DIR}/Blast/TestSuite_Active.py
         TIMEOUT 3600
@@ -166,6 +178,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
             Legacy::Editor
             AZ::AssetProcessor
             AutomatedTesting.Assets
+        COMPONENT Blast
     )
 endif()
 
@@ -178,8 +191,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
 
 ## DynVeg ##
     ly_add_pytest(
-        NAME DynamicVegetationTests_Main_GPU
-        TEST_REQUIRES gpu
+        NAME AutomatedTesting::DynamicVegetationTests_Main
         TEST_SERIAL
         TEST_SUITE main
         PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
@@ -195,8 +207,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
     )
 
     ly_add_pytest(
-        NAME DynamicVegetationTests_Sandbox_GPU
-        TEST_REQUIRES gpu
+        NAME AutomatedTesting::DynamicVegetationTests_Sandbox
         TEST_SERIAL
         TEST_SUITE sandbox
         PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
@@ -212,8 +223,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
     )
 
     ly_add_pytest(
-        NAME DynamicVegetationTests_Periodic_GPU
-        TEST_REQUIRES gpu
+        NAME AutomatedTesting::DynamicVegetationTests_Periodic
         TEST_SERIAL
         TEST_SUITE periodic
         PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/dyn_veg
@@ -229,8 +239,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
 
 ## LandscapeCanvas ##
     ly_add_pytest(
-        NAME LandscapeCanvasTests_Main
-        TEST_REQUIRES gpu
+        NAME AutomatedTesting::LandscapeCanvasTests_Main
         TEST_SERIAL
         TEST_SUITE main
         PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/landscape_canvas
@@ -245,8 +254,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
     )
 
     ly_add_pytest(
-        NAME LandscapeCanvasTests_Periodic
-        TEST_REQUIRES gpu
+        NAME AutomatedTesting::LandscapeCanvasTests_Periodic
         TEST_SERIAL
         TEST_SUITE periodic
         PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/landscape_canvas
@@ -262,8 +270,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
 
 ## GradientSignal ##
     ly_add_pytest(
-        NAME GradientSignalTests_Periodic
-        TEST_REQUIRES gpu
+        NAME AutomatedTesting::GradientSignalTests_Periodic
         TEST_SERIAL
         TEST_SUITE periodic
         PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/gradient_signal
@@ -281,7 +288,7 @@ endif()
 ## Editor ##
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_FOUNDATION_TEST_SUPPORTED)
     ly_add_pytest(
-        NAME EditorTests_Periodic
+        NAME AutomatedTesting::EditorTests_Periodic
         TEST_SUITE periodic
         TEST_SERIAL
         PATH ${CMAKE_CURRENT_LIST_DIR}/editor
@@ -299,7 +306,7 @@ endif()
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
     # Unstable, SPEC-3838 will restore
     #ly_add_pytest(
-    #    NAME asset_load_benchmark_test
+    #    NAME AutomatedTesting::asset_load_benchmark_test
     #    TEST_SERIAL
     #    TEST_SUITE benchmark
     #    PATH ${CMAKE_CURRENT_LIST_DIR}/streaming/benchmark/asset_load_benchmark_test.py

AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py

@@ -32,7 +32,7 @@ def teardown_editor(editor):
 
 
 def launch_and_validate_results(request, test_directory, editor, editor_script, expected_lines, unexpected_lines=[],
-                                halt_on_unexpected=False, run_python="--runpythontest", auto_test_mode=True, null_renderer=False, cfg_args=[],
+                                halt_on_unexpected=False, run_python="--runpythontest", auto_test_mode=True, null_renderer=True, cfg_args=[],
                                 timeout=300):
     """
     Runs the Editor with the specified script, and monitors for expected log lines.
@@ -58,7 +58,7 @@ def launch_and_validate_results(request, test_directory, editor, editor_script,
     if auto_test_mode:
         editor.args.extend(["--autotest_mode"])
     if null_renderer:
-        editor.args.extend(["-rhi=null"])
+        editor.args.extend(["-rhi=Null"])
 
     with editor.start():
 

AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py

@@ -278,6 +278,12 @@ class Tracer:
             self.function = args[3]
             self.message = args[4]
             
+        def __str__(self):
+            return f"Warning: [{self.filename}:{self.function}:{self.line}]: [{self.window}] {self.message}"
+            
+        def __repr__(self):
+            return f"[Warning: {self.message}]"
+            
     class ErrorInfo:
         def __init__(self, args):
             self.window = args[0]
@@ -285,6 +291,12 @@ class Tracer:
             self.line = args[2]
             self.function = args[3]
             self.message = args[4]
+            
+        def __str__(self):
+            return f"Error: [{self.filename}:{self.function}:{self.line}]: [{self.window}] {self.message}"
+        
+        def __repr__(self):
+            return f"[Error: {self.message}]"
     
     class AssertInfo:
         def __init__(self, args):
@@ -292,6 +304,12 @@ class Tracer:
             self.line = args[1]
             self.function = args[2]
             self.message = args[3]
+        
+        def __str__(self):
+            return f"Assert: [{self.filename}:{self.function}:{self.line}]: {self.message}"
+            
+        def __repr__(self):
+            return f"[Assert: {self.message}]"
     
     def _on_warning(self, args):
         warningInfo = Tracer.WarningInfo(args)

AutomatedTesting/Gem/PythonTests/WhiteBox/C28798177_WhiteBox_AddComponentToEntity.py

@@ -22,10 +22,10 @@ class Tests():
 # fmt:on
 
 
-def run():
+def C28798177_WhiteBox_AddComponentToEntity():
     import os
     import sys
-    import WhiteBoxInit as init
+    from Gems.WhiteBox.Editor.Scripts import WhiteBoxInit as init
     import ImportPathHelper as imports
     imports.init()
 
@@ -58,4 +58,8 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+
+    from editor_python_test_tools.utils import Report
+    Report.start_test(C28798177_WhiteBox_AddComponentToEntity)

AutomatedTesting/Gem/PythonTests/WhiteBox/C28798205_WhiteBox_SetInvisible.py

@@ -22,13 +22,13 @@ class Tests():
 # fmt:on
 
 
-def run():
+def C28798205_WhiteBox_SetInvisible():
     # note: This automated test does not fully replicate the test case in Test Rail as it's
     # not currently possible using the Hydra API to get an EntityComponentIdPair at runtime,
     # in future game_mode will be activated and a runtime White Box Component queried
     import os
     import sys
-    import WhiteBoxInit as init
+    from Gems.WhiteBox.Editor.Scripts import WhiteBoxInit as init
     import ImportPathHelper as imports
     import editor_python_test_tools.hydra_editor_utils as hydra
     imports.init()
@@ -68,4 +68,8 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+    
+    from editor_python_test_tools.utils import Report
+    Report.start_test(C28798205_WhiteBox_SetInvisible)

AutomatedTesting/Gem/PythonTests/WhiteBox/C29279329_WhiteBox_SetDefaultShape.py

@@ -26,10 +26,10 @@ class Tests():
 
 critical_shape_check = ("Default shape has more than 0 sides", "default shape has 0 sides")
 
-def run():
+def C29279329_WhiteBox_SetDefaultShape():
     import os
     import sys
-    import WhiteBoxInit as init
+    from Gems.WhiteBox.Editor.Scripts import WhiteBoxInit as init
     import ImportPathHelper as imports
     imports.init()
 
@@ -107,4 +107,8 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+    
+    from editor_python_test_tools.utils import Report
+    Report.start_test(C29279329_WhiteBox_SetDefaultShape)

AutomatedTesting/Gem/PythonTests/atom_renderer/CMakeLists.txt

@@ -16,7 +16,7 @@
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_BUILD_TESTS_SUPPORTED AND AutomatedTesting IN_LIST LY_PROJECTS)
     ly_add_pytest(
-        NAME AtomRenderer::HydraTestsMain
+        NAME AutomatedTesting::AtomRenderer_HydraTests_Main
         TEST_SUITE main
         PATH ${CMAKE_CURRENT_LIST_DIR}/test_Atom_MainSuite.py
         TEST_SERIAL
@@ -26,4 +26,15 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_BUILD_TESTS_SUPPORTED AND AutomatedT
             AutomatedTesting.Assets
             Editor
     )
+    ly_add_pytest(
+        NAME AutomatedTesting::AtomRenderer_HydraTests_Sandbox
+        TEST_SUITE sandbox
+        PATH ${CMAKE_CURRENT_LIST_DIR}/test_Atom_SandboxSuite.py
+        TEST_SERIAL
+        TIMEOUT 300
+        RUNTIME_DEPENDENCIES
+            AssetProcessor
+            AutomatedTesting.Assets
+            Editor
+    )
 endif()

AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py

@@ -7,25 +7,10 @@ distribution (the "License"). All use of this software is governed by the Licens
 or, if provided, by the license below or the license accompanying this file. Do not
 remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Hydra script that creates an entity and attaches Atom components to it for test verification.
 """
 
-# This module does a bulk test and update of many components at once.
-# Each test case is listed below in the format:
-#     "Test Case ID: Test Case Title (URL)"
-
-# C32078130: Tone Mapper (https://testrail.agscollab.com/index.php?/cases/view/32078130)
-# C32078129: Light (https://testrail.agscollab.com/index.php?/cases/view/32078129)
-# C32078131: Radius Weight Modifier (https://testrail.agscollab.com/index.php?/cases/view/32078131)
-# C32078127: PostFX Layer (https://testrail.agscollab.com/index.php?/cases/view/32078127)
-# C32078126: Point Light (https://testrail.agscollab.com/index.php?/cases/view/32078126)
-# C32078125: Physical Sky (https://testrail.agscollab.com/index.php?/cases/view/32078125)
-# C32078115: Global Skylight (IBL) (https://testrail.agscollab.com/index.php?/cases/view/32078115)
-# C32078121: Exposure Control (https://testrail.agscollab.com/index.php?/cases/view/32078121)
-# C32078120: Directional Light (https://testrail.agscollab.com/index.php?/cases/view/32078120)
-# C32078119: DepthOfField (https://testrail.agscollab.com/index.php?/cases/view/32078119)
-# C32078118: Decal (https://testrail.agscollab.com/index.php?/cases/view/32078118)
-# C32078117: Area Light (https://testrail.agscollab.com/index.php?/cases/view/32078117)
-
 import os
 import sys
 
@@ -41,10 +26,6 @@ sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "P
 
 import editor_python_test_tools.hydra_editor_utils as hydra
 from editor_python_test_tools.utils import TestHelper
-from editor_python_test_tools.editor_test_helper import EditorTestHelper
-
-
-EditorTestHelper = EditorTestHelper(log_prefix="AtomEditorComponents")
 
 
 def run():
@@ -151,28 +132,6 @@ def run():
     # Wait for Editor idle loop before executing Python hydra scripts.
     TestHelper.init_idle()
 
-    # Create a new level.
-    new_level_name = "tmp_level"  # Specified in TestAllComponentsBasicTests.py
-    heightmap_resolution = 512
-    heightmap_meters_per_pixel = 1
-    terrain_texture_resolution = 412
-    use_terrain = False
-
-    # Return codes are ECreateLevelResult defined in CryEdit.h
-    return_code = general.create_level_no_prompt(
-        new_level_name, heightmap_resolution, heightmap_meters_per_pixel, terrain_texture_resolution, use_terrain)
-    if return_code == 1:
-        general.log(f"{new_level_name} level already exists")
-    elif return_code == 2:
-        general.log("Failed to create directory")
-    elif return_code == 3:
-        general.log("Directory length is too long")
-    elif return_code != 0:
-        general.log("Unknown error, failed to create level")
-    else:
-        general.log(f"{new_level_name} level created successfully")
-    EditorTestHelper.after_level_load(bypass_viewport_resize=True)
-
     # Delete all existing entities initially
     search_filter = azlmbr.entity.SearchFilter()
     all_entities = entity.SearchBus(azlmbr.bus.Broadcast, "SearchEntities", search_filter)
@@ -209,12 +168,12 @@ def run():
             entity_obj, ["Capsule Shape"], area_light))
 
     # Decal Component
-    material_asset_path = os.path.join("Materials", "decal", "aiirship_nose_number_decal.material")
+    material_asset_path = os.path.join("AutomatedTesting", "Materials", "basic_grey.material")
     material_asset = asset.AssetCatalogRequestBus(
         bus.Broadcast, "GetAssetIdByPath", material_asset_path, math.Uuid(), False)
     ComponentTests(
-        "Decal", lambda entity_obj: verify_set_property(
-            entity_obj, "Settings|Decal Settings|Material", material_asset))
+        "Decal (Atom)", lambda entity_obj: verify_set_property(
+            entity_obj, "Controller|Configuration|Material", material_asset))
 
     # DepthOfField Component
     camera_entity = hydra.Entity("camera_entity")
@@ -263,9 +222,12 @@ def run():
     # Radius Weight Modifier Component
     ComponentTests("Radius Weight Modifier")
 
-    # Spot Light Component
+    # Light Component
     ComponentTests("Light")
 
+    # Display Mapper Component
+    ComponentTests("Display Mapper")
+
 
 if __name__ == "__main__":
     run()

AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py

@@ -7,40 +7,29 @@ distribution (the "License"). All use of this software is governed by the Licens
 or, if provided, by the license below or the license accompanying this file. Do not
 remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-"""
 
+Main suite tests for the Atom renderer.
+"""
 import logging
 import os
-import pytest
 
-import ly_test_tools.environment.file_system as file_system
+import pytest
 
 import editor_python_test_tools.hydra_test_utils as hydra
 
 logger = logging.getLogger(__name__)
-EDITOR_TIMEOUT = 60
+EDITOR_TIMEOUT = 120
 TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "atom_hydra_scripts")
 
 
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
-@pytest.mark.parametrize("level", ["tmp_level"])
-class TestAtomEditorComponents(object):
-    @pytest.fixture(autouse=True)
-    def setup_teardown(self, request, workspace, project, level):
-        # Cleanup our temp level
-        file_system.delete(
-            [os.path.join(workspace.paths.engine_root(), project, "Levels", "AtomLevels", level)], True, True)
-
-        def teardown():
-            # Cleanup our temp level
-            file_system.delete(
-                [os.path.join(workspace.paths.engine_root(), project, "Levels", "AtomLevels", level)], True, True)
-
-        request.addfinalizer(teardown)
+@pytest.mark.parametrize("level", ["auto_test"])
+class TestAtomEditorComponentsMain(object):
 
     @pytest.mark.test_case_id(
-        "C32078130",  # Tone Mapper
+        "C32078117",  # Area Light
+        "C32078130",  # Display Mapper
         "C32078129",  # Light
         "C32078131",  # Radius Weight Modifier
         "C32078127",  # PostFX Layer
@@ -68,18 +57,18 @@ class TestAtomEditorComponents(object):
             "Area Light_test: UNDO entity deletion works: True",
             "Area Light_test: REDO entity deletion works: True",
             # Decal Component
-            "Decal Entity successfully created",
-            "Decal_test: Component added to the entity: True",
-            "Decal_test: Component removed after UNDO: True",
-            "Decal_test: Component added after REDO: True",
-            "Decal_test: Entered game mode: True",
-            "Decal_test: Exit game mode: True",
-            "Decal Settings|Decal Settings|Material: SUCCESS",
-            "Decal_test: Entity is hidden: True",
-            "Decal_test: Entity is shown: True",
-            "Decal_test: Entity deleted: True",
-            "Decal_test: UNDO entity deletion works: True",
-            "Decal_test: REDO entity deletion works: True",
+            "Decal (Atom) Entity successfully created",
+            "Decal (Atom)_test: Component added to the entity: True",
+            "Decal (Atom)_test: Component removed after UNDO: True",
+            "Decal (Atom)_test: Component added after REDO: True",
+            "Decal (Atom)_test: Entered game mode: True",
+            "Decal (Atom)_test: Exit game mode: True",
+            "Decal (Atom) Controller|Configuration|Material: SUCCESS",
+            "Decal (Atom)_test: Entity is hidden: True",
+            "Decal (Atom)_test: Entity is shown: True",
+            "Decal (Atom)_test: Entity deleted: True",
+            "Decal (Atom)_test: UNDO entity deletion works: True",
+            "Decal (Atom)_test: REDO entity deletion works: True",
             # DepthOfField Component
             "DepthOfField Entity successfully created",
             "DepthOfField_test: Component added to the entity: True",
@@ -198,6 +187,18 @@ class TestAtomEditorComponents(object):
             "Light_test: Entity deleted: True",
             "Light_test: UNDO entity deletion works: True",
             "Light_test: REDO entity deletion works: True",
+            # Display Mapper Component
+            "Display Mapper Entity successfully created",
+            "Display Mapper_test: Component added to the entity: True",
+            "Display Mapper_test: Component removed after UNDO: True",
+            "Display Mapper_test: Component added after REDO: True",
+            "Display Mapper_test: Entered game mode: True",
+            "Display Mapper_test: Exit game mode: True",
+            "Display Mapper_test: Entity is hidden: True",
+            "Display Mapper_test: Entity is shown: True",
+            "Display Mapper_test: Entity deleted: True",
+            "Display Mapper_test: UNDO entity deletion works: True",
+            "Display Mapper_test: REDO entity deletion works: True",
         ]
 
         unexpected_lines = [

AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py

@@ -0,0 +1,24 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+Sandbox suite tests for the Atom renderer.
+"""
+
+import pytest
+
+
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
+@pytest.mark.parametrize("level", ["auto_test"])
+class TestAtomEditorComponentsSandbox(object):
+
+    # It requires at least one test
+    def test_Dummy(self, request, editor, level, workspace, project, launcher_platform):
+        pass

AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py

@@ -94,13 +94,13 @@ class TestAutomationBase:
         editor_starttime = time.time()
         self.logger.debug("Running automated test")
         testcase_module_filepath = self._get_testcase_module_filepath(testcase_module)
-        pycmd = ["--runpythontest", testcase_module_filepath, "-BatchMode", "-autotest_mode", "-NullRenderer"] + extra_cmdline_args
+        pycmd = ["--runpythontest", testcase_module_filepath, "-BatchMode", "-autotest_mode", "-rhi=null"] + extra_cmdline_args
         editor.args.extend(pycmd) # args are added to the WinLauncher start command
         editor.start(backupFiles = False, launch_ap = False)
         try:
             editor.wait(TestAutomationBase.MAX_TIMEOUT)
         except WaitTimeoutError:
-            errors.append(TestRunError("TIMEOUT", "Editor did not close after {TestAutomationBase.MAX_TIMEOUT} seconds, verify the test is ending and the application didn't freeze"))
+            errors.append(TestRunError("TIMEOUT", f"Editor did not close after {TestAutomationBase.MAX_TIMEOUT} seconds, verify the test is ending and the application didn't freeze"))
             editor.kill()
             
         output = editor.get_output()
@@ -118,16 +118,16 @@ class TestAutomationBase:
             else:
                 error_str = "Test failed, no output available..\n"
             errors.append(TestRunError("FAILED TEST", error_str))
-            if return_code != TestAutomationBase.TEST_FAIL_RETCODE: # Crashed
+            if return_code and return_code != TestAutomationBase.TEST_FAIL_RETCODE: # Crashed
                 crash_info = "-- No crash log available --"
-                error_log = os.path.join(workspace.paths.project_log(), 'error.log')
+                crash_log = os.path.join(workspace.paths.project_log(), 'error.log')
                 try:
-                    waiter.wait_for(lambda: os.path.exists(error_log), timeout=TestAutomationBase.WAIT_FOR_CRASH_LOG)
+                    waiter.wait_for(lambda: os.path.exists(crash_log), timeout=TestAutomationBase.WAIT_FOR_CRASH_LOG)
                 except AssertionError:                    
                     pass
                     
                 try:
-                    with open(error_log) as f:
+                    with open(crash_log) as f:
                         crash_info = f.read()
                 except Exception as ex:
                     crash_info += f"\n{str(ex)}"

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py

@@ -21,8 +21,8 @@ import azlmbr.legacy.general as general
 import azlmbr.paths
 
 sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests'))
-from automatedtesting_shared.editor_test_helper import EditorTestHelper
-import automatedtesting_shared.pyside_utils as pyside_utils
+from editor_python_test_tools.editor_test_helper import EditorTestHelper
+import editor_python_test_tools.pyside_utils as pyside_utils
 
 
 class AssetBrowserTreeNavigationTest(EditorTestHelper):
@@ -66,7 +66,7 @@ class AssetBrowserTreeNavigationTest(EditorTestHelper):
             return collapse_success and expand_success
 
         # This is the hierarchy we are expanding (4 steps inside)
-        self.file_path = ("AutomatedTesting", "Assets", "ImageGradients", "lumberyard_gsi.png")
+        self.file_path = ("AutomatedTesting", "Assets", "ImageGradients", "image_grad_test_gsi.png")
 
         # 1) Open a new level
         self.test_success = self.create_level(

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Docking_BasicDockedTools.py

@@ -22,8 +22,8 @@ import azlmbr.entity as entity
 import azlmbr.paths
 
 sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests'))
-from automatedtesting_shared.editor_test_helper import EditorTestHelper
-import automatedtesting_shared.pyside_utils as pyside_utils
+from editor_python_test_tools.editor_test_helper import EditorTestHelper
+import editor_python_test_tools.pyside_utils as pyside_utils
 
 
 class TestDockingBasicDockedTools(EditorTestHelper):

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py

@@ -19,8 +19,8 @@ import sys
 import azlmbr.paths
 
 sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests'))
-from automatedtesting_shared.editor_test_helper import EditorTestHelper
-import automatedtesting_shared.pyside_utils as pyside_utils
+from editor_python_test_tools.editor_test_helper import EditorTestHelper
+import editor_python_test_tools.pyside_utils as pyside_utils
 
 
 class TestEditMenuOptions(EditorTestHelper):

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_FileMenuOptions.py

@@ -20,8 +20,8 @@ import sys
 import azlmbr.paths
 
 sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests'))
-from automatedtesting_shared.editor_test_helper import EditorTestHelper
-import automatedtesting_shared.pyside_utils as pyside_utils
+from editor_python_test_tools.editor_test_helper import EditorTestHelper
+import editor_python_test_tools.pyside_utils as pyside_utils
 
 
 class TestFileMenuOptions(EditorTestHelper):

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py

@@ -19,8 +19,8 @@ import sys
 import azlmbr.paths
 
 sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests'))
-from automatedtesting_shared.editor_test_helper import EditorTestHelper
-import automatedtesting_shared.pyside_utils as pyside_utils
+from editor_python_test_tools.editor_test_helper import EditorTestHelper
+import editor_python_test_tools.pyside_utils as pyside_utils
 
 
 class TestViewMenuOptions(EditorTestHelper):

AutomatedTesting/Gem/PythonTests/editor/conftest.py

@@ -19,7 +19,7 @@ logger = logging.getLogger(__name__)
 
 
 layout = {
-    'path': r'Software\Amazon\Lumberyard\Editor\fancyWindowLayouts',
+    'path': r'Software\Amazon\O3DE\Editor\fancyWindowLayouts',
     'value': 'last'
 }
 restore_camera = {

AutomatedTesting/Gem/PythonTests/editor/test_SearchFiltering.py

@@ -1,71 +0,0 @@
-"""
-All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-its licensors.
-
-For complete copyright and license terms please see the LICENSE at the root of this
-distribution (the "License"). All use of this software is governed by the License,
-or, if provided, by the license below or the license accompanying this file. Do not
-remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-"""
-
-"""
-C13660194 : Asset Browser - Filtering
-"""
-
-import os
-import pytest
-
-# Bail on the test if ly_test_tools doesn't exist.
-pytest.importorskip('ly_test_tools')
-import ly_test_tools.environment.file_system as file_system
-import editor_python_test_tools.hydra_test_utils as hydra
-
-test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts")
-log_monitor_timeout = 90
-
-
-@pytest.mark.parametrize('project', ['AutomatedTesting'])
-@pytest.mark.parametrize('level', ['tmp_level'])
-@pytest.mark.usefixtures("automatic_process_killer")
-@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
-class TestSearchFiltering(object):
-
-    @pytest.fixture(autouse=True)
-    def setup_teardown(self, request, workspace, project, level):
-        def teardown():
-            file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
-
-        request.addfinalizer(teardown)
-
-        file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
-
-    @pytest.mark.test_case_id("C13660194")
-    @pytest.mark.SUITE_periodic
-    def test_SearchFiltering_Asset_Browser_Filtering(self, request, editor, level, launcher_platform):
-        expected_lines = [
-            "cedar.fbx asset is filtered in Asset Browser",
-            "Animation file type(s) is present in the file tree: True",
-            "FileTag file type(s) and Animation file type(s) is present in the file tree: True",
-            "FileTag file type(s) is present in the file tree after removing Animation filter: True",
-        ]
-
-        unexpected_lines = [
-            "Asset Browser opened: False",
-            "Animation file type(s) is present in the file tree: False",
-            "FileTag file type(s) and Animation file type(s) is present in the file tree: False",
-            "FileTag file type(s) is present in the file tree after removing Animation filter: False",
-        ]
-        
-        hydra.launch_and_validate_results(
-            request,
-            test_directory,
-            editor,
-            "AssetBrowser_SearchFiltering.py",
-            expected_lines,
-            unexpected_lines=unexpected_lines,
-            cfg_args=[level],
-            auto_test_mode=False,
-            run_python="--runpython",
-            timeout=log_monitor_timeout,
-        )

AutomatedTesting/Gem/PythonTests/editor/test_TreeNavigation.py

@@ -1,62 +0,0 @@
-"""
-All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-its licensors.
-
-For complete copyright and license terms please see the LICENSE at the root of this
-distribution (the "License"). All use of this software is governed by the License,
-or, if provided, by the license below or the license accompanying this file. Do not
-remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-"""
-
-"""
-C13660195: Asset Browser - File Tree Navigation
-"""
-
-import os
-import pytest
-
-# Bail on the test if ly_test_tools doesn't exist.
-pytest.importorskip('ly_test_tools')
-import ly_test_tools.environment.file_system as file_system
-import editor_python_test_tools.hydra_test_utils as hydra
-
-test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts")
-log_monitor_timeout = 90
-
-
-@pytest.mark.parametrize('project', ['AutomatedTesting'])
-@pytest.mark.parametrize('level', ['tmp_level'])
-@pytest.mark.usefixtures("automatic_process_killer")
-@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
-class TestTreeNavigation(object):
-
-    @pytest.fixture(autouse=True)
-    def setup_teardown(self, request, workspace, project, level):
-        def teardown():
-            file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
-
-        request.addfinalizer(teardown)
-
-        file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
-
-    @pytest.mark.test_case_id("C13660195")
-    @pytest.mark.SUITE_periodic
-    def test_TreeNavigation_Asset_Browser(self, request, editor, level, launcher_platform):
-        expected_lines = [
-            "Collapse/Expand tests: True",
-            "Asset visibility test: True",
-            "Scrollbar visibility test: True",
-            "TreeNavigation_Asset_Browser:  result=SUCCESS"
-        ]
-
-        hydra.launch_and_validate_results(
-            request,
-            test_directory,
-            editor,
-            "TreeNavigation_Asset_Browser.py",
-            expected_lines,
-            run_python="--runpython",
-            cfg_args=[level],
-            timeout=log_monitor_timeout,
-        )

AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py

@@ -85,7 +85,8 @@ class TestAltitudeFilter(object):
 
     @pytest.mark.test_case_id("C4847478")
     @pytest.mark.SUITE_periodic
-    def test_AltitudeFilterFilterStageToggle(self, request, editor, level, workspace, launcher_platform):
+    @pytest.mark.xfail  # LYN-3275
+    def test_AltitudeFilter_FilterStageToggle(self, request, editor, level, workspace, launcher_platform):
         cfg_args = [level]
 
         expected_lines = [

AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py

@@ -41,7 +41,7 @@ class TestDynamicSliceInstanceSpawner(object):
         return console
 
     @pytest.mark.test_case_id("C28851763")
-    @pytest.mark.SUITE_main
+    @pytest.mark.SUITE_sandbox
     @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
     def test_DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks(self, request, editor, level, workspace, project,
                                                                   launcher_platform):

AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py

@@ -36,8 +36,13 @@ class TestEmptyInstanceSpawner(object):
 
         file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
 
-    @pytest.mark.test_case_id("C28851762")
+    # Main suite needs at least one test
     @pytest.mark.SUITE_main
+    def test_EmptyInstanceSpawner_Dummy(self, request, editor, level, workspace, project, launcher_platform):
+        pass
+
+    @pytest.mark.test_case_id("C28851762")
+    @pytest.mark.SUITE_sandbox
     def test_EmptyInstanceSpawner_EmptySpawnerWorks(self, request, editor, level, launcher_platform):
         cfg_args = [level]
 

AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py

@@ -101,6 +101,7 @@ class TestLayerSpawner(object):
 
     @pytest.mark.test_case_id("C4765973")
     @pytest.mark.SUITE_periodic
+    @pytest.mark.xfail      # LYN-3275
     def test_LayerSpawner_FilterStageToggle(self, request, editor, level, workspace, launcher_platform):
 
         expected_lines = [

AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshBlocker.py

@@ -46,6 +46,7 @@ class TestMeshBlocker(object):
     """
     @pytest.mark.test_case_id("C3980834")
     @pytest.mark.SUITE_periodic
+    @pytest.mark.xfail  # LYN-3273
     def test_MeshBlocker_InstancesBlockedByMesh(self, request, editor, level, launcher_platform):
         expected_lines = [
             "'Instance Spawner' created",
@@ -69,6 +70,7 @@ class TestMeshBlocker(object):
     """
     @pytest.mark.test_case_id("C4766030")
     @pytest.mark.SUITE_periodic
+    @pytest.mark.xfail  # LYN-3273
     def test_MeshBlocker_InstancesBlockedByMeshHeightTuning(self, request, editor, level, launcher_platform):
         expected_lines = [
             "'Instance Spawner' created",

AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py

@@ -60,6 +60,7 @@ class TestPositionModifier(object):
 
     @pytest.mark.test_case_id("C4874100")
     @pytest.mark.SUITE_sandbox
+    @pytest.mark.xfail  # LYN-3275
     def test_PositionModifier_AutoSnapToSurfaceWorks(self, request, editor, level, launcher_platform):
 
         expected_lines = [

AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityRemovedOnNodeDelete.py

@@ -21,7 +21,7 @@ import azlmbr.math as math
 import azlmbr.paths
 
 sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests'))
-from automatedtesting_shared.editor_test_helper import EditorTestHelper
+from editor_python_test_tools.editor_test_helper import EditorTestHelper
 
 editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID
 createdEntityId = None

AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_AreaNodes.py

@@ -22,7 +22,7 @@ import pytest
 # Bail on the test if ly_test_tools doesn't exist.
 pytest.importorskip('ly_test_tools')
 import ly_test_tools.environment.file_system as file_system
-import automateeditor_python_test_toolsdtesting_shared.hydra_test_utils as hydra
+import editor_python_test_tools.hydra_test_utils as hydra
 
 test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts')
 

AutomatedTesting/Gem/PythonTests/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py

@@ -24,7 +24,7 @@ class Tests():
 # fmt: on
 
 
-def run():
+def C14861501_PhysXCollider_RenderMeshAutoAssigned():
     """
     Summary:
      Create entity with Mesh component and assign a render mesh to the Mesh component. Add Physics Collider component
@@ -61,7 +61,7 @@ def run():
     from asset_utils import Asset
 
     # Asset paths
-    STATIC_MESH = os.path.join("assets", "c14861501_physxcollider_rendermeshautoassigned", "spherebot", "r0-b_body.cgf")
+    STATIC_MESH = os.path.join("assets", "c14861501_physxcollider_rendermeshautoassigned", "spherebot", "r0-b_body.azmodel")
     PHYSX_MESH = os.path.join(
         "assets", "c14861501_physxcollider_rendermeshautoassigned", "spherebot", "r0-b_body.pxmesh"
     )
@@ -80,8 +80,8 @@ def run():
 
     # 4) Assign a render mesh asset to Mesh component (the fbx mesh having both Static mesh and PhysX collision Mesh)
     mesh_asset = Asset.find_asset_by_path(STATIC_MESH)
-    mesh_component.set_component_property_value("MeshComponentRenderNode|Mesh asset", mesh_asset.id)
-    mesh_asset.id = mesh_component.get_component_property_value("MeshComponentRenderNode|Mesh asset")
+    mesh_component.set_component_property_value("Controller|Configuration|Mesh Asset", mesh_asset.id)
+    mesh_asset.id = mesh_component.get_component_property_value("Controller|Configuration|Mesh Asset")
     Report.result(Tests.assign_mesh_asset, mesh_asset.get_path() == STATIC_MESH.replace(os.sep, "/"))
 
     # 5) Add PhysX Collider component
@@ -95,4 +95,8 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+
+    from utils import Report
+    Report.start_test(C14861501_PhysXCollider_RenderMeshAutoAssigned)

AutomatedTesting/Gem/PythonTests/physics/C14861502_PhysXCollider_AssetAutoAssigned.py

@@ -62,8 +62,8 @@ def C14861502_PhysXCollider_AssetAutoAssigned():
     # Open 3D Engine Imports
     import azlmbr.legacy.general as general
 
-    MESH_ASSET_PATH = os.path.join("Objects", "SphereBot", "r0-b_body.cgf")
-    MESH_PROPERTY_PATH = "MeshComponentRenderNode|Mesh asset"
+    MESH_ASSET_PATH = os.path.join("Objects", "SphereBot", "r0-b_body.azmodel")
+    MESH_PROPERTY_PATH = "Controller|Configuration|Mesh Asset"
     TESTED_PROPERTY_PATH = "Shape Configuration|Asset|PhysX Mesh"
 
     helper.init_idle()

AutomatedTesting/Gem/PythonTests/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py

@@ -69,7 +69,7 @@ def run():
     import azlmbr.asset as azasset
 
     # Asset paths
-    STATIC_MESH = os.path.join("assets", "c14861504_rendermeshasset_withnopxasset", "test_asset.cgf")
+    STATIC_MESH = os.path.join("assets", "c14861504_rendermeshasset_withnopxasset", "test_asset.azmodel")
 
     helper.init_idle()
     # 1) Load the empty level
@@ -85,8 +85,8 @@ def run():
 
     # 4) Assign a render mesh asset to Mesh component (the fbx mesh having both Static mesh and PhysX collision Mesh)
     mesh_asset = Asset.find_asset_by_path(STATIC_MESH)
-    mesh_component.set_component_property_value("MeshComponentRenderNode|Mesh asset", mesh_asset.id)
-    mesh_asset.id = mesh_component.get_component_property_value("MeshComponentRenderNode|Mesh asset")
+    mesh_component.set_component_property_value("Controller|Configuration|Mesh Asset", mesh_asset.id)
+    mesh_asset.id = mesh_component.get_component_property_value("Controller|Configuration|Mesh Asset")
     Report.result(Tests.assign_mesh_asset, mesh_asset.get_path() == STATIC_MESH.replace(os.sep, "/"))
 
     # 5) Add PhysX Collider component

AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py

@@ -27,7 +27,7 @@ class Tests():
 # fmt: on
 
 
-def run():
+def C4044695_PhysXCollider_AddMultipleSurfaceFbx():
     """
     Summary:
      Create entity with Mesh and PhysX Collider components and assign a fbx file in both the components.
@@ -45,12 +45,7 @@ def run():
      4) Select the PhysicsAsset shape in the PhysX Collider component
      5) Assign the fbx file in PhysX Mesh and Mesh component
      6) Check if multiple material slots show up under Materials section in the PhysX Collider component
-
-    Note:
-     - This test file must be called from the Open 3D Engine Editor command terminal
-     - Any passed and failed tests are written to the Editor.log file.
-            Parsing the file or running a log_monitor are required to observe the test results.
-
+     
     :return: None
     """
     # Builtins
@@ -70,7 +65,7 @@ def run():
     SURFACE_TAG_COUNT = 4  # Number of surface tags included in used asset
 
     # Asset paths
-    STATIC_MESH = os.path.join("assets", "c4044695_physxcollider_addmultiplesurfacefbx", "test.cgf")
+    STATIC_MESH = os.path.join("assets", "c4044695_physxcollider_addmultiplesurfacefbx", "test.azmodel")
     PHYSX_MESH = os.path.join("assets", "c4044695_physxcollider_addmultiplesurfacefbx", "test.pxmesh")
 
     helper.init_idle()
@@ -100,8 +95,8 @@ def run():
     Report.result(Tests.assign_px_mesh_asset, px_asset.get_path() == PHYSX_MESH.replace(os.sep, "/"))
 
     mesh_asset = Asset.find_asset_by_path(STATIC_MESH)
-    mesh_component.set_component_property_value("MeshComponentRenderNode|Mesh asset", mesh_asset.id)
-    mesh_asset.id = mesh_component.get_component_property_value("MeshComponentRenderNode|Mesh asset")
+    mesh_component.set_component_property_value("Controller|Configuration|Mesh Asset", mesh_asset.id)
+    mesh_asset.id = mesh_component.get_component_property_value("Controller|Configuration|Mesh Asset")
     Report.result(Tests.assign_mesh_asset, mesh_asset.get_path() == STATIC_MESH.replace(os.sep, "/"))
 
     # 6) Check if multiple material slots show up under Materials section in the PhysX Collider component
@@ -116,4 +111,8 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+
+    from utils import Report
+    Report.start_test(C4044695_PhysXCollider_AddMultipleSurfaceFbx)

AutomatedTesting/Gem/PythonTests/physics/C4976236_AddPhysxColliderComponent.py

@@ -27,7 +27,7 @@ class Tests():
 def C4976236_AddPhysxColliderComponent():
     """
     Summary:
-    Load level with Entity having PhysX Collider component. Verify that editor remains stable in Game mode.
+    Opens an empty level and creates an Entity with PhysX Collider. Verify that editor remains stable in Game mode.
 
     Expected Behavior:
     The Editor is stable there are no warnings or errors.
@@ -37,16 +37,10 @@ def C4976236_AddPhysxColliderComponent():
      2) Create test entity
      3) Start the Tracer to catch any errors and warnings
      4) Add the PhysX Collider component and change shape to box
-     5) Add Mesh component and an asset
-     6) Enter game mode
-     7) Verify there are no errors and warnings in the logs
-     8) Exit game mode
-     9) Close the editor
-
-    Note:
-    - This test file must be called from the Open 3D Engine Editor command terminal
-    - Any passed and failed tests are written to the Editor.log file.
-        Parsing the file or running a log_monitor are required to observe the test results.
+     5) Enter game mode
+     6) Verify there are no errors and warnings in the logs
+     7) Exit game mode
+     8) Close the editor
 
     :return: None
     """
@@ -60,7 +54,7 @@ def C4976236_AddPhysxColliderComponent():
     from editor_python_test_tools.utils import TestHelper as helper
     from editor_python_test_tools.utils import Tracer
     from asset_utils import Asset
-
+    
     helper.init_idle()
     # 1) Load the level
     helper.open_level("Physics", "Base")
@@ -74,17 +68,12 @@ def C4976236_AddPhysxColliderComponent():
         # 4) Add the PhysX Collider component and change shape to box
         collider_component = test_entity.add_component("PhysX Collider")
         Report.result(Tests.add_physx_collider, test_entity.has_component("PhysX Collider"))
-        collider_component.set_component_property_value('Shape Configuration|Shape', 1)
+        collider_component.set_component_property_value('Shape Configuration|Shape', azlmbr.physics.ShapeType_Box)
 
-        # 5) Add Mesh component and an asset
-        mesh_component = test_entity.add_component("Mesh")
-        asset = Asset.find_asset_by_path(r"Objects\default\primitive_cube.cgf")
-        mesh_component.set_component_property_value('MeshComponentRenderNode|Mesh asset', asset.id)
-
-        # 6) Enter game mode
+        # 5) Enter game mode
         helper.enter_game_mode(Tests.enter_game_mode)
 
-    # 7) Verify there are no errors and warnings in the logs
+    # 6) Verify there are no errors and warnings in the logs
     success_condition = not (section_tracer.has_errors or section_tracer.has_warnings)
     Report.result(Tests.no_errors_and_warnings_found, success_condition)
     if not success_condition:
@@ -92,9 +81,8 @@ def C4976236_AddPhysxColliderComponent():
             Report.info(f"Warnings found: {section_tracer.warnings}")
         if section_tracer.has_errors:
             Report.info(f"Errors found: {section_tracer.errors}")
-        Report.failure(Tests.no_errors_and_warnings_found)
 
-    # 8) Exit game mode
+    # 7) Exit game mode
     helper.exit_game_mode(Tests.exit_game_mode)
 
 

AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py

@@ -0,0 +1,37 @@
+"""
+All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+its licensors.
+
+For complete copyright and license terms please see the LICENSE at the root of this
+distribution (the "License"). All use of this software is governed by the License,
+or, if provided, by the license below or the license accompanying this file. Do not
+remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+"""
+
+# This suite consists of all test cases that are passing and have been verified.
+
+import pytest
+import os
+import sys
+
+from .FileManagement import FileManagement as fm
+from ly_test_tools import LAUNCHERS
+
+sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
+
+from base import TestAutomationBase
+
+
+revert_physics_config = fm.file_revert_list(['physxdebugconfiguration.setreg', 'physxdefaultsceneconfiguration.setreg', 'physxsystemconfiguration.setreg'], 'AutomatedTesting/Registry')
+
+
+@pytest.mark.SUITE_main
+@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+class TestAutomation(TestAutomationBase):
+
+    def test_C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC(self, request, workspace, editor, launcher_platform):
+        from . import C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module
+        self._run_test(request, workspace, editor, test_module)

AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py

@@ -27,26 +27,16 @@ from base import TestAutomationBase
 revert_physics_config = fm.file_revert_list(['physxdebugconfiguration.setreg', 'physxdefaultsceneconfiguration.setreg', 'physxsystemconfiguration.setreg'], 'AutomatedTesting/Registry')
 
 
-@pytest.mark.SUITE_main
+@pytest.mark.SUITE_periodic
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 class TestAutomation(TestAutomationBase):
 
-    # Marking the test as an expected failure due to sporadic failure on Automated Review: SPEC-3146
-    # The test still runs, but a failure of the test doesn't result in the test run failing
-    @pytest.mark.xfail(
-        reason="This test seems to fail sometimes due to it being the first test in the testsuite, we'll duplicate it temporarly."
-               "Need to figure out the reason why this is the case")
-    @revert_physics_config
-    def test_C000000_RigidBody_EnablingGravityWorksPoC_DUPLICATE(self, request, workspace, editor, launcher_platform):
-        from . import C100000_RigidBody_EnablingGravityWorksPoC as test_module
-        self._run_test(request, workspace, editor, test_module)
-
     @revert_physics_config
     def test_C3510642_Terrain_NotCollideWithTerrain(self, request, workspace, editor, launcher_platform):
         from . import C3510642_Terrain_NotCollideWithTerrain as test_module
         self._run_test(request, workspace, editor, test_module)
-
+        
     @revert_physics_config
     def test_C4976195_RigidBodies_InitialLinearVelocity(self, request, workspace, editor, launcher_platform):
         from . import C4976195_RigidBodies_InitialLinearVelocity as test_module
@@ -279,6 +269,8 @@ class TestAutomation(TestAutomationBase):
         from . import C18977601_Material_FrictionCombinePriority as test_module
         self._run_test(request, workspace, editor, test_module)
 
+    @pytest.mark.xfail(
+        reason="Something with the CryRenderer disabling is causing this test to fail now.")
     @revert_physics_config
     def test_C13895144_Ragdoll_ChangeLevel(self, request, workspace, editor, launcher_platform):
         from . import C13895144_Ragdoll_ChangeLevel as test_module
@@ -530,8 +522,4 @@ class TestAutomation(TestAutomationBase):
 
     def test_C100000_RigidBody_EnablingGravityWorksPoC(self, request, workspace, editor, launcher_platform):
         from . import C100000_RigidBody_EnablingGravityWorksPoC as test_module
-        self._run_test(request, workspace, editor, test_module)
-
-    def test_C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC(self, request, workspace, editor, launcher_platform):
-        from . import C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module)

AutomatedTesting/Levels/Physics/Base/Base.ly

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75cb1c8454aafc3de81351450a9480f91cb98d926a6e47f87a5ffe91e1d5a7d5
-size 4745
+oid sha256:f63204a86af8bc0963a4823d047a2e222cc19aabd14570d0789dc90cdc82970c
+size 2017

AutomatedTesting/Levels/Physics/Base/leveldata/TimeOfDay.xml

@@ -1,356 +1,356 @@
 <TimeOfDay Time="13.5" TimeStart="13.5" TimeEnd="13.5" TimeAnimSpeed="0">
- <Variable Name="Sun color" Color="0.99989021,0.99946922,0.9991194">
-  <Spline Keys="-0.000628322:(0.783538:0.89627:0.930341):36,0:(0.783538:0.887923:0.921582):36,0.229167:(0.783538:0.879623:0.921582):36,0.25:(0.947307:0.745404:0.577581):36,0.458333:(1:1:1):36,0.5625:(1:1:1):36,0.75:(0.947307:0.745404:0.577581):36,0.770833:(0.783538:0.879623:0.921582):36,1:(0.783538:0.89627:0.930556):36,"/>
+ <Variable Name="Sun color" Color="0.78353798,0.89626998,0.93034101">
+  <Spline Keys="-0.000628322:(0.783538:0.89627:0.930341):36"/>
  </Variable>
- <Variable Name="Sun intensity" Value="92366.68">
-  <Spline Keys="0:1000:36,0.229167:1000:36,0.5:120000:36,0.770833:1000:65572,0.999306:1000:36,"/>
+ <Variable Name="Sun intensity" Value="1000">
+  <Spline Keys="0:1000:36"/>
  </Variable>
  <Variable Name="Sun specular multiplier" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:36,0.75:1:36,1:1:36,"/>
+  <Spline Keys="0:1:36"/>
  </Variable>
- <Variable Name="Fog color" Color="0.27049801,0.47353199,0.83076996">
-  <Spline Keys="0:(0.00651209:0.00972122:0.0137021):36,0.229167:(0.00604883:0.00972122:0.0137021):36,0.25:(0.270498:0.473532:0.83077):36,0.5:(0.270498:0.473532:0.83077):458788,0.75:(0.270498:0.473532:0.83077):36,0.770833:(0.00604883:0.00972122:0.0137021):36,1:(0.00651209:0.00972122:0.0137021):36,"/>
+ <Variable Name="Fog color" Color="0.0065120901,0.0097212195,0.0137021">
+  <Spline Keys="0:(0.00651209:0.00972122:0.0137021):36"/>
  </Variable>
- <Variable Name="Fog color multiplier" Value="1">
-  <Spline Keys="0:0.5:36,0.229167:0.5:36,0.25:1:36,0.5:1:36,0.75:1:36,0.770833:0.5:36,1:0.5:65572,"/>
+ <Variable Name="Fog color multiplier" Value="0.5">
+  <Spline Keys="0:0.5:36"/>
  </Variable>
  <Variable Name="Fog height (bottom)" Value="0">
-  <Spline Keys="0:0:36,0.25:0:36,0.5:0:36,0.75:0:36,1:0:36,"/>
+  <Spline Keys="0:0:36"/>
  </Variable>
  <Variable Name="Fog layer density (bottom)" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:36,0.75:1:36,1:1:36,"/>
+  <Spline Keys="0:1:36"/>
  </Variable>
- <Variable Name="Fog color (top)" Color="0.597202,0.72305501,0.91309899">
-  <Spline Keys="0:(0.00699541:0.00972122:0.0122865):36,0.229167:(0.00699541:0.00972122:0.0122865):36,0.25:(0.597202:0.723055:0.913099):36,0.5:(0.597202:0.723055:0.913099):458788,0.75:(0.597202:0.723055:0.913099):36,0.770833:(0.00699541:0.00972122:0.0122865):36,1:(0.00699541:0.00972122:0.0122865):36,"/>
+ <Variable Name="Fog color (top)" Color="0.0069954102,0.0097212195,0.0122865">
+  <Spline Keys="0:(0.00699541:0.00972122:0.0122865):36"/>
  </Variable>
- <Variable Name="Fog color (top) multiplier" Value="0.88389361">
-  <Spline Keys="-4.40702e-06:0.5:36,0.0297507:0.499195:36,0.229167:0.5:36,0.5:1:36,0.770833:0.5:36,1:0.5:36,"/>
+ <Variable Name="Fog color (top) multiplier" Value="0.5">
+  <Spline Keys="-4.40702e-06:0.5:36"/>
  </Variable>
- <Variable Name="Fog height (top)" Value="100.00001">
-  <Spline Keys="0:100:36,0.25:100:36,0.5:100:36,0.75:100:65572,1:100:36,"/>
+ <Variable Name="Fog height (top)" Value="100">
+  <Spline Keys="0:100:36"/>
  </Variable>
  <Variable Name="Fog layer density (top)" Value="9.9999997e-05">
-  <Spline Keys="0:0.0001:36,0.25:0.0001:36,0.5:0.0001:65572,0.75:0.0001:36,1:0.0001:36,"/>
+  <Spline Keys="0:0.0001:36"/>
  </Variable>
  <Variable Name="Fog color height offset" Value="0">
-  <Spline Keys="0:0:36,0.25:0:36,0.5:0:36,0.75:0:36,1:0:65572,"/>
+  <Spline Keys="0:0:36"/>
  </Variable>
- <Variable Name="Fog color (radial)" Color="0.78592348,0.52744436,0.17234583">
-  <Spline Keys="0:(0:0:0):36,0.229167:(0.00439144:0.00367651:0.00334654):36,0.25:(0.838799:0.564712:0.184475):36,0.5:(0.768151:0.514918:0.168269):458788,0.75:(0.838799:0.564712:0.184475):36,0.770833:(0.00402472:0.00334654:0.00303527):36,1:(0:0:0):36,"/>
+ <Variable Name="Fog color (radial)" Color="0,0,0">
+  <Spline Keys="0:(0:0:0):36"/>
  </Variable>
- <Variable Name="Fog color (radial) multiplier" Value="6">
-  <Spline Keys="0:0:36,0.25:6:36,0.5:6:36,0.75:6:36,1:0:36,"/>
+ <Variable Name="Fog color (radial) multiplier" Value="0">
+  <Spline Keys="0:0:36"/>
  </Variable>
- <Variable Name="Fog radial size" Value="0.85000002">
-  <Spline Keys="0:0:36,0.25:0.85:65572,0.5:0.85:36,0.75:0.85:36,1:0:36,"/>
+ <Variable Name="Fog radial size" Value="0">
+  <Spline Keys="0:0:36"/>
  </Variable>
- <Variable Name="Fog radial lobe" Value="0.75">
-  <Spline Keys="0:0:36,0.25:0.75:36,0.5:0.75:36,0.75:0.75:65572,1:0:36,"/>
+ <Variable Name="Fog radial lobe" Value="0">
+  <Spline Keys="0:0:36"/>
  </Variable>
  <Variable Name="Volumetric fog: Final density clamp" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
+  <Spline Keys="0:1:36"/>
  </Variable>
  <Variable Name="Volumetric fog: Global density" Value="1.5">
-  <Spline Keys="0:1.5:36,0.25:1.5:36,0.5:1.5:65572,0.75:1.5:36,1:1.5:36,"/>
+  <Spline Keys="0:1.5:36"/>
  </Variable>
- <Variable Name="Volumetric fog: Ramp start" Value="25.000002">
-  <Spline Keys="0:25:36,0.25:25:36,0.5:25:65572,0.75:25:36,1:25:36,"/>
+ <Variable Name="Volumetric fog: Ramp start" Value="25">
+  <Spline Keys="0:25:36"/>
  </Variable>
- <Variable Name="Volumetric fog: Ramp end" Value="1000.0001">
-  <Spline Keys="0:1000:36,0.25:1000:36,0.5:1000:65572,0.75:1000:36,1:1000:36,"/>
+ <Variable Name="Volumetric fog: Ramp end" Value="1000">
+  <Spline Keys="0:1000:36"/>
  </Variable>
- <Variable Name="Volumetric fog: Ramp influence" Value="0.69999993">
-  <Spline Keys="0:0.7:36,0.25:0.7:36,0.5:0.7:65572,0.75:0.7:36,1:0.7:36,"/>
+ <Variable Name="Volumetric fog: Ramp influence" Value="0.69999999">
+  <Spline Keys="0:0.7:36"/>
  </Variable>
- <Variable Name="Volumetric fog: Shadow darkening" Value="0.20000002">
-  <Spline Keys="0:0.2:36,0.25:0.2:36,0.5:0.2:65572,0.75:0.2:36,1:0.2:36,"/>
+ <Variable Name="Volumetric fog: Shadow darkening" Value="0.2">
+  <Spline Keys="0:0.2:36"/>
  </Variable>
  <Variable Name="Volumetric fog: Shadow darkening sun" Value="0.5">
-  <Spline Keys="0:0.5:36,0.25:0.5:36,0.5:0.5:65572,0.75:0.5:36,1:0.5:36,"/>
+  <Spline Keys="0:0.5:36"/>
  </Variable>
  <Variable Name="Volumetric fog: Shadow darkening ambient" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
+  <Spline Keys="0:1:36"/>
  </Variable>
- <Variable Name="Volumetric fog: Shadow range" Value="0.10000001">
-  <Spline Keys="0:0.1:36,0.25:0.1:36,0.5:0.1:65572,0.75:0.1:36,1:0.1:36,"/>
+ <Variable Name="Volumetric fog: Shadow range" Value="0.1">
+  <Spline Keys="0:0.1:36"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Fog height (bottom)" Value="0">
-  <Spline Keys="0:0:0,1:0:0,"/>
+  <Spline Keys="0:0:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Fog layer density (bottom)" Value="1">
-  <Spline Keys="0:1:0,1:1:0,"/>
+  <Spline Keys="0:1:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Fog height (top)" Value="4000">
-  <Spline Keys="0:4000:0,1:4000:0,"/>
+  <Spline Keys="0:4000:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Fog layer density (top)" Value="9.9999997e-05">
-  <Spline Keys="0:0.0001:0,1:0.0001:0,"/>
+  <Spline Keys="0:0.0001:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Global fog density" Value="0.1">
-  <Spline Keys="0:0.1:0,1:0.1:0,"/>
+  <Spline Keys="0:0.1:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Ramp start" Value="0">
-  <Spline Keys="0:0:0,1:0:0,"/>
+  <Spline Keys="0:0:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Ramp end" Value="0">
-  <Spline Keys="0:0:0,1:0:0,"/>
+  <Spline Keys="0:0:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Fog albedo color (atmosphere)" Color="1,1,1">
-  <Spline Keys="0:(1:1:1):0,1:(1:1:1):0,"/>
+  <Spline Keys="0:(1:1:1):0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Anisotropy factor (atmosphere)" Value="0.60000002">
-  <Spline Keys="0:0.6:0,1:0.6:0,"/>
+  <Spline Keys="0:0.6:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Fog albedo color (sun radial)" Color="1,1,1">
-  <Spline Keys="0:(1:1:1):0,1:(1:1:1):0,"/>
+  <Spline Keys="0:(1:1:1):0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Anisotropy factor (sun radial)" Value="0.94999999">
-  <Spline Keys="0:0.95:0,1:0.95:0,"/>
+  <Spline Keys="0:0.95:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Blend factor for sun scattering" Value="1">
-  <Spline Keys="0:1:0,1:1:0,"/>
+  <Spline Keys="0:1:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Blend mode for sun scattering" Value="0">
-  <Spline Keys="0:0:0,1:0:0,"/>
+  <Spline Keys="0:0:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Fog albedo color (entities)" Color="1,1,1">
-  <Spline Keys="0:(1:1:1):0,1:(1:1:1):0,"/>
+  <Spline Keys="0:(1:1:1):0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Anisotropy factor (entities)" Value="0.60000002">
-  <Spline Keys="0:0.6:0,1:0.6:0,"/>
+  <Spline Keys="0:0.6:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Maximum range of ray-marching" Value="64">
-  <Spline Keys="0:64:0,1:64:0,"/>
+  <Spline Keys="0:64:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: In-scattering factor" Value="1">
-  <Spline Keys="0:1:0,1:1:0,"/>
+  <Spline Keys="0:1:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Extinction factor" Value="0.30000001">
-  <Spline Keys="0:0.3:0,1:0.3:0,"/>
+  <Spline Keys="0:0.3:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Analytical volumetric fog visibility" Value="0.5">
-  <Spline Keys="0:0.5:0,1:0.5:0,"/>
+  <Spline Keys="0:0.5:0"/>
  </Variable>
  <Variable Name="Volumetric fog 2: Final density clamp" Value="1">
-  <Spline Keys="0:1:0,0.5:1:36,1:1:0,"/>
+  <Spline Keys="0:1:0"/>
  </Variable>
  <Variable Name="Sky light: Sun intensity" Color="1,1,1">
-  <Spline Keys="0:(1:1:1):36,0.25:(1:1:1):36,0.494381:(1:1:1):65572,0.5:(1:1:1):36,0.75:(1:1:1):36,1:(1:1:1):36,"/>
+  <Spline Keys="0:(1:1:1):36"/>
  </Variable>
- <Variable Name="Sky light: Sun intensity multiplier" Value="200.00002">
-  <Spline Keys="0:200:36,0.25:200:36,0.5:200:36,0.75:200:36,1:200:36,"/>
+ <Variable Name="Sky light: Sun intensity multiplier" Value="200">
+  <Spline Keys="0:200:36"/>
  </Variable>
- <Variable Name="Sky light: Mie scattering" Value="6.779707">
-  <Spline Keys="0:40:36,0.5:2:36,1:40:36,"/>
+ <Variable Name="Sky light: Mie scattering" Value="40">
+  <Spline Keys="0:40:36"/>
  </Variable>
- <Variable Name="Sky light: Rayleigh scattering" Value="0.20000002">
-  <Spline Keys="0:0.2:36,0.229167:0.2:36,0.25:1:36,0.291667:0.2:36,0.5:0.2:36,0.729167:0.2:36,0.75:1:36,0.770833:0.2:36,1:0.2:36,"/>
+ <Variable Name="Sky light: Rayleigh scattering" Value="0.2">
+  <Spline Keys="0:0.2:36"/>
  </Variable>
  <Variable Name="Sky light: Sun anisotropy factor" Value="-0.99989998">
-  <Spline Keys="0:-0.9999:36,0.25:-0.9999:36,0.5:-0.9999:65572,0.75:-0.9999:36,1:-0.9999:36,"/>
+  <Spline Keys="0:-0.9999:36"/>
  </Variable>
  <Variable Name="Sky light: Wavelength (R)" Value="694">
-  <Spline Keys="0:694:36,0.25:694:36,0.5:694:65572,0.75:694:36,1:694:36,"/>
+  <Spline Keys="0:694:36"/>
  </Variable>
- <Variable Name="Sky light: Wavelength (G)" Value="596.99994">
-  <Spline Keys="0:597:36,0.25:597:36,0.5:597:36,0.75:597:36,1:597:36,"/>
+ <Variable Name="Sky light: Wavelength (G)" Value="597">
+  <Spline Keys="0:597:36"/>
  </Variable>
  <Variable Name="Sky light: Wavelength (B)" Value="488">
-  <Spline Keys="0:488:36,0.25:488:36,0.5:488:65572,0.75:488:36,1:488:36,"/>
+  <Spline Keys="0:488:36"/>
  </Variable>
- <Variable Name="Night sky: Horizon color" Color="0.27049801,0.39157301,0.52711499">
-  <Spline Keys="0:(0.270498:0.391573:0.520996):36,0.25:(0.270498:0.391573:0.527115):36,0.5:(0.270498:0.391573:0.527115):262180,0.75:(0.270498:0.391573:0.527115):36,1:(0.270498:0.391573:0.520996):36,"/>
+ <Variable Name="Night sky: Horizon color" Color="0.27049801,0.39157301,0.52099597">
+  <Spline Keys="0:(0.270498:0.391573:0.520996):36"/>
  </Variable>
- <Variable Name="Night sky: Horizon color multiplier" Value="0">
-  <Spline Keys="0:0.1:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0.1:36,"/>
+ <Variable Name="Night sky: Horizon color multiplier" Value="0.1">
+  <Spline Keys="0:0.1:36"/>
  </Variable>
- <Variable Name="Night sky: Zenith color" Color="0.36130697,0.434154,0.46778399">
-  <Spline Keys="0:(0.361307:0.434154:0.467784):36,0.25:(0.361307:0.434154:0.467784):36,0.5:(0.361307:0.434154:0.467784):262180,0.75:(0.361307:0.434154:0.467784):36,1:(0.361307:0.434154:0.467784):36,"/>
+ <Variable Name="Night sky: Zenith color" Color="0.361307,0.434154,0.46778399">
+  <Spline Keys="0:(0.361307:0.434154:0.467784):36"/>
  </Variable>
- <Variable Name="Night sky: Zenith color multiplier" Value="0">
-  <Spline Keys="0:0.02:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0.02:36,"/>
+ <Variable Name="Night sky: Zenith color multiplier" Value="0.02">
+  <Spline Keys="0:0.02:36"/>
  </Variable>
  <Variable Name="Night sky: Zenith shift" Value="0.5">
-  <Spline Keys="0:0.5:36,0.25:0.5:36,0.5:0.5:65572,0.75:0.5:36,1:0.5:36,"/>
+  <Spline Keys="0:0.5:36"/>
  </Variable>
- <Variable Name="Night sky: Star intensity" Value="0">
-  <Spline Keys="0:3:36,0.25:0:36,0.5:0:65572,0.75:0:36,0.836647:1.03977:36,1:3:36,"/>
+ <Variable Name="Night sky: Star intensity" Value="3">
+  <Spline Keys="0:3:36"/>
  </Variable>
  <Variable Name="Night sky: Moon color" Color="1,1,1">
-  <Spline Keys="0:(1:1:1):36,0.25:(1:1:1):36,0.5:(1:1:1):458788,0.75:(1:1:1):36,1:(1:1:1):36,"/>
+  <Spline Keys="0:(1:1:1):36"/>
  </Variable>
- <Variable Name="Night sky: Moon color multiplier" Value="0">
-  <Spline Keys="0:0.4:36,0.25:0:36,0.5:0:36,0.75:0:65572,1:0.4:36,"/>
+ <Variable Name="Night sky: Moon color multiplier" Value="0.40000001">
+  <Spline Keys="0:0.4:36"/>
  </Variable>
- <Variable Name="Night sky: Moon inner corona color" Color="0.904661,1,1">
-  <Spline Keys="0:(0.89627:1:1):36,0.25:(0.904661:1:1):36,0.5:(0.904661:1:1):393252,0.75:(0.904661:1:1):36,0.836647:(0.89627:1:1):36,1:(0.89627:1:1):36,"/>
+ <Variable Name="Night sky: Moon inner corona color" Color="0.89626998,1,1">
+  <Spline Keys="0:(0.89627:1:1):36"/>
  </Variable>
- <Variable Name="Night sky: Moon inner corona color multiplier" Value="0">
-  <Spline Keys="0:0.1:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0.1:36,"/>
+ <Variable Name="Night sky: Moon inner corona color multiplier" Value="0.1">
+  <Spline Keys="0:0.1:36"/>
  </Variable>
- <Variable Name="Night sky: Moon inner corona scale" Value="0">
-  <Spline Keys="0:2:36,0.25:0:36,0.5:0:65572,0.75:0:36,0.836647:0.693178:36,1:2:36,"/>
+ <Variable Name="Night sky: Moon inner corona scale" Value="2">
+  <Spline Keys="0:2:36"/>
  </Variable>
- <Variable Name="Night sky: Moon outer corona color" Color="0.201556,0.22696599,0.25415203">
-  <Spline Keys="0:(0.198069:0.226966:0.250158):36,0.25:(0.201556:0.226966:0.254152):36,0.5:(0.201556:0.226966:0.254152):36,0.75:(0.201556:0.226966:0.254152):36,1:(0.198069:0.226966:0.250158):36,"/>
+ <Variable Name="Night sky: Moon outer corona color" Color="0.19806901,0.22696599,0.25015801">
+  <Spline Keys="0:(0.198069:0.226966:0.250158):36"/>
  </Variable>
- <Variable Name="Night sky: Moon outer corona color multiplier" Value="0">
-  <Spline Keys="0:0.1:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0.1:36,"/>
+ <Variable Name="Night sky: Moon outer corona color multiplier" Value="0.1">
+  <Spline Keys="0:0.1:36"/>
  </Variable>
- <Variable Name="Night sky: Moon outer corona scale" Value="0">
-  <Spline Keys="0:0.01:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0.01:36,"/>
+ <Variable Name="Night sky: Moon outer corona scale" Value="0.0099999998">
+  <Spline Keys="0:0.01:36"/>
  </Variable>
  <Variable Name="Cloud shading: Sun light multiplier" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
+  <Spline Keys="0:1:36"/>
  </Variable>
- <Variable Name="Cloud shading: Sun custom color" Color="0.83076996,0.76815104,0.65837508">
-  <Spline Keys="0:(0.737911:0.737911:0.737911):36,0.25:(0.83077:0.768151:0.658375):36,0.5:(0.83077:0.768151:0.658375):458788,0.75:(0.83077:0.768151:0.658375):36,1:(0.737911:0.737911:0.737911):36,"/>
+ <Variable Name="Cloud shading: Sun custom color" Color="0.73791099,0.73791099,0.73791099">
+  <Spline Keys="0:(0.737911:0.737911:0.737911):36"/>
  </Variable>
- <Variable Name="Cloud shading: Sun custom color multiplier" Value="1">
-  <Spline Keys="0:0.1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:0.1:36,"/>
+ <Variable Name="Cloud shading: Sun custom color multiplier" Value="0.1">
+  <Spline Keys="0:0.1:36"/>
  </Variable>
- <Variable Name="Cloud shading: Sun custom color influence" Value="0">
-  <Spline Keys="0:0.5:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0.5:36,"/>
+ <Variable Name="Cloud shading: Sun custom color influence" Value="0.5">
+  <Spline Keys="0:0.5:36"/>
  </Variable>
  <Variable Name="Sun shafts visibility" Value="0">
-  <Spline Keys="0:0:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0:36,"/>
+  <Spline Keys="0:0:36"/>
  </Variable>
- <Variable Name="Sun rays visibility" Value="1.5">
-  <Spline Keys="0:1:36,0.25:1.5:36,0.5:1.5:65572,0.75:1.5:36,1:1:36,"/>
+ <Variable Name="Sun rays visibility" Value="1">
+  <Spline Keys="0:1:36"/>
  </Variable>
- <Variable Name="Sun rays attenuation" Value="1.5">
-  <Spline Keys="0:0.1:36,0.25:1.5:36,0.5:1.5:65572,0.75:1.5:36,1:0.1:36,"/>
+ <Variable Name="Sun rays attenuation" Value="0.1">
+  <Spline Keys="0:0.1:36"/>
  </Variable>
  <Variable Name="Sun rays suncolor influence" Value="0.5">
-  <Spline Keys="0:0.5:36,0.25:0.5:36,0.5:0.5:65572,0.75:0.5:36,1:0.5:36,"/>
+  <Spline Keys="0:0.5:36"/>
  </Variable>
- <Variable Name="Sun rays custom color" Color="0.66538697,0.83879906,0.94730699">
-  <Spline Keys="0:(0.665387:0.838799:0.947307):36,0.25:(0.665387:0.838799:0.947307):36,0.5:(0.665387:0.838799:0.947307):458788,0.75:(0.665387:0.838799:0.947307):36,1:(0.665387:0.838799:0.947307):36,"/>
+ <Variable Name="Sun rays custom color" Color="0.66538697,0.838799,0.94730699">
+  <Spline Keys="0:(0.665387:0.838799:0.947307):36"/>
  </Variable>
- <Variable Name="Ocean fog color" Color="0.0012141101,0.0091340598,0.017642001">
-  <Spline Keys="0:(0.00121411:0.00913406:0.017642):36,0.25:(0.00121411:0.00913406:0.017642):36,0.5:(0.00121411:0.00913406:0.017642):458788,0.75:(0.00121411:0.00913406:0.017642):36,1:(0.00121411:0.00913406:0.017642):36,"/>
+ <Variable Name="Ocean fog color" Color="0.0012141099,0.0091340598,0.017642001">
+  <Spline Keys="0:(0.00121411:0.00913406:0.017642):36"/>
  </Variable>
  <Variable Name="Ocean fog color multiplier" Value="0.5">
-  <Spline Keys="0:0.5:36,0.25:0.5:36,0.5:0.5:65572,0.75:0.5:36,1:0.5:36,"/>
+  <Spline Keys="0:0.5:36"/>
  </Variable>
  <Variable Name="Ocean fog density" Value="0.5">
-  <Spline Keys="0:0.5:36,0.25:0.5:36,0.5:0.5:65572,0.75:0.5:36,1:0.5:36,"/>
+  <Spline Keys="0:0.5:36"/>
  </Variable>
  <Variable Name="Static skybox multiplier" Value="1">
-  <Spline Keys="0:1:0,1:1:0,"/>
+  <Spline Keys="0:1:0"/>
  </Variable>
- <Variable Name="Film curve shoulder scale" Value="2.232213">
-  <Spline Keys="0:3:36,0.229167:3:36,0.5:2:36,0.770833:3:36,1:3:36,"/>
+ <Variable Name="Film curve shoulder scale" Value="3">
+  <Spline Keys="0:3:36"/>
  </Variable>
- <Variable Name="Film curve midtones scale" Value="0.88389361">
-  <Spline Keys="0:0.5:36,0.229167:0.5:36,0.5:1:36,0.770833:0.5:36,1:0.5:36,"/>
+ <Variable Name="Film curve midtones scale" Value="0.5">
+  <Spline Keys="0:0.5:36"/>
  </Variable>
  <Variable Name="Film curve toe scale" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
+  <Spline Keys="0:1:36"/>
  </Variable>
  <Variable Name="Film curve whitepoint" Value="4">
-  <Spline Keys="0:4:36,0.25:4:36,0.5:4:65572,0.75:4:36,1:4:36,"/>
+  <Spline Keys="0:4:36"/>
  </Variable>
- <Variable Name="Saturation" Value="1">
-  <Spline Keys="0:0.8:36,0.229167:0.8:36,0.5:1:36,0.751391:1:65572,0.770833:0.8:36,1:0.8:36,"/>
+ <Variable Name="Saturation" Value="0.80000001">
+  <Spline Keys="0:0.8:36"/>
  </Variable>
  <Variable Name="Color balance" Color="1,1,1">
-  <Spline Keys="0:(1:1:1):36,0.25:(1:1:1):36,0.5:(1:1:1):36,0.75:(1:1:1):36,1:(1:1:1):36,"/>
+  <Spline Keys="0:(1:1:1):36"/>
  </Variable>
- <Variable Name="Scene key" Value="0.18000002">
-  <Spline Keys="0:0.18:36,0.25:0.18:36,0.5:0.18:65572,0.75:0.18:36,1:0.18:36,"/>
+ <Variable Name="Scene key" Value="0.18000001">
+  <Spline Keys="0:0.18:36"/>
  </Variable>
  <Variable Name="Min exposure" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
+  <Spline Keys="0:1:36"/>
  </Variable>
- <Variable Name="Max exposure" Value="2.6142297">
-  <Spline Keys="0:2:36,0.229167:2:36,0.5:2.8:36,0.770833:2:36,1:2:36,"/>
+ <Variable Name="Max exposure" Value="2">
+  <Spline Keys="0:2:36"/>
  </Variable>
  <Variable Name="EV Min" Value="4.5">
-  <Spline Keys="0:4.5:0,1:4.5:0,"/>
+  <Spline Keys="0:4.5:0"/>
  </Variable>
  <Variable Name="EV Max" Value="17">
-  <Spline Keys="0:17:0,1:17:0,"/>
+  <Spline Keys="0:17:0"/>
  </Variable>
  <Variable Name="EV Auto compensation" Value="1.5">
-  <Spline Keys="0:1.5:0,1:1.5:0,"/>
+  <Spline Keys="0:1.5:0"/>
  </Variable>
- <Variable Name="Bloom amount" Value="0.30899152">
-  <Spline Keys="0:1:36,0.229167:1:36,0.5:0.1:36,0.770833:1:36,1:1:36,"/>
+ <Variable Name="Bloom amount" Value="1">
+  <Spline Keys="0:1:36"/>
  </Variable>
- <Variable Name="Filters: grain" Value="0">
-  <Spline Keys="0:0.3:65572,0.229167:0.3:36,0.25:0:36,0.5:0:36,0.75:0:36,1:0.3:36,"/>
+ <Variable Name="Filters: grain" Value="0.30000001">
+  <Spline Keys="0:0.3:65572"/>
  </Variable>
  <Variable Name="Filters: photofilter color" Color="0,0,0">
-  <Spline Keys="0:(0:0:0):36,0.25:(0:0:0):36,0.5:(0:0:0):458788,0.75:(0:0:0):36,1:(0:0:0):36,"/>
+  <Spline Keys="0:(0:0:0):36"/>
  </Variable>
  <Variable Name="Filters: photofilter density" Value="0">
-  <Spline Keys="0:0:36,0.25:0:36,0.5:0:36,0.75:0:36,1:0:36,"/>
+  <Spline Keys="0:0:36"/>
  </Variable>
- <Variable Name="Dof: focus range" Value="500.00003">
-  <Spline Keys="0:500:36,0.25:500:36,0.5:500:65572,0.75:500:36,1:500:36,"/>
+ <Variable Name="Dof: focus range" Value="500">
+  <Spline Keys="0:500:36"/>
  </Variable>
- <Variable Name="Dof: blur amount" Value="0.10000001">
-  <Spline Keys="0:0.1:36,0.25:0.1:36,0.5:0.1:65572,0.75:0.1:36,1:0.1:36,"/>
+ <Variable Name="Dof: blur amount" Value="0.1">
+  <Spline Keys="0:0.1:36"/>
  </Variable>
- <Variable Name="Cascade 0: Bias" Value="0.10000001">
-  <Spline Keys="0:0.1:36,0.25:0.1:36,0.5:0.1:65572,0.75:0.1:36,1:0.1:36,"/>
+ <Variable Name="Cascade 0: Bias" Value="0.1">
+  <Spline Keys="0:0.1:36"/>
  </Variable>
  <Variable Name="Cascade 0: Slope Bias" Value="64">
-  <Spline Keys="0:64:36,0.25:64:36,0.5:64:65572,0.75:64:36,1:64:36,"/>
+  <Spline Keys="0:64:36"/>
  </Variable>
- <Variable Name="Cascade 1: Bias" Value="0.10000001">
-  <Spline Keys="0:0.1:36,0.25:0.1:36,0.5:0.1:65572,0.75:0.1:36,1:0.1:36,"/>
+ <Variable Name="Cascade 1: Bias" Value="0.1">
+  <Spline Keys="0:0.1:36"/>
  </Variable>
  <Variable Name="Cascade 1: Slope Bias" Value="23">
-  <Spline Keys="0:23:36,0.25:23:36,0.5:23:65572,0.75:23:36,1:23:36,"/>
+  <Spline Keys="0:23:36"/>
  </Variable>
- <Variable Name="Cascade 2: Bias" Value="0.10000001">
-  <Spline Keys="0:0.1:36,0.25:0.1:36,0.5:0.1:65572,0.75:0.1:36,1:0.1:36,"/>
+ <Variable Name="Cascade 2: Bias" Value="0.1">
+  <Spline Keys="0:0.1:36"/>
  </Variable>
  <Variable Name="Cascade 2: Slope Bias" Value="4">
-  <Spline Keys="0:4:36,0.25:4:36,0.5:4:65572,0.75:4:36,1:4:36,"/>
+  <Spline Keys="0:4:36"/>
  </Variable>
- <Variable Name="Cascade 3: Bias" Value="0.10000001">
-  <Spline Keys="0:0.1:36,0.25:0.1:36,0.5:0.1:36,0.75:0.1:36,1:0.1:36,"/>
+ <Variable Name="Cascade 3: Bias" Value="0.1">
+  <Spline Keys="0:0.1:36"/>
  </Variable>
  <Variable Name="Cascade 3: Slope Bias" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
+  <Spline Keys="0:1:36"/>
  </Variable>
- <Variable Name="Cascade 4: Bias" Value="0.10000001">
-  <Spline Keys="0:0.1:0,0.25:0.1:36,0.5:0.1:65572,0.75:0.1:36,1:0.1:36,"/>
+ <Variable Name="Cascade 4: Bias" Value="0.1">
+  <Spline Keys="0:0.1:0"/>
  </Variable>
  <Variable Name="Cascade 4: Slope Bias" Value="1">
-  <Spline Keys="0:1:0,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
+  <Spline Keys="0:1:0"/>
  </Variable>
  <Variable Name="Cascade 5: Bias" Value="0.0099999998">
-  <Spline Keys="0:0.01:0,0.25:0.01:36,0.5:0.01:65572,0.75:0.01:36,1:0.01:36,"/>
+  <Spline Keys="0:0.01:0"/>
  </Variable>
  <Variable Name="Cascade 5: Slope Bias" Value="1">
-  <Spline Keys="0:1:0,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
+  <Spline Keys="0:1:0"/>
  </Variable>
- <Variable Name="Cascade 6: Bias" Value="0.10000001">
-  <Spline Keys="0:0.1:0,0.25:0.1:36,0.5:0.1:36,0.75:0.1:36,1:0.1:36,"/>
+ <Variable Name="Cascade 6: Bias" Value="0.1">
+  <Spline Keys="0:0.1:0"/>
  </Variable>
  <Variable Name="Cascade 6: Slope Bias" Value="1">
-  <Spline Keys="0:1:0,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
+  <Spline Keys="0:1:0"/>
  </Variable>
- <Variable Name="Cascade 7: Bias" Value="0.10000001">
-  <Spline Keys="0:0.1:0,0.25:0.1:36,0.5:0.1:36,0.75:0.1:36,1:0.1:36,"/>
+ <Variable Name="Cascade 7: Bias" Value="0.1">
+  <Spline Keys="0:0.1:0"/>
  </Variable>
  <Variable Name="Cascade 7: Slope Bias" Value="1">
-  <Spline Keys="0:1:0,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
+  <Spline Keys="0:1:0"/>
  </Variable>
- <Variable Name="Shadow jittering" Value="2.4999998">
-  <Spline Keys="0:5:36,0.25:2.5:36,0.5:2.5:65572,0.75:2.5:36,1:5:0,"/>
+ <Variable Name="Shadow jittering" Value="5">
+  <Spline Keys="0:5:36"/>
  </Variable>
  <Variable Name="HDR dynamic power factor" Value="0">
-  <Spline Keys="0:0:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0:36,"/>
+  <Spline Keys="0:0:36"/>
  </Variable>
  <Variable Name="Sky brightening (terrain occlusion)" Value="0">
-  <Spline Keys="0:0:36,0.25:0:36,0.5:0:36,0.75:0:36,1:0:36,"/>
+  <Spline Keys="0:0:36"/>
  </Variable>
- <Variable Name="Sun color multiplier" Value="9.999999">
-  <Spline Keys="0:0.1:36,0.25:10:36,0.5:10:36,0.75:10:36,1:0.1:36,"/>
+ <Variable Name="Sun color multiplier" Value="0.1">
+  <Spline Keys="0:0.1:36"/>
  </Variable>
 </TimeOfDay>

AutomatedTesting/game.cfg

@@ -1,7 +1,7 @@
 sys_game_name = "AutomatedTesting"
 sys_localization_folder = Localization
 ca_useIMG_CAF = 0
-sys_asserts=2
+sys_asserts=1
 
 -- Enable warnings when asset loads take longer than the given millisecond threshold
 cl_assetLoadWarningEnable=true

Code/CryEngine/CrySystem/SystemInit.cpp

@@ -247,7 +247,7 @@ CUNIXConsole* pUnixConsole;
 
 #define LOCALIZATION_TRANSLATIONS_LIST_FILE_NAME "Libs/Localization/localization.xml"
 
-#define LOAD_LEGACY_RENDERER_FOR_EDITOR true // If you set this to false you must for now also set 'ed_useAtomNativeViewport' to true (see /Code/Sandbox/Editor/ViewManager.cpp)
+#define LOAD_LEGACY_RENDERER_FOR_EDITOR false // If you set this to true you must also set 'ed_useAtomNativeViewport' to false (see /Code/Sandbox/Editor/ViewManager.cpp)
 #define LOAD_LEGACY_RENDERER_FOR_LAUNCHER false
 
 //////////////////////////////////////////////////////////////////////////
@@ -1294,7 +1294,7 @@ bool CSystem::OpenRenderLibrary(int type, const SSystemInitParams& initParams)
     const char* libname = "";
     if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
     {
-        libname = "CryRenderOther";
+        libname = DLL_RENDERER_NULL;
     }
     else if (type == R_DX9_RENDERER)
     {

Code/CryEngine/RenderDll/Common/Textures/TextureManager.cpp

@@ -131,78 +131,18 @@ void CTextureManager::LoadDefaultTextures()
 #endif
     };
 
-    // Reduced list of default textures to load.
-    const TextureEntry texturesFromFileReduced[] =
+    for (const TextureEntry& entry : texturesFromFile)
     {
-        {"NoTextureCM",                 "EngineAssets/TextureMsg/ReplaceMeCM.tif",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"White",                       "EngineAssets/Textures/White.tif",                         FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"Gray",                        "EngineAssets/Textures/Grey.dds",                          FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"Black",                       "EngineAssets/Textures/Black.tif",                         FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"BlackAlpha",                  "EngineAssets/Textures/BlackAlpha.tif",                    FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"BlackCM",                     "EngineAssets/Textures/BlackCM.tif",                       FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"FlatBump",                    "EngineAssets/Textures/White_ddn.tif",                     FT_DONT_RELEASE | FT_DONT_STREAM | FT_TEX_NORMAL_MAP },
-        {"AverageMemoryUsage",          "EngineAssets/Icons/AverageMemoryUsage.tif",               FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"LowMemoryUsage",              "EngineAssets/Icons/LowMemoryUsage.tif",                   FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"HighMemoryUsage",             "EngineAssets/Icons/HighMemoryUsage.tif",                  FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"LivePreview",                 "EngineAssets/Icons/LivePreview.tif",                      FT_DONT_RELEASE | FT_DONT_STREAM },
-#if !defined(_RELEASE)
-        {"NoTexture",                   "EngineAssets/TextureMsg/ReplaceMe.tif",                   FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling",        "EngineAssets/TextureMsg/TextureCompiling.tif",            FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling_a",      "EngineAssets/TextureMsg/TextureCompiling_a.tif",          FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling_cm",     "EngineAssets/TextureMsg/TextureCompiling_cm.tif",         FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling_ddn",    "EngineAssets/TextureMsg/TextureCompiling_ddn.tif",        FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"IconTextureCompiling_ddna",   "EngineAssets/TextureMsg/TextureCompiling_ddna.tif",       FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"DefaultMergedDetail",         "EngineAssets/Textures/GreyAlpha.tif",                     FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"MipMapDebug",                 "EngineAssets/TextureMsg/MipMapDebug.tif",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorBlue",                   "EngineAssets/TextureMsg/color_Blue.tif",                  FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorCyan",                   "EngineAssets/TextureMsg/color_Cyan.tif",                  FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorGreen",                  "EngineAssets/TextureMsg/color_Green.tif",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorPurple",                 "EngineAssets/TextureMsg/color_Purple.tif",                FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorRed",                    "EngineAssets/TextureMsg/color_Red.tif",                   FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorWhite",                  "EngineAssets/TextureMsg/color_White.tif",                 FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorYellow",                 "EngineAssets/TextureMsg/color_Yellow.tif",                FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorOrange",                 "EngineAssets/TextureMsg/color_Orange.tif",                FT_DONT_RELEASE | FT_DONT_STREAM },
-        {"ColorMagenta",                "EngineAssets/TextureMsg/color_Magenta.tif",               FT_DONT_RELEASE | FT_DONT_STREAM },
-#else
-        {"NoTexture",                   "EngineAssets/TextureMsg/ReplaceMeRelease.tif",            FT_DONT_RELEASE | FT_DONT_STREAM },
-#endif
-    };
-
-    // Loop over the appropriate texture list and load the textures, storing them in a map keyed by texture name.
-    // Use reduced subset of textures for Other.
-    if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
-    {
-        for (const TextureEntry& entry : texturesFromFileReduced)
+        CTexture* pNewTexture = CTexture::ForName(entry.szFileName, entry.flags, eTF_Unknown);
+        if (pNewTexture)
         {
-            // Use EF_LoadTexture rather than CTexture::ForName
-            CTexture* pNewTexture = static_cast<CTexture*>(gEnv->pRenderer->EF_LoadTexture(entry.szFileName, entry.flags));
-            if (pNewTexture)
-            {
-                CCryNameTSCRC texEntry(entry.szTextureName);
-                m_DefaultTextures[texEntry] = pNewTexture;
-            }
-            else
-            {
-                AZ_Assert(false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
-                AZ_Warning("[Shaders System]", false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
-            }
+            CCryNameTSCRC texEntry(entry.szTextureName);
+            m_DefaultTextures[texEntry] = pNewTexture;
         }
-    }
-    else
-    {
-        for (const TextureEntry& entry : texturesFromFile)
+        else
         {
-            CTexture* pNewTexture = CTexture::ForName(entry.szFileName, entry.flags, eTF_Unknown);
-            if (pNewTexture)
-            {
-                CCryNameTSCRC texEntry(entry.szTextureName);
-                m_DefaultTextures[texEntry] = pNewTexture;
-            }
-            else
-            {
-                AZ_Assert(false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
-                AZ_Warning("[Shaders System]", false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
-            }
+            AZ_Assert(false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
+            AZ_Warning("[Shaders System]", false, "Error - CTextureManager failed to load default texture %s", entry.szFileName);
         }
     }
 

Code/Framework/AzCore/AzCore/Serialization/EditContextConstants.inl

@@ -118,6 +118,7 @@ namespace AZ
             const static AZ::Crc32 StringLineEditingCompleteNotify = AZ_CRC("StringLineEditingCompleteNotify", 0x139e5fa9);
 
             const static AZ::Crc32 NameLabelOverride = AZ_CRC("NameLabelOverride", 0x9ff79cab);
+            const static AZ::Crc32 AssetPickerTitle = AZ_CRC_CE("AssetPickerTitle");
             const static AZ::Crc32 ChildNameLabelOverride = AZ_CRC("ChildNameLabelOverride", 0x73dd2909);
             //! Container attribute that is used to override labels for its elements given the index of the element
             const static AZ::Crc32 IndexedChildNameLabelOverride = AZ_CRC("IndexedChildNameLabelOverride", 0x5f313ac2);

Code/Framework/AzFramework/AzFramework/Physics/Character.h

@@ -78,7 +78,7 @@ namespace Physics
         float m_minimumMovementDistance = 0.001f; //!< To avoid jittering, the controller will not attempt to move distances below this.
         float m_maximumSpeed = 100.0f; //!< If the accumulated requested velocity for a tick exceeds this magnitude, it will be clamped.
         AZStd::string m_colliderTag; //!< Used to identify the collider associated with the character controller.
-        AZStd::shared_ptr<Physics::ShapeConfiguration> m_shapeConfig = nullptr; //!< The shape to use when creating the character controller.
+        AZStd::shared_ptr<Physics::ShapeConfiguration> m_shapeConfig; //!< The shape to use when creating the character controller.
         AZStd::vector<AZStd::shared_ptr<Physics::Shape>> m_colliders; //!< The list of colliders to attach to the character controller.
     };
 

Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.h

@@ -55,7 +55,7 @@ namespace AzPhysics
 
         //! Flag to determine if the body is part of the simulation.
         //! When true the body will be affected by any forces, collisions, and found with scene queries.
-        bool m_simulating = true;
+        bool m_simulating = false;
 
         //! Helper functions for setting user data.
         //! @param userData Can be a pointer to any type as internally will be cast to a void*. Object lifetime not managed by the SimulatedBody.

Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.cpp

@@ -46,6 +46,7 @@ namespace AzPhysics
                 ->Field("orientation", &SimulatedBodyConfiguration::m_orientation)
                 ->Field("scale", &SimulatedBodyConfiguration::m_scale)
                 ->Field("entityId", &SimulatedBodyConfiguration::m_entityId)
+                ->Field("startSimulationEnabled", &SimulatedBodyConfiguration::m_startSimulationEnabled)
                 ;
         }
     }

Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.h

@@ -39,6 +39,7 @@ namespace AzPhysics
         AZ::Vector3 m_position = AZ::Vector3::CreateZero();
         AZ::Quaternion m_orientation = AZ::Quaternion::CreateIdentity();
         AZ::Vector3 m_scale = AZ::Vector3::CreateOne();
+        bool m_startSimulationEnabled = true;
 
         // Entity/object association.
         AZ::EntityId m_entityId = AZ::EntityId(AZ::EntityId::InvalidEntityId);

Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.cpp

@@ -52,6 +52,11 @@ namespace Physics
         }
     }
 
+    RagdollConfiguration::RagdollConfiguration()
+    {
+        m_startSimulationEnabled = false; //ragdolls do not start enabled.
+    }
+
     void RagdollConfiguration::Reflect(AZ::ReflectContext* context)
     {
         AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);

Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h

@@ -24,6 +24,8 @@
 
 namespace Physics
 {
+    using ParentIndices = AZStd::vector<size_t>;
+
     class RagdollNodeConfiguration
         : public AzPhysics::RigidBodyConfiguration
     {
@@ -46,7 +48,7 @@ namespace Physics
         AZ_RTTI(RagdollConfiguration, "{7C96D332-61D8-4C58-A2BF-707716D38D14}", AzPhysics::SimulatedBodyConfiguration);
         static void Reflect(AZ::ReflectContext* context);
 
-        RagdollConfiguration() = default;
+        RagdollConfiguration();
         explicit RagdollConfiguration(const RagdollConfiguration& settings) = default;
 
         RagdollNodeConfiguration* FindNodeConfigByName(const AZStd::string& nodeName) const;
@@ -56,6 +58,8 @@ namespace Physics
 
         AZStd::vector<RagdollNodeConfiguration> m_nodes;
         CharacterColliderConfiguration m_colliders;
+        RagdollState m_initialState;
+        ParentIndices m_parentIndices;
     };
 
     /// Represents a single rigid part of a ragdoll.
@@ -79,7 +83,7 @@ namespace Physics
     {
     public:
         AZ_CLASS_ALLOCATOR(Ragdoll, AZ::SystemAllocator, 0);
-        AZ_RTTI(Ragdoll, "{01F09602-80EC-4693-A0E7-C2719239044B}", AzPhysics::SimulatedBody);
+        AZ_RTTI(Physics::Ragdoll, "{01F09602-80EC-4693-A0E7-C2719239044B}", AzPhysics::SimulatedBody);
         virtual ~Ragdoll() = default;
 
         /// Inserts the ragdoll into the physics simulation.

Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp

@@ -26,6 +26,22 @@ namespace Physics
                 ->Field("Scale", &ShapeConfiguration::m_scale)
                 ;
         }
+
+        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
+        {
+            #define REFLECT_SHAPETYPE_ENUM_VALUE(EnumValue)                                                                                            \
+                behaviorContext->EnumProperty<(int)Physics::ShapeType::EnumValue>("ShapeType_"#EnumValue)                                                      \
+                    ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)                                         \
+                    ->Attribute(AZ::Script::Attributes::Module, "physics");
+
+            // Note: Here we only expose the types that are available to the user in the editor
+            REFLECT_SHAPETYPE_ENUM_VALUE(Box);
+            REFLECT_SHAPETYPE_ENUM_VALUE(Sphere);
+            REFLECT_SHAPETYPE_ENUM_VALUE(Cylinder);
+            REFLECT_SHAPETYPE_ENUM_VALUE(PhysicsAsset);
+
+            #undef REFLECT_SHAPETYPE_ENUM_VALUE
+        }
     }
 
     void SphereShapeConfiguration::Reflect(AZ::ReflectContext* context)

Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ProgressBar.qss

@@ -24,5 +24,5 @@ QProgressBar
 
 QProgressBar::chunk
 {
-    background: #54AFD0;
+    background: #1E70EB;
 }

Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini

@@ -13,14 +13,14 @@ Width=24;
 ArrowWidth=10;
 
 [PrimaryColorSet]
-Disabled\Start=#7092A7
-Disabled\End=#7092A7
-Sunken\Start=#0073BB
-Sunken\End=#0073BB
-Hovered\Start=#44BAFF
-Hovered\End=#4AB2F8
+Disabled\Start=#2A4875
+Disabled\End=#2A4875
+Sunken\Start=#1E70EB
+Sunken\End=#1E70EB
+Hovered\Start=#4ABAFF
+Hovered\End=#94D2FF
 Normal\Start=#0095F2
-Normal\End=#0073BB
+Normal\End=#1E70EB
 
 [SecondaryColorSet]
 Disabled\Start=#666666
@@ -42,10 +42,10 @@ Color=#3D000000
 
 [FocusedBorder]
 Thickness=1
-Color=#00A1C9
+Color=#4B8CEF
 
 [IconButton]
-ActiveColor=#00A1C9
+ActiveColor=#1E70EB
 DisabledColor=#999999
 SelectedColor=#FFFFFF
 

Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SliderConfig.ini

@@ -12,7 +12,7 @@ HandleBorder\Color=#FFFFFF
 HandleBorder\Radius=1.5
 
 [Slider]
-Handle\Color=#0185D7
+Handle\Color=#1E70EB
 Handle\ColorDisabled=#999999
 Handle\Size=12
 Handle\SizeMinusMargin=8

Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Text.cpp

@@ -46,7 +46,7 @@ namespace AzQtComponents
     Text::Config Text::defaultConfig()
     {
         Config config;
-        config.hyperlinkColor = QStringLiteral("#44B2F8");
+        config.hyperlinkColor = QStringLiteral("#94D2FF");
 
         return config;
     }

Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TextConfig.ini

@@ -1,2 +1,2 @@
 [Hyperlink]
-Color=#44B2F8
+Color=#94D2FF

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/off-focus.svg

@@ -4,7 +4,7 @@
     <title>Selection Controls / Checkbox / Off</title>
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-Off" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="checkbox-(off)" stroke="#00A1C9">
+        <g id="checkbox-(off)" stroke="#4B8CEF">
             <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape"></path>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on-disabled.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-On---Disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="checkbox-(on)">
-            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#7092A7"></path>
+            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#2A4875"></path>
             <polygon id="Path" fill="#BBBBBB" points="1 8.19230769 2.4 6.84615385 6 10.3076923 13.6 3 15 4.34615385 6 13"></polygon>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on-focus.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-On-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="checkbox-(on)">
-            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#00A1C9" fill="#0073BB"></path>
+            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#4B8CEF" fill="#1E70EB"></path>
             <polygon id="Path" fill="#FFFFFF" points="1 8.19230769 2.4 6.84615385 6 10.3076923 13.6 3 15 4.34615385 6 13"></polygon>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/on.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-On" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="checkbox-(on)">
-            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#0073BB"></path>
+            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#1E70EB"></path>
             <polygon id="Path" fill="#FFFFFF" points="1 8.19230769 2.4 6.84615385 6 10.3076923 13.6 3 15 4.34615385 6 13"></polygon>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected-disabled.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-Partial-Selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Group">
-            <rect id="Rectangle-10" fill="#7092A7" x="0" y="0" width="16" height="16" rx="2"></rect>
+            <rect id="Rectangle-10" fill="#2A4875" x="0" y="0" width="16" height="16" rx="2"></rect>
             <rect id="Rectangle-9" fill="#BBBBBB" x="3" y="7" width="10" height="2"></rect>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected-focus.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-Partial-Selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Group">
-            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#00A1C9" fill="#0073BB"></path>
+            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#4B8CEF" fill="#1E70EB"></path>
             <rect id="Rectangle-9" fill="#FFFFFF" x="3" y="7" width="10" height="2"></rect>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/checkbox/partial-selected.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Checkbox-/-Partial-Selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Group">
-            <rect id="Rectangle-10" fill="#0073BB" x="0" y="0" width="16" height="16" rx="2"></rect>
+            <rect id="Rectangle-10" fill="#1E70EB" x="0" y="0" width="16" height="16" rx="2"></rect>
             <rect id="Rectangle-9" fill="#FFFFFF" x="3" y="7" width="10" height="2"></rect>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked-disabled.svg

@@ -4,7 +4,7 @@
     <title>Selection Controls / Radio Button / On - Disabled</title>
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Radio-Button-/-On---Disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <circle id="Oval" fill="#7092A7" cx="8" cy="8" r="8"></circle>
+        <circle id="Oval" fill="#2A4875" cx="8" cy="8" r="8"></circle>
         <circle id="Oval" fill="#BBBBBB" cx="8" cy="8" r="4"></circle>
     </g>
 </svg>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked-focus.svg

@@ -4,7 +4,7 @@
     <title>Selection Controls / Radio Button / On-focus</title>
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Radio-Button-/-On-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <circle id="Oval" stroke="#00A1C9" fill="#0073BB" cx="9" cy="9" r="8.5"></circle>
+        <circle id="Oval" stroke="#4B8CEF" fill="#1E70EB" cx="9" cy="9" r="8.5"></circle>
         <circle id="Oval" fill="#FFFFFF" cx="9" cy="9" r="4"></circle>
     </g>
 </svg>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/checked.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Radio-Button-/-On" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="radio-button-(on)">
-            <circle id="Oval" fill="#0073BB" cx="8" cy="8" r="8"></circle>
+            <circle id="Oval" fill="#1E70EB" cx="8" cy="8" r="8"></circle>
             <circle id="Oval" fill="#FFFFFF" cx="8" cy="8" r="4"></circle>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/radiobutton/unchecked-focus.svg

@@ -4,7 +4,7 @@
     <title>Selection Controls / Radio Button / Off-focus</title>
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Radio-Button-/-Off-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="radio-button-(off)" transform="translate(1.000000, 1.000000)" stroke="#00A1C9">
+        <g id="radio-button-(off)" transform="translate(1.000000, 1.000000)" stroke="#4B8CEF">
             <circle id="Oval" cx="8" cy="8" r="8.5"></circle>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked-disabled.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Switch-/-On---Disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="switch-(on)">
-            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#7092A7"></path>
+            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#2A4875"></path>
             <circle id="knob" fill="#BBBBBB" cx="24" cy="8" r="6"></circle>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked-focus.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Switch-/-On-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="switch-(on)" transform="translate(1.000000, 1.000000)">
-            <path d="M25.4117647,16.5 L6.58823529,16.5 C2.61773665,16.5 -0.5,12.7141769 -0.5,8 C-0.5,3.28582307 2.61773665,-0.5 6.58823529,-0.5 L25.4117647,-0.5 C29.3822634,-0.5 32.5,3.28582307 32.5,8 C32.5,12.7141769 29.3822634,16.5 25.4117647,16.5 Z" id="track" stroke="#00A1C9" fill="#0073BB"></path>
+            <path d="M25.4117647,16.5 L6.58823529,16.5 C2.61773665,16.5 -0.5,12.7141769 -0.5,8 C-0.5,3.28582307 2.61773665,-0.5 6.58823529,-0.5 L25.4117647,-0.5 C29.3822634,-0.5 32.5,3.28582307 32.5,8 C32.5,12.7141769 29.3822634,16.5 25.4117647,16.5 Z" id="track" stroke="#4B8CEF" fill="#1E70EB"></path>
             <circle id="knob" fill="#FFFFFF" cx="24" cy="8" r="6"></circle>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/checked.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Switch-/-On" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="switch-(on)">
-            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#0073BB"></path>
+            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#1E70EB"></path>
             <circle id="knob" fill="#FFFFFF" cx="24" cy="8" r="6"></circle>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toggleswitch/unchecked-focus.svg

@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <g id="Selection-Controls-/-Switch-/-Off-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="switch-(off)" transform="translate(1.000000, 1.000000)">
-            <path d="M25.0231909,16.5 L7.01632718,16.5 C2.97419648,16.5 -0.5,12.6299076 -0.5,8 C-0.5,3.37009242 2.97419648,-0.5 7.01632718,-0.5 L25.0231909,-0.5 C29.0586432,-0.5 32.5,3.36297526 32.5,8 C32.5,12.6370247 29.0586432,16.5 25.0231909,16.5 Z" id="track" stroke="#00A1C9"></path>
+            <path d="M25.0231909,16.5 L7.01632718,16.5 C2.97419648,16.5 -0.5,12.6299076 -0.5,8 C-0.5,3.37009242 2.97419648,-0.5 7.01632718,-0.5 L25.0231909,-0.5 C29.0586432,-0.5 32.5,3.36297526 32.5,8 C32.5,12.6370247 29.0586432,16.5 25.0231909,16.5 Z" id="track" stroke="#4B8CEF"></path>
             <circle id="knob" fill="#FFFFFF" cx="8" cy="8" r="6"></circle>
         </g>
     </g>

Code/Framework/AzQtComponents/AzQtComponents/Components/img/loading.svg

@@ -1,6 +1,6 @@
  <svg version="1.1" class="loader" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
  width="40px" height="40px" viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
-  <path fill="#54AFD0" d="M43.935,25.145c0-10.318-8.364-18.683-18.683-18.683c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615c8.072,0,14.615,6.543,14.615,14.615H43.935z">
+  <path fill="#1E70EB" d="M43.935,25.145c0-10.318-8.364-18.683-18.683-18.683c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615c8.072,0,14.615,6.543,14.615,14.615H43.935z">
     <animateTransform attributeType="xml"
       attributeName="transform"
       type="rotate"

Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h

@@ -348,6 +348,11 @@ namespace AzToolsFramework
          */
         virtual bool AreAnyEntitiesSelected() = 0;
 
+        /*!
+         * Returns the number of selected entities.
+         */
+        virtual int GetSelectedEntitiesCount() = 0;
+
         /*!
          * Retrieves the set of selected entities.
          * \return a list of entity Ids.

Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp

@@ -395,6 +395,7 @@ namespace AzToolsFramework
                 ->Event("MarkEntityDeselected", &ToolsApplicationRequests::MarkEntityDeselected)
                 ->Event("IsSelected", &ToolsApplicationRequests::IsSelected)
                 ->Event("AreAnyEntitiesSelected", &ToolsApplicationRequests::AreAnyEntitiesSelected)
+                ->Event("GetSelectedEntitiesCount", &ToolsApplicationRequests::GetSelectedEntitiesCount)
                 ;
 
             behaviorContext->EBus<ToolsApplicationNotificationBus>("ToolsApplicationNotificationBus")

Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h

@@ -101,6 +101,7 @@ namespace AzToolsFramework
         SourceControlFileInfo GetSceneSourceControlInfo() override;
 
         bool AreAnyEntitiesSelected() override { return !m_selectedEntities.empty(); }
+        int GetSelectedEntitiesCount() override { return m_selectedEntities.size(); }
         const EntityIdList& GetSelectedEntities() override { return m_selectedEntities; }
         const EntityIdList& GetHighlightedEntities() override { return m_highlightedEntities; }
         void SetSelectedEntities(const EntityIdList& selectedEntities) override;

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.cpp

@@ -53,8 +53,8 @@ namespace AzToolsFramework
         static constexpr const char* FolderIconPath = "Editor/Icons/AssetBrowser/Folder_16.svg";
         static constexpr const char* GemIconPath = "Editor/Icons/AssetBrowser/GemFolder_16.svg";
 
-        FolderThumbnail::FolderThumbnail(SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        FolderThumbnail::FolderThumbnail(SharedThumbnailKey key)
+            : Thumbnail(key)
         {}
 
         void FolderThumbnail::LoadThread()
@@ -69,7 +69,8 @@ namespace AzToolsFramework
             AZStd::string absoluteIconPath;
             AZ::StringFunc::Path::Join(engineRoot, folderIcon, absoluteIconPath);
 
-            m_icon = QIcon(absoluteIconPath.c_str());
+            m_pixmap.load(absoluteIconPath.c_str());
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
         //////////////////////////////////////////////////////////////////////////

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.h

@@ -47,7 +47,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            FolderThumbnail(SharedThumbnailKey key, int thumbnailSize);
+            FolderThumbnail(SharedThumbnailKey key);
             void LoadThread() override;
         };
 

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp

@@ -57,8 +57,8 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         static const char* DEFAULT_PRODUCT_ICON_PATH = "Editor/Icons/AssetBrowser/DefaultProduct_16.svg";
 
-        ProductThumbnail::ProductThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        ProductThumbnail::ProductThumbnail(Thumbnailer::SharedThumbnailKey key)
+            : Thumbnail(key)
         {}
 
         void ProductThumbnail::LoadThread() 
@@ -96,12 +96,8 @@ namespace AzToolsFramework
                 iconPath = QString::fromUtf8(DEFAULT_PRODUCT_ICON_PATH);
             }
 
-            m_icon = QIcon(iconPath);
-
-            if (m_icon.isNull())
-            {
-                m_state = State::Failed;
-            }
+            m_pixmap.load(iconPath);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
         //////////////////////////////////////////////////////////////////////////

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.h

@@ -44,7 +44,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            ProductThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+            ProductThumbnail(Thumbnailer::SharedThumbnailKey key);
 
         protected:
             void LoadThread() override;

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp

@@ -58,8 +58,8 @@ namespace AzToolsFramework
         static constexpr const char* DefaultFileIconPath = "Editor/Icons/AssetBrowser/Default_16.svg";
         QMutex SourceThumbnail::m_mutex;
 
-        SourceThumbnail::SourceThumbnail(SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        SourceThumbnail::SourceThumbnail(SharedThumbnailKey key)
+            : Thumbnail(key)
         {
         }
 
@@ -124,7 +124,8 @@ namespace AzToolsFramework
                 iconPathToUse = iconPath.c_str();
             }
 
-            m_icon = QIcon(iconPathToUse);
+            m_pixmap.load(iconPathToUse);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
         //////////////////////////////////////////////////////////////////////////

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.h

@@ -44,7 +44,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            SourceThumbnail(SharedThumbnailKey key, int thumbnailSize);
+            SourceThumbnail(SharedThumbnailKey key);
 
         protected:
             void LoadThread() override;

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/EntryDelegate.cpp

@@ -140,7 +140,7 @@ namespace AzToolsFramework
             else
             {
                 // Scaling and centering pixmap within bounds to preserve aspect ratio
-                const QPixmap pixmap = thumbnail->GetPixmap(size).scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+                const QPixmap pixmap = thumbnail->GetPixmap().scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
                 const QSize sizeDelta = size - pixmap.size();
                 const QPoint pointDelta = QPoint(sizeDelta.width() / 2, sizeDelta.height() / 2);
                 painter->drawPixmap(point + pointDelta, pixmap);

Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp

@@ -242,19 +242,6 @@ namespace AzToolsFramework
                 return false;
             }
         }
-        else  
-        {
-            // The template is already loaded, this is the case of either saving as same name or different name(loaded from before).
-            // Update the template with the changes
-            AzToolsFramework::Prefab::PrefabDom dom;
-            bool success = AzToolsFramework::Prefab::PrefabDomUtils::StoreInstanceInPrefabDom(*m_rootInstance, dom);
-            if (!success)
-            {
-                AZ_Error("Prefab", false, "Failed to convert current root instance into a DOM when saving file '%.*s'", AZ_STRING_ARG(filename));
-                return false;
-            }
-            m_prefabSystemComponent->UpdatePrefabTemplate(templateId, dom);
-        }
 
         Prefab::TemplateId prevTemplateId = m_rootInstance->GetTemplateId();
         m_rootInstance->SetTemplateId(templateId);

Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialBrowserComponent.cpp

@@ -36,8 +36,7 @@ namespace AzToolsFramework
             using namespace Thumbnailer;
             using namespace AssetBrowser;
             const char* contextName = "MaterialBrowser";
-            int thumbnailSize = qApp->style()->pixelMetric(QStyle::PM_SmallIconSize);
-            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterContext, contextName, thumbnailSize);
+            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterContext, contextName);
             ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(FolderThumbnailCache), contextName);
             ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(SourceThumbnailCache), contextName);
             ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(MaterialThumbnailCache), contextName);

Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialThumbnail.cpp

@@ -24,8 +24,8 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // MaterialThumbnail
         //////////////////////////////////////////////////////////////////////////
-        MaterialThumbnail::MaterialThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        MaterialThumbnail::MaterialThumbnail(Thumbnailer::SharedThumbnailKey key)
+            : Thumbnail(key)
         {
             auto productKey = azrtti_cast<const AzToolsFramework::AssetBrowser::ProductThumbnailKey*>(m_key.data());
             AZ_Assert(productKey, "Incorrect key type, excpected ProductThumbnailKey");
@@ -34,7 +34,8 @@ namespace AzToolsFramework
             MaterialBrowserRequestBus::BroadcastResult(multiMat, &MaterialBrowserRequests::IsMultiMaterial, productKey->GetAssetId());
 
             QString iconPath = multiMat ? MultiMaterialIconPath : SimpleMaterialIconPath;
-            m_pixmap = QPixmap(iconPath).scaled(m_thumbnailSize, m_thumbnailSize, Qt::KeepAspectRatio);
+            m_pixmap.load(iconPath);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
         }
 
         //////////////////////////////////////////////////////////////////////////

Code/Framework/AzToolsFramework/AzToolsFramework/MaterialBrowser/MaterialThumbnail.h

@@ -28,7 +28,7 @@ namespace AzToolsFramework
         {
             Q_OBJECT
         public:
-            MaterialThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+            MaterialThumbnail(Thumbnailer::SharedThumbnailKey key);
         };
 
         namespace

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.cpp

@@ -16,7 +16,6 @@
 #include <AzCore/Serialization/EditContext.h>
 #include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
 #include <AzToolsFramework/UI/EditorEntityUi/EditorEntityUiInterface.h>
-#include <AzToolsFramework/UI/Outliner/EntityOutlinerWidgetInterface.h>
 #include <AzToolsFramework/UI/Prefab/PrefabIntegrationBus.h>
 
 namespace AzToolsFramework

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceSerializer.cpp

@@ -200,7 +200,7 @@ namespace AzToolsFramework
             }
 
             return context.Report(result,
-                result.GetProcessing() == JSR::Processing::Completed ? "Succesfully loaded instance information for prefab." :
+                result.GetProcessing() == JSR::Processing::Completed ? "Successfully loaded instance information for prefab." :
                 "Failed to load instance information for prefab");
         }
 

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp

@@ -21,9 +21,9 @@
 #include <AzToolsFramework/Prefab/Instance/TemplateInstanceMapperInterface.h>
 #include <AzToolsFramework/Prefab/PrefabDomUtils.h>
 #include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
+#include <AzToolsFramework/Prefab/PrefabPublicNotificationBus.h>
 #include <AzToolsFramework/Prefab/PrefabSystemComponentInterface.h>
 #include <AzToolsFramework/Prefab/Template/Template.h>
-#include <AzToolsFramework/UI/Outliner/EntityOutlinerWidgetInterface.h>
 
 namespace AzToolsFramework
 {
@@ -90,17 +90,13 @@ namespace AzToolsFramework
 
                 if (instanceCountToUpdateInBatch > 0)
                 {
+                    // Notify Propagation has begun
+                    PrefabPublicNotificationBus::Broadcast(&PrefabPublicNotifications::OnPrefabInstancePropagationBegin);
+
                     EntityIdList selectedEntityIds;
                     ToolsApplicationRequestBus::BroadcastResult(selectedEntityIds, &ToolsApplicationRequests::GetSelectedEntities);
                     ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, EntityIdList());
 
-                    // Disable the Outliner to avoid showing the propagation steps
-                    EntityOutlinerWidgetInterface* entityOutlinerWidgetInterface = AZ::Interface<EntityOutlinerWidgetInterface>::Get();
-                    if (entityOutlinerWidgetInterface)
-                    {
-                        entityOutlinerWidgetInterface->SetUpdatesEnabled(false);
-                    }
-
                     for (int i = 0; i < instanceCountToUpdateInBatch; ++i)
                     {
                         Instance* instanceToUpdate = m_instancesUpdateQueue.front();
@@ -168,18 +164,8 @@ namespace AzToolsFramework
                     }
                     ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, selectedEntityIds);
 
-                    // Enable the Outliner
-                    if (entityOutlinerWidgetInterface)
-                    {
-                        entityOutlinerWidgetInterface->SetUpdatesEnabled(true);
-
-                        auto prefabPublicInterface = AZ::Interface<PrefabPublicInterface>::Get();
-                        if (prefabPublicInterface)
-                        {
-                            AZ::EntityId rootEntityId = prefabPublicInterface->GetLevelInstanceContainerEntityId();
-                            entityOutlinerWidgetInterface->ExpandEntityChildren(rootEntityId);
-                        }
-                    }
+                    // Notify Propagation has ended
+                    PrefabPublicNotificationBus::Broadcast(&PrefabPublicNotifications::OnPrefabInstancePropagationEnd);
                 }
 
                 m_updatingTemplateInstancesInQueue = false;