Merge branch 'upstream/development' into LYN-6769_TestingRPCs_AutonToAuth_ServerToAuth

AutomatedTesting/Gem/PythonCoverage/preview.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d6204c6730e5675791765ca194e9b1cbec282208e280507de830afc2805e5fa
-size 41127
+oid sha256:de0e6e480ece5b423222f4feacf56553d73713fe9afea8bbc9a2660a3cd54ec7
+size 1232

AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_World_ConfigurationWorks.py

@@ -93,7 +93,7 @@ def Terrain_World_ConfigurationWorks():
         # 5) Set the base Terrain World values
         world_bounds_max = azmath.Vector3(1100.0, 1100.0, 1100.0)
         world_bounds_min = azmath.Vector3(10.0, 10.0, 10.0)
-        height_query_resolution = azmath.Vector2(1.0, 1.0)
+        height_query_resolution = 1.0
         hydra.set_component_property_value(terrain_world_component, "Configuration|World Bounds (Max)", world_bounds_max)
         hydra.set_component_property_value(terrain_world_component, "Configuration|World Bounds (Min)", world_bounds_min)
         hydra.set_component_property_value(terrain_world_component, "Configuration|Height Query Resolution (m)", height_query_resolution)
@@ -148,7 +148,7 @@ def Terrain_World_ConfigurationWorks():
 
         # 13) Check height value is the expected one when query resolution is changed
         testpoint = terrain.TerrainDataRequestBus(bus.Broadcast, 'GetHeightFromFloats', 10.5, 10.5, CLAMP)
-        height_query_resolution = azmath.Vector2(0.5, 0.5)
+        height_query_resolution = 0.5
         hydra.set_component_property_value(terrain_world_component, "Configuration|Height Query Resolution (m)", height_query_resolution)
         general.idle_wait_frames(1)
         testpoint2 =  terrain.TerrainDataRequestBus(bus.Broadcast, 'GetHeightFromFloats', 10.5, 10.5, CLAMP)
@@ -165,4 +165,3 @@ if __name__ == "__main__":
 
     from editor_python_test_tools.utils import Report
     Report.start_test(Terrain_World_ConfigurationWorks)
-

AutomatedTesting/Gem/Sponza/preview.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de0e6e480ece5b423222f4feacf56553d73713fe9afea8bbc9a2660a3cd54ec7
+size 1232

AutomatedTesting/Gem/preview.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d6204c6730e5675791765ca194e9b1cbec282208e280507de830afc2805e5fa
-size 41127
+oid sha256:de0e6e480ece5b423222f4feacf56553d73713fe9afea8bbc9a2660a3cd54ec7
+size 1232

AutomatedTesting/Passes/MainPipeline.pass

@@ -42,6 +42,16 @@
                         "RayTracingAccelerationStructurePass"
                     ]
                 },
+                {
+                    "Name": "TerrainDetailTextureComputePass",
+                    "TemplateName": "TerrainDetailTextureComputePassTemplate",
+                    "Enabled": false
+                },
+                {
+                    "Name": "TerrainMacroTextureComputePass",
+                    "TemplateName": "TerrainMacroTextureComputePassTemplate",
+                    "Enabled": false
+                },
                 {
                     "Name": "DepthPrePass",
                     "TemplateName": "DepthMSAAParentTemplate",
@@ -215,7 +225,7 @@
                     // Note: The following two lines represent the choice of rendering pipeline for the hair.
                     // You can either choose to use PPLL or ShortCut and accordingly change the flag 
                     // 'm_usePPLLRenderTechnique' in the class 'HairFeatureProcessor.cpp'
-//                    "TemplateName": "HairParentPassTemplate",
+                    // "TemplateName": "HairParentPassTemplate",
                     "TemplateName": "HairParentShortCutPassTemplate",
                     "Enabled": true,
                     "Connections": [