merge from development

Signed-off-by: greerdv <[email protected]>

Assets/Editor/Icons/Components/PhysXStaticRigidBody.svg

@@ -0,0 +1,8 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / PhysX / RigidPhysics">
+<g id="Vector">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.9624 21.3433C8.09539 21.3433 4.1499 17.3978 4.1499 12.5308C4.1499 7.66375 8.09539 3.71826 12.9624 3.71826C17.8294 3.71826 21.7749 7.66375 21.7749 12.5308C21.7749 17.3978 17.8294 21.3433 12.9624 21.3433ZM12.1499 11.7183V4.38305C8.27687 4.76453 5.19617 7.84523 4.81469 11.7183H12.1499ZM13.3999 20.7068C17.5735 20.487 20.9187 17.1418 21.1384 12.9683H13.3999V20.7068Z" fill="#DD7F6D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.9624 21.3433C8.09539 21.3433 4.1499 17.3978 4.1499 12.5308C4.1499 7.66375 8.09539 3.71826 12.9624 3.71826C17.8294 3.71826 21.7749 7.66375 21.7749 12.5308C21.7749 17.3978 17.8294 21.3433 12.9624 21.3433ZM12.1499 11.7183V4.38305C8.27687 4.76453 5.19617 7.84523 4.81469 11.7183H12.1499ZM13.3999 20.7068C17.5735 20.487 20.9187 17.1418 21.1384 12.9683H13.3999V20.7068Z" fill="#DD7F6D"/>
+</g>
+</g>
+</svg>

Assets/Editor/Icons/Components/Viewport/PhysXStaticRigidBody.svg

@@ -0,0 +1,20 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / PhysX / RigidPhysics - box">
+<g id="Vector">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.6997 0.343262C23.8771 0.343262 24.7316 2.12173 24.7316 3.36191C24.7316 4.6021 24.7316 19.1249 24.7316 20.9853C24.7316 22.7362 23.503 24.2999 21.6997 24.2999C19.8964 24.2999 5.4242 24.2999 3.58419 24.2999C2.16152 24.2999 0.774902 22.858 0.774902 21.5019C0.774902 20.1458 0.774902 4.37859 0.774902 3.01582C0.774902 1.65304 2.1403 0.343262 3.38446 0.343262C4.62862 0.343262 19.735 0.343262 21.6997 0.343262Z" fill="url(#paint0_linear_651_47047)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.6997 0.343262C23.8771 0.343262 24.7316 2.12173 24.7316 3.36191C24.7316 4.6021 24.7316 19.1249 24.7316 20.9853C24.7316 22.7362 23.503 24.2999 21.6997 24.2999C19.8964 24.2999 5.4242 24.2999 3.58419 24.2999C2.16152 24.2999 0.774902 22.858 0.774902 21.5019C0.774902 20.1458 0.774902 4.37859 0.774902 3.01582C0.774902 1.65304 2.1403 0.343262 3.38446 0.343262C4.62862 0.343262 19.735 0.343262 21.6997 0.343262Z" fill="url(#paint1_linear_651_47047)"/>
+<path d="M0.774902 0.343262H24.7749V24.3433H0.774902V0.343262Z" fill="#DD7F6D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.9624 21.3433C8.09539 21.3433 4.1499 17.3978 4.1499 12.5308C4.1499 7.66375 8.09539 3.71826 12.9624 3.71826C17.8294 3.71826 21.7749 7.66375 21.7749 12.5308C21.7749 17.3978 17.8294 21.3433 12.9624 21.3433ZM12.1499 11.7183V4.38305C8.27687 4.76453 5.19617 7.84523 4.81469 11.7183H12.1499ZM13.3999 20.7068C17.5735 20.487 20.9187 17.1418 21.1384 12.9683H13.3999V20.7068Z" fill="white"/>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_651_47047" x1="0.774902" y1="0.343262" x2="0.774902" y2="24.3433" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+<linearGradient id="paint1_linear_651_47047" x1="0.774902" y1="0.343262" x2="0.774902" y2="24.3433" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>

Assets/Editor/Prefabs/Default_Level.prefab

@@ -141,6 +141,10 @@
                     "$type": "EditorInspectorComponent",
                     "Id": 16919232076966545697
                 },
+                "Component_[4228479570410194639]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4228479570410194639
+                },
                 "Component_[5182430712893438093]": {
                     "$type": "EditorMaterialComponent",
                     "Id": 5182430712893438093

AutomatedTesting/Gem/PythonTests/Physics/tests/collider/Collider_PxMeshConvexMeshCollides.py

@@ -86,8 +86,8 @@ def Collider_PxMeshConvexMeshCollides():
     collider_component = collider.add_component("PhysX Collider")
     Report.result(Tests.physx_collider_added, collider.has_component("PhysX Collider"))
 
-    collider.add_component("PhysX Rigid Body")
-    Report.result(Tests.physx_rigid_body_added, collider.has_component("PhysX Rigid Body"))
+    collider.add_component("PhysX Dynamic Rigid Body")
+    Report.result(Tests.physx_rigid_body_added, collider.has_component("PhysX Dynamic Rigid Body"))
 
     collider.add_component("Mesh")
     Report.result(Tests.mesh_added, collider.has_component("Mesh"))

AutomatedTesting/Gem/PythonTests/Physics/tests/tick/Tick_InterpolatedRigidBodyMotionIsSmooth.py

@@ -61,10 +61,10 @@ def Tick_InterpolatedRigidBodyMotionIsSmooth():
         azlmbr.bus.Event, "SetWorldTranslation", test_entity.id, math.Vector3(0.0, 0.0, 0.0))
 
     # 3) Add rigid body component
-    rigid_body_component = test_entity.add_component("PhysX Rigid Body")
+    rigid_body_component = test_entity.add_component("PhysX Dynamic Rigid Body")
     rigid_body_component.set_component_property_value("Configuration|Interpolate motion", True)
     azlmbr.physics.RigidBodyRequestBus(azlmbr.bus.Event, "SetLinearDamping", test_entity.id, 0.0)
-    Report.result(Tests.rigid_body_added, test_entity.has_component("PhysX Rigid Body"))
+    Report.result(Tests.rigid_body_added, test_entity.has_component("PhysX Dynamic Rigid Body"))
 
     # 4) Enter game mode and collect data for the rigid body's z co-ordinate and the time values for a series of frames
     t = []

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

@@ -72,7 +72,7 @@ def Terrain_SupportsPhysics():
     # 2) Create 2 test entities, one parent at 512.0, 512.0, 50.0 and one child at the default position and add the required components
     entity1_components_to_add = ["Axis Aligned Box Shape", "Terrain Layer Spawner", "Terrain Height Gradient List", "Terrain Physics Heightfield Collider", "PhysX Heightfield Collider"]
     entity2_components_to_add = ["Shape Reference", "Gradient Transform Modifier", "FastNoise Gradient"]
-    ball_components_to_add = ["Sphere Shape", "PhysX Collider", "PhysX Rigid Body"]
+    ball_components_to_add = ["Sphere Shape", "PhysX Collider", "PhysX Dynamic Rigid Body"]
     terrain_spawner_entity = hydra.Entity("TestEntity1")
     terrain_spawner_entity.create_entity(azmath.Vector3(512.0, 512.0, 50.0), entity1_components_to_add)
     Report.result(Tests.create_terrain_spawner_entity, terrain_spawner_entity.id.IsValid())

AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py

@@ -129,6 +129,7 @@ class TestsAssetProcessorBatch_AllPlatforms(object):
     @pytest.mark.BAT
     @pytest.mark.assetpipeline
     @pytest.mark.parametrize("clear_type", ["rewrite", "delete_asset", "delete_dir"])
+    @pytest.mark.SUITE_sandbox(reason="Disabling flaky test")
     def test_AllSupportedPlatforms_DeleteBadAssets_BatchFailedJobsCleared(
             self, workspace, request, ap_setup_fixture, asset_processor,  clear_type):
         """

AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PhysXColliderSurfaceTagEmitter_E2E_Editor.py

@@ -115,22 +115,22 @@ def PhysXColliderSurfaceTagEmitter_E2E_Editor():
     collider_entity = hydra.Entity("Collider Surface")
     collider_entity.create_entity(
         entity_center_point,
-        ["PhysX Collider", "PhysX Collider Surface Tag Emitter"]
+        ["PhysX Collider", "PhysX Collider Surface Tag Emitter", "PhysX Static Rigid Body"]
         )
     Report.result(collider_entity_created, collider_entity.id.IsValid())
 
     # Set up the PhysX Collider so that each shape type (sphere, box, capsule) has the same test height.
-    hydra.get_set_test(collider_entity, 0, "Shape Configuration|Sphere|Radius", collider_radius)
-    hydra.get_set_test(collider_entity, 0, "Shape Configuration|Box|Dimensions", math.Vector3(collider_diameter,
+    hydra.get_set_test(collider_entity, component_index=0, path="Shape Configuration|Sphere|Radius", value=collider_radius)
+    hydra.get_set_test(collider_entity, component_index=0, path="Shape Configuration|Box|Dimensions", value=math.Vector3(collider_diameter,
                                                                                               collider_diameter,
                                                                                               collider_diameter))
-    hydra.get_set_test(collider_entity, 0, "Shape Configuration|Capsule|Height", collider_diameter)
+    hydra.get_set_test(collider_entity, component_index=0, path="Shape Configuration|Capsule|Height", value=collider_diameter)
 
     # Run through each collider shape type (sphere, box, capsule) and verify the surface generation
     # and surface modification of the PhysX Collision Surface Tag Emitter Component.
     for collider_shape in range(0, 3):
         collider_shapes = {0: "Sphere", 1: "Box", 2: "Capsule"}
-        hydra.get_set_test(collider_entity, 0, "Shape Configuration|Shape", collider_shape)
+        hydra.get_set_test(collider_entity, component_index=0, path="Shape Configuration|Shape", value=collider_shape)
 
         # Test:  Generate a new surface on the collider.
         # There should be one instance at the very top of the collider sphere, and none on the baseline surface
@@ -143,8 +143,8 @@ def PhysXColliderSurfaceTagEmitter_E2E_Editor():
             f"Expected number of instances found on the baseline point for {collider_shapes[collider_shape]} shape",
             f"Found an unexpected number of instances on the baseline point for {collider_shapes[collider_shape]} shape"
         )
-        hydra.get_set_test(collider_entity, 1, "Configuration|Generated Tags", [surface_tag])
-        hydra.get_set_test(collider_entity, 1, "Configuration|Extended Tags", [invalid_tag])
+        hydra.get_set_test(collider_entity, component_index=1, path="Configuration|Generated Tags", value=[surface_tag])
+        hydra.get_set_test(collider_entity, component_index=1, path="Configuration|Extended Tags", value=[invalid_tag])
         top_point = math.Vector3(entity_center_point.x, entity_center_point.y, entity_center_point.z +
                                  collider_radius)
         baseline_surface_point = math.Vector3(entity_center_point.x, entity_center_point.y, entity_center_point.z +
@@ -159,8 +159,8 @@ def PhysXColliderSurfaceTagEmitter_E2E_Editor():
         # There should be no instances at the very top of the collider sphere, and one on the baseline surface
         # within our query box.
         # (We use a small query box to only check for one placed instance point)
-        hydra.get_set_test(collider_entity, 1, "Configuration|Generated Tags", [invalid_tag])
-        hydra.get_set_test(collider_entity, 1, "Configuration|Extended Tags", [surface_tag])
+        hydra.get_set_test(collider_entity, component_index=1, path="Configuration|Generated Tags", value=[invalid_tag])
+        hydra.get_set_test(collider_entity, component_index=1, path="Configuration|Extended Tags", value=[surface_tag])
         top_point_success = helper.wait_for_condition(lambda: dynveg.validate_instance_count(top_point, 0.25, 0), 5.0)
         Report.result(on_collider_top_point_count, top_point_success)
         baseline_success = helper.wait_for_condition(lambda: dynveg.validate_instance_count(baseline_surface_point,
@@ -176,12 +176,12 @@ def PhysXColliderSurfaceTagEmitter_E2E_Editor():
     collider_entity.add_component("PhysX Collider")
     helper.wait_for_condition(lambda: editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled',
                                                                    collider_entity.components[1]), 5.0)
-    hydra.get_set_test(collider_entity, 1, "Shape Configuration|Shape", 7)
-    hydra.get_set_test(collider_entity, 1, "Shape Configuration|Asset|PhysX Mesh", test_physx_mesh_asset_id)
+    hydra.get_set_test(collider_entity, component_index=2, path="Shape Configuration|Shape", value=7)
+    hydra.get_set_test(collider_entity, component_index=2, path="Shape Configuration|Asset|PhysX Mesh", value=test_physx_mesh_asset_id)
 
     # Set the asset scale to match the test heights of the shapes tested
     asset_scale = math.Vector3(1.0, 1.0, 9.0)
-    collider_entity.get_set_test(1, "Shape Configuration|Asset|Configuration|Asset Scale", asset_scale)
+    collider_entity.get_set_test(2, "Shape Configuration|Asset|Configuration|Asset Scale", asset_scale)
 
     # Test:  Generate a new surface on the collider.
     # There should be one instance at the very top of the collider mesh, and none on the baseline surface
@@ -195,8 +195,8 @@ def PhysXColliderSurfaceTagEmitter_E2E_Editor():
         f"Expected number of instances found on the baseline point for a PhysX Mesh",
         f"Found an unexpected number of instances on the baseline point for a PhysX Mesh"
     )
-    hydra.get_set_test(collider_entity, 0, "Configuration|Generated Tags", [surface_tag])
-    hydra.get_set_test(collider_entity, 0, "Configuration|Extended Tags", [invalid_tag])
+    hydra.get_set_test(collider_entity, component_index=0, path="Configuration|Generated Tags", value=[surface_tag])
+    hydra.get_set_test(collider_entity, component_index=0, path="Configuration|Extended Tags", value=[invalid_tag])
     top_point_success = helper.wait_for_condition(lambda: dynveg.validate_instance_count(top_point, 0.25, 1), 5.0)
     Report.result(on_collider_top_point_count, top_point_success)
     baseline_success = helper.wait_for_condition(lambda: dynveg.validate_instance_count(baseline_surface_point,
@@ -207,8 +207,8 @@ def PhysXColliderSurfaceTagEmitter_E2E_Editor():
     # There should be no instances at the very top of the collider mesh, and none on the baseline surface within
     # our query box as PhysX meshes are treated as hollow shells, not solid volumes.
     # (We use a small query box to only check for one placed instance point)
-    hydra.get_set_test(collider_entity, 0, "Configuration|Generated Tags", [invalid_tag])
-    hydra.get_set_test(collider_entity, 0, "Configuration|Extended Tags", [surface_tag])
+    hydra.get_set_test(collider_entity, component_index=0, path="Configuration|Generated Tags", value=[invalid_tag])
+    hydra.get_set_test(collider_entity, component_index=0, path="Configuration|Extended Tags", value=[surface_tag])
     top_point_success = helper.wait_for_condition(lambda: dynveg.validate_instance_count(top_point, 0.25, 0), 5.0)
     Report.result(on_collider_top_point_count, top_point_success)
     baseline_success = helper.wait_for_condition(lambda: dynveg.validate_instance_count(baseline_surface_point,

AutomatedTesting/Levels/DefaultLevel/DefaultLevel.prefab

@@ -208,6 +208,10 @@
                     "$type": "EditorLockComponent",
                     "Id": 7090012899106946164
                 },
+                "Component_[773790315487116393]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 773790315487116393
+                },
                 "Component_[9410832619875640998]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 9410832619875640998

AutomatedTesting/Levels/Multiplayer/ReactivatingNetEntity/ReactivatingNetEntity.prefab

@@ -136,6 +136,10 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 13711420870643673468
                 },
+                "Component_[13722683864759125153]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13722683864759125153
+                },
                 "Component_[138002849734991713]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 138002849734991713
@@ -743,20 +747,6 @@
                     "$type": "EditorInspectorComponent",
                     "Id": 460678799589944781
                 },
-                "Component_[6338428544016584613]": {
-                    "$type": "GenericComponentWrapper",
-                    "Id": 6338428544016584613,
-                    "m_template": {
-                        "$type": "NetworkPlayerSpawnerComponent",
-                        "SpawnableAsset": {
-                            "assetId": {
-                                "guid": "{129F7D66-108C-5549-92C6-5C909B95DA62}",
-                                "subId": 738868766
-                            },
-                            "assetHint": "levels/multiplayer/reactivatingnetentity/player.network.spawnable"
-                        }
-                    }
-                },
                 "Component_[7753493077417004814]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 7753493077417004814

AutomatedTesting/Levels/Navigation/NavigationSample/CityPortion.prefab

@@ -7,10 +7,6 @@
                 "$type": "EditorEntityIconComponent",
                 "Id": 11043277518452554776
             },
-            "Component_[1224239024537701137]": {
-                "$type": "SelectionComponent",
-                "Id": 1224239024537701137
-            },
             "Component_[12825388930915858146]": {
                 "$type": "EditorDisabledCompositionComponent",
                 "Id": 12825388930915858146
@@ -165,11 +161,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -187,9 +178,9 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
                 },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
+                "Component_[9129779652031523105]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 9129779652031523105
                 }
             }
         },
@@ -205,10 +196,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 11940241940314955283
                 },
-                "Component_[12094608478409290456]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12094608478409290456
-                },
                 "Component_[15065514314034488866]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 15065514314034488866
@@ -270,6 +257,10 @@
             "Id": "Entity_[11299011348621]",
             "Name": "Ground",
             "Components": {
+                "Component_[10444376930591328744]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 10444376930591328744
+                },
                 "Component_[10946777360722158921]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 10946777360722158921,
@@ -370,11 +361,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -391,10 +377,6 @@
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -502,11 +484,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -524,9 +501,9 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
                 },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
+                "Component_[8260769176303463586]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8260769176303463586
                 }
             }
         },
@@ -624,6 +601,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 4191213037974650114
                 },
+                "Component_[5523114719137612391]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5523114719137612391
+                },
                 "Component_[561144275819577369]": {
                     "$type": "EditorColliderComponent",
                     "Id": 561144275819577369,
@@ -634,11 +615,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -655,10 +631,6 @@
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -687,6 +659,10 @@
                         }
                     ]
                 },
+                "Component_[1143529838174529455]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 1143529838174529455
+                },
                 "Component_[11786689926888634210]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11786689926888634210
@@ -766,11 +742,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -787,10 +758,6 @@
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -819,6 +786,10 @@
                         }
                     ]
                 },
+                "Component_[11626066835780709791]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 11626066835780709791
+                },
                 "Component_[11786689926888634210]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11786689926888634210
@@ -898,11 +869,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -919,10 +885,6 @@
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -1030,11 +992,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1048,13 +1005,13 @@
                         }
                     }
                 },
+                "Component_[5617458393138790682]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5617458393138790682
+                },
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -1087,6 +1044,10 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11786689926888634210
                 },
+                "Component_[12721781019698885872]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 12721781019698885872
+                },
                 "Component_[13316023297093478237]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 13316023297093478237
@@ -1167,11 +1128,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1188,10 +1144,6 @@
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -1281,6 +1233,10 @@
                     "$type": "EditorLockComponent",
                     "Id": 17193921221555106955
                 },
+                "Component_[18148311216392106435]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 18148311216392106435
+                },
                 "Component_[18333533576999955869]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 18333533576999955869
@@ -1299,11 +1255,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1320,10 +1271,6 @@
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -1417,6 +1364,10 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 18333533576999955869
                 },
+                "Component_[3659461388081519064]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3659461388081519064
+                },
                 "Component_[4191213037974650114]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 4191213037974650114
@@ -1431,11 +1382,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1452,10 +1398,6 @@
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -1563,11 +1505,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1581,13 +1518,13 @@
                         }
                     }
                 },
+                "Component_[8130325540891911590]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8130325540891911590
+                },
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -1595,6 +1532,10 @@
             "Id": "Entity_[11569594288269]",
             "Name": "Ground",
             "Components": {
+                "Component_[10466589213229408165]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 10466589213229408165
+                },
                 "Component_[10946777360722158921]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 10946777360722158921,
@@ -1695,11 +1636,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1716,10 +1652,6 @@
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -1793,6 +1725,10 @@
                         }
                     }
                 },
+                "Component_[16562318651126349772]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 16562318651126349772
+                },
                 "Component_[16756187867691340653]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 16756187867691340653,
@@ -1827,11 +1763,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1848,10 +1779,6 @@
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -1945,6 +1872,10 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 18333533576999955869
                 },
+                "Component_[2019623542322377295]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 2019623542322377295
+                },
                 "Component_[4191213037974650114]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 4191213037974650114
@@ -1959,11 +1890,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1980,10 +1906,6 @@
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -2024,6 +1946,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 13633009520175731636
                 },
+                "Component_[1422295178687924955]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 1422295178687924955
+                },
                 "Component_[14594453775970915486]": {
                     "$type": "AZ::Render::EditorMeshComponent",
                     "Id": 14594453775970915486,
@@ -2091,11 +2017,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -2112,10 +2033,6 @@
                 "Component_[8231836430223196434]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
-                },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
                 }
             }
         },
@@ -2223,11 +2140,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -2245,9 +2157,9 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 8231836430223196434
                 },
-                "Component_[9076658479587913644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9076658479587913644
+                "Component_[8986611733273153699]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8986611733273153699
                 }
             }
         },
@@ -2274,6 +2186,10 @@
                     "$type": "EditorInspectorComponent",
                     "Id": 12731562982192231049
                 },
+                "Component_[15404821413892525429]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 15404821413892525429
+                },
                 "Component_[15662589502982568121]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 15662589502982568121,
@@ -2300,10 +2216,6 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 1989157093308533954
                 },
-                "Component_[3336260609790664760]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3336260609790664760
-                },
                 "Component_[3703844470882397551]": {
                     "$type": "EditorMaterialComponent",
                     "Id": 3703844470882397551,
@@ -2340,11 +2252,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -2417,14 +2324,14 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 15918579274461744191
                 },
+                "Component_[17017182064968299551]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17017182064968299551
+                },
                 "Component_[1989157093308533954]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 1989157093308533954
                 },
-                "Component_[3336260609790664760]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3336260609790664760
-                },
                 "Component_[3703844470882397551]": {
                     "$type": "EditorMaterialComponent",
                     "Id": 3703844470882397551,
@@ -2461,11 +2368,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -2542,10 +2444,6 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 1989157093308533954
                 },
-                "Component_[3336260609790664760]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3336260609790664760
-                },
                 "Component_[3703844470882397551]": {
                     "$type": "EditorMaterialComponent",
                     "Id": 3703844470882397551,
@@ -2582,11 +2480,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -2611,6 +2504,10 @@
                 "Component_[8659510516882020099]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8659510516882020099
+                },
+                "Component_[9104334404173946520]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 9104334404173946520
                 }
             }
         },
@@ -2676,10 +2573,6 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 1989157093308533954
                 },
-                "Component_[3336260609790664760]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3336260609790664760
-                },
                 "Component_[3874326360471912205]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3874326360471912205
@@ -2698,11 +2591,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -2727,6 +2615,10 @@
                 "Component_[8659510516882020099]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8659510516882020099
+                },
+                "Component_[8946763346869141532]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8946763346869141532
                 }
             }
         }

AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/Collider_AddingNewGroupWorks.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -55,6 +51,10 @@
             "Id": "Entity_[263565336022]",
             "Name": "Sphere",
             "Components": {
+                "Component_[10270843354917552198]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 10270843354917552198
+                },
                 "Component_[1077035889980990778]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 1077035889980990778
@@ -87,10 +87,6 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 16774751424420453062
                 },
-                "Component_[2076554166090224023]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2076554166090224023
-                },
                 "Component_[3796327233831302715]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 3796327233831302715,
@@ -115,9 +111,11 @@
                         "CollisionGroupId": {
                             "GroupId": "{C6156E97-7789-4EFA-AA8B-F987FF1C829F}"
                         },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -176,10 +174,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,

AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/Collider_CollisionGroupsWorkflow.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,9 +92,11 @@
                         "CollisionGroupId": {
                             "GroupId": "{2C698BDF-B2CC-47FC-8356-6BAB160AFFE9}"
                         },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -139,10 +137,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2810034955465504327
                 },
-                "Component_[3274864013943777794]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3274864013943777794
-                },
                 "Component_[3519576227402671568]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 3519576227402671568
@@ -165,12 +159,17 @@
                     "Configuration": {
                         "entityId": "",
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 6.0
-                        }
+                        "Inertia tensor": [
+                            6.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            6.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            6.0
+                        ]
                     }
                 }
             }
@@ -185,12 +184,17 @@
                     "Configuration": {
                         "entityId": "",
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 6.0
-                        }
+                        "Inertia tensor": [
+                            6.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            6.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            6.0
+                        ]
                     }
                 },
                 "Component_[15577190100407053290]": {
@@ -269,10 +273,6 @@
                         }
                     }
                 },
-                "Component_[6609021482930126566]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6609021482930126566
-                },
                 "Component_[7888321721748456023]": {
                     "$type": "EditorColliderComponent",
                     "Id": 7888321721748456023,
@@ -283,9 +283,11 @@
                         "CollisionGroupId": {
                             "GroupId": "{802547AF-5A11-4FEE-B30F-D12BFA2624C6}"
                         },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -309,12 +311,17 @@
                     "Configuration": {
                         "entityId": "",
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 6.0
-                        }
+                        "Inertia tensor": [
+                            6.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            6.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            6.0
+                        ]
                     }
                 },
                 "Component_[15577190100407053290]": {
@@ -393,10 +400,6 @@
                         }
                     }
                 },
-                "Component_[6609021482930126566]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6609021482930126566
-                },
                 "Component_[7888321721748456023]": {
                     "$type": "EditorColliderComponent",
                     "Id": 7888321721748456023,
@@ -407,9 +410,11 @@
                         "CollisionGroupId": {
                             "GroupId": "{802547AF-5A11-4FEE-B30F-D12BFA2624C6}"
                         },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -469,10 +474,6 @@
                         }
                     ]
                 },
-                "Component_[16052791866579738900]": {
-                    "$type": "SelectionComponent",
-                    "Id": 16052791866579738900
-                },
                 "Component_[16429863672749850210]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 16429863672749850210
@@ -491,9 +492,11 @@
                         "CollisionGroupId": {
                             "GroupId": "{802547AF-5A11-4FEE-B30F-D12BFA2624C6}"
                         },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -508,6 +511,10 @@
                         }
                     ]
                 },
+                "Component_[1927410549490098029]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 1927410549490098029
+                },
                 "Component_[2455764014686394094]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 2455764014686394094,
@@ -575,10 +582,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -609,6 +612,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 13699442376833814569
                 },
+                "Component_[13839339887306521722]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13839339887306521722
+                },
                 "Component_[15635759330685702346]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 15635759330685702346,
@@ -626,10 +633,6 @@
                         }
                     ]
                 },
-                "Component_[16052791866579738900]": {
-                    "$type": "SelectionComponent",
-                    "Id": 16052791866579738900
-                },
                 "Component_[16429863672749850210]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 16429863672749850210
@@ -673,9 +676,11 @@
                         "CollisionGroupId": {
                             "GroupId": "{2C698BDF-B2CC-47FC-8356-6BAB160AFFE9}"
                         },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -745,9 +750,11 @@
                         "CollisionGroupId": {
                             "GroupId": "{2C698BDF-B2CC-47FC-8356-6BAB160AFFE9}"
                         },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -788,10 +795,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2810034955465504327
                 },
-                "Component_[3274864013943777794]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3274864013943777794
-                },
                 "Component_[3519576227402671568]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 3519576227402671568
@@ -814,12 +817,17 @@
                     "Configuration": {
                         "entityId": "",
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 6.0
-                        }
+                        "Inertia tensor": [
+                            6.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            6.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            6.0
+                        ]
                     }
                 }
             }

AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/Collider_PxMeshErrorIfNoMesh.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -130,13 +122,19 @@
                         ]
                     }
                 },
+                "Component_[14059406946656899002]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 14059406946656899002
+                },
                 "Component_[14197962870538087335]": {
                     "$type": "EditorColliderComponent",
                     "Id": 14197962870538087335,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     }
@@ -161,10 +159,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4534782371004434129
                 },
-                "Component_[657568858670829150]": {
-                    "$type": "SelectionComponent",
-                    "Id": 657568858670829150
-                },
                 "Component_[6962773877616982646]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 6962773877616982646

AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/Collider_TriggerPassThrough.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -92,10 +88,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[4677020082511410627]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 4677020082511410627
@@ -150,9 +142,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 2500413517137346426,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -187,10 +181,6 @@
                         }
                     ]
                 },
-                "Component_[4513570945482921177]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4513570945482921177
-                },
                 "Component_[5181032452959651218]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 5181032452959651218
@@ -268,10 +258,6 @@
                         }
                     ]
                 },
-                "Component_[14360604399974600422]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14360604399974600422
-                },
                 "Component_[1638976515288798682]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 1638976515288798682
@@ -284,6 +270,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 17778751519274450365
                 },
+                "Component_[18384675688115197126]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 18384675688115197126
+                },
                 "Component_[18424302950171014166]": {
                     "$type": "EditorColliderComponent",
                     "Id": 18424302950171014166,
@@ -293,9 +283,11 @@
                             0.0,
                             1.0
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -379,10 +371,6 @@
                         }
                     ]
                 },
-                "Component_[14360604399974600422]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14360604399974600422
-                },
                 "Component_[1638976515288798682]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 1638976515288798682
@@ -406,9 +394,11 @@
                             0.0,
                             1.0
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -440,6 +430,10 @@
                             }
                         }
                     }
+                },
+                "Component_[4190697708283374601]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4190697708283374601
                 }
             }
         }

AutomatedTesting/Levels/Physics/EnablingGravityWorks/EnablingGravityWorks.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -55,14 +51,14 @@
             "Id": "Entity_[258695561562]",
             "Name": "Terrain",
             "Components": {
+                "Component_[103605035329056672]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 103605035329056672
+                },
                 "Component_[11134362586460591061]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 11134362586460591061
                 },
-                "Component_[12079850593699113824]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12079850593699113824
-                },
                 "Component_[12876908415630047209]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 12876908415630047209
@@ -129,9 +125,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 8251430000110142445,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -193,10 +191,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9042477178449779636]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 9042477178449779636
@@ -231,10 +225,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 12002902910001242503
                 },
-                "Component_[12062958768063128753]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12062958768063128753
-                },
                 "Component_[16573499138393956547]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 16573499138393956547
@@ -271,12 +261,17 @@
                         "entityId": "",
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 2.5
-                        }
+                        "Inertia tensor": [
+                            2.5,
+                            0.0,
+                            0.0,
+                            0.0,
+                            2.5,
+                            0.0,
+                            0.0,
+                            0.0,
+                            2.5
+                        ]
                     }
                 },
                 "Component_[7842182096652302722]": {
@@ -287,9 +282,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 8567733134384127375,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/ForceRegion_CapsuleShapedForce.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -92,10 +88,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[3959118778101598946]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 3959118778101598946
@@ -150,6 +142,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 16382725053857185045
                 },
+                "Component_[179746941743246621]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 179746941743246621
+                },
                 "Component_[2008515508908179722]": {
                     "$type": "EditorLockComponent",
                     "Id": 2008515508908179722
@@ -158,10 +154,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 3347528728285583652
                 },
-                "Component_[3667189370747951032]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3667189370747951032
-                },
                 "Component_[5374281256218458327]": {
                     "$type": "EditorForceRegionComponent",
                     "Id": 5374281256218458327,
@@ -197,9 +189,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -270,9 +264,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -300,10 +296,6 @@
                         ]
                     }
                 },
-                "Component_[3531552003066974404]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3531552003066974404
-                },
                 "Component_[4472989986428660453]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 4472989986428660453,

AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/ForceRegion_DirectionHasNoAffectOnTotalForce.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -55,10 +51,6 @@
             "Id": "Entity_[262856422196]",
             "Name": "force_region_2",
             "Components": {
-                "Component_[11076685892229420454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11076685892229420454
-                },
                 "Component_[1825012846916095498]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 1825012846916095498
@@ -89,9 +81,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -106,6 +100,10 @@
                         }
                     }
                 },
+                "Component_[5943479712153949608]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5943479712153949608
+                },
                 "Component_[7217128968425074271]": {
                     "$type": "EditorForceRegionComponent",
                     "Id": 7217128968425074271,
@@ -177,6 +175,10 @@
                     "$type": "EditorLockComponent",
                     "Id": 13018077446556189592
                 },
+                "Component_[14378741359094190334]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 14378741359094190334
+                },
                 "Component_[14740728446475380331]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 14740728446475380331
@@ -236,9 +238,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -253,10 +257,6 @@
                         }
                     }
                 },
-                "Component_[564253058341979437]": {
-                    "$type": "SelectionComponent",
-                    "Id": 564253058341979437
-                },
                 "Component_[6330270960515826312]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 6330270960515826312
@@ -284,10 +284,6 @@
             "Id": "Entity_[271446356788]",
             "Name": "sphere_2",
             "Components": {
-                "Component_[12982173553597989381]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12982173553597989381
-                },
                 "Component_[13533479963545119787]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 13533479963545119787
@@ -309,9 +305,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 18258932247456487838,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -429,10 +427,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -493,9 +487,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 18366716326380447553,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -517,10 +513,6 @@
                         "Compute Mass": false
                     }
                 },
-                "Component_[3091026005228595364]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3091026005228595364
-                },
                 "Component_[3709960250008472987]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 3709960250008472987,
@@ -555,9 +547,9 @@
             "Id": "Entity_[280036291380]",
             "Name": "force_region_4",
             "Components": {
-                "Component_[11076685892229420454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11076685892229420454
+                "Component_[18063023949559998466]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 18063023949559998466
                 },
                 "Component_[1825012846916095498]": {
                     "$type": "EditorOnlyEntityComponent",
@@ -589,9 +581,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -669,10 +663,6 @@
             "Id": "Entity_[281526095057]",
             "Name": "force_region_0",
             "Components": {
-                "Component_[11076685892229420454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11076685892229420454
-                },
                 "Component_[1825012846916095498]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 1825012846916095498
@@ -685,6 +675,10 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 2253717676126693144
                 },
+                "Component_[3498345613419071648]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3498345613419071648
+                },
                 "Component_[3668557058367528113]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 3668557058367528113
@@ -703,9 +697,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -791,6 +787,10 @@
                     "$type": "EditorLockComponent",
                     "Id": 13018077446556189592
                 },
+                "Component_[1402974762762366163]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 1402974762762366163
+                },
                 "Component_[14740728446475380331]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 14740728446475380331
@@ -850,9 +850,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -867,10 +869,6 @@
                         }
                     }
                 },
-                "Component_[564253058341979437]": {
-                    "$type": "SelectionComponent",
-                    "Id": 564253058341979437
-                },
                 "Component_[6330270960515826312]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 6330270960515826312
@@ -898,6 +896,10 @@
             "Id": "Entity_[285821062353]",
             "Name": "force_region_1",
             "Components": {
+                "Component_[10152414761927665425]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 10152414761927665425
+                },
                 "Component_[1281723178393925641]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 1281723178393925641
@@ -965,9 +967,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -982,10 +986,6 @@
                         }
                     }
                 },
-                "Component_[564253058341979437]": {
-                    "$type": "SelectionComponent",
-                    "Id": 564253058341979437
-                },
                 "Component_[6330270960515826312]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 6330270960515826312
@@ -1013,10 +1013,6 @@
             "Id": "Entity_[288626225972]",
             "Name": "sphere_4",
             "Components": {
-                "Component_[12982173553597989381]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12982173553597989381
-                },
                 "Component_[13533479963545119787]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 13533479963545119787
@@ -1038,9 +1034,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 18258932247456487838,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1117,10 +1115,6 @@
             "Id": "Entity_[290116029649]",
             "Name": "sphere_0",
             "Components": {
-                "Component_[12982173553597989381]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12982173553597989381
-                },
                 "Component_[13533479963545119787]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 13533479963545119787
@@ -1142,9 +1136,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 18258932247456487838,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1263,9 +1259,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 18366716326380447553,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1287,10 +1285,6 @@
                         "Compute Mass": false
                     }
                 },
-                "Component_[3091026005228595364]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3091026005228595364
-                },
                 "Component_[3709960250008472987]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 3709960250008472987,
@@ -1367,9 +1361,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 18366716326380447553,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1391,10 +1387,6 @@
                         "Compute Mass": false
                     }
                 },
-                "Component_[3091026005228595364]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3091026005228595364
-                },
                 "Component_[3709960250008472987]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 3709960250008472987,

AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/ForceRegion_HighValuesDirectionAxesWorkWithNoError.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -88,10 +84,6 @@
                         ]
                     }
                 },
-                "Component_[1217101245303897300]": {
-                    "$type": "SelectionComponent",
-                    "Id": 1217101245303897300
-                },
                 "Component_[12291252161569845485]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 12291252161569845485
@@ -104,9 +96,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14337613086038282335,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -198,9 +192,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -223,6 +219,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 5180749011316010468
                 },
+                "Component_[6126897910407196487]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 6126897910407196487
+                },
                 "Component_[7533425702745957756]": {
                     "$type": "EditorForceRegionComponent",
                     "Id": 7533425702745957756,
@@ -252,10 +252,6 @@
                         }
                     ]
                 },
-                "Component_[7673319437897703826]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7673319437897703826
-                },
                 "Component_[8974245314304170844]": {
                     "$type": "EditorLockComponent",
                     "Id": 8974245314304170844
@@ -303,10 +299,6 @@
                         ]
                     }
                 },
-                "Component_[1217101245303897300]": {
-                    "$type": "SelectionComponent",
-                    "Id": 1217101245303897300
-                },
                 "Component_[12291252161569845485]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 12291252161569845485
@@ -319,9 +311,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14337613086038282335,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -403,6 +397,10 @@
                         ]
                     }
                 },
+                "Component_[1576838936660125820]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 1576838936660125820
+                },
                 "Component_[17444672391153729398]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 17444672391153729398
@@ -413,9 +411,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -470,10 +470,6 @@
                         }
                     ]
                 },
-                "Component_[7673319437897703826]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7673319437897703826
-                },
                 "Component_[8974245314304170844]": {
                     "$type": "EditorLockComponent",
                     "Id": 8974245314304170844
@@ -521,10 +517,6 @@
                         ]
                     }
                 },
-                "Component_[1217101245303897300]": {
-                    "$type": "SelectionComponent",
-                    "Id": 1217101245303897300
-                },
                 "Component_[12291252161569845485]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 12291252161569845485
@@ -537,9 +529,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14337613086038282335,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -596,10 +590,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 15255763170409911822
                 },
-                "Component_[16487716786068262334]": {
-                    "$type": "SelectionComponent",
-                    "Id": 16487716786068262334
-                },
                 "Component_[3657230180793708178]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 3657230180793708178
@@ -707,9 +697,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -732,9 +724,9 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 5180749011316010468
                 },
-                "Component_[7673319437897703826]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7673319437897703826
+                "Component_[8149900326387931357]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8149900326387931357
                 },
                 "Component_[8974245314304170844]": {
                     "$type": "EditorLockComponent",
@@ -797,9 +789,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -814,6 +808,10 @@
                         }
                     }
                 },
+                "Component_[4356469818833126992]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4356469818833126992
+                },
                 "Component_[4680012562900031353]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4680012562900031353
@@ -850,10 +848,6 @@
                         }
                     ]
                 },
-                "Component_[7673319437897703826]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7673319437897703826
-                },
                 "Component_[8974245314304170844]": {
                     "$type": "EditorLockComponent",
                     "Id": 8974245314304170844
@@ -901,10 +895,6 @@
                         ]
                     }
                 },
-                "Component_[1217101245303897300]": {
-                    "$type": "SelectionComponent",
-                    "Id": 1217101245303897300
-                },
                 "Component_[12291252161569845485]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 12291252161569845485
@@ -917,9 +907,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14337613086038282335,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -997,10 +989,6 @@
                         ]
                     }
                 },
-                "Component_[1217101245303897300]": {
-                    "$type": "SelectionComponent",
-                    "Id": 1217101245303897300
-                },
                 "Component_[12291252161569845485]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 12291252161569845485
@@ -1013,9 +1001,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14337613086038282335,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1085,6 +1075,10 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 1184472558140852547
                 },
+                "Component_[12382375580271959391]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 12382375580271959391
+                },
                 "Component_[15529417857362096874]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 15529417857362096874,
@@ -1107,9 +1101,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1161,10 +1157,6 @@
                         }
                     ]
                 },
-                "Component_[7673319437897703826]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7673319437897703826
-                },
                 "Component_[8974245314304170844]": {
                     "$type": "EditorLockComponent",
                     "Id": 8974245314304170844

AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/ForceRegion_ImpulsesBoxShapedRigidBody.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -118,10 +110,6 @@
             "Id": "Entity_[355506484304]",
             "Name": "Force Region",
             "Components": {
-                "Component_[11280909321423981689]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11280909321423981689
-                },
                 "Component_[16854315530707009745]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 16854315530707009745
@@ -136,9 +124,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -181,6 +171,10 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 5888163144028789147
                 },
+                "Component_[6209861274415601701]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 6209861274415601701
+                },
                 "Component_[6424236228697592522]": {
                     "$type": "EditorForceRegionComponent",
                     "Id": 6424236228697592522,
@@ -250,9 +244,11 @@
                             0.0,
                             1.0
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -279,10 +275,6 @@
                         "Compute Mass": false
                     }
                 },
-                "Component_[16753379648037728845]": {
-                    "$type": "SelectionComponent",
-                    "Id": 16753379648037728845
-                },
                 "Component_[1702798579844760976]": {
                     "$type": "EditorLockComponent",
                     "Id": 1702798579844760976

AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/ForceRegion_ImpulsesCapsuleShapedRigidBody.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -118,9 +110,9 @@
             "Id": "Entity_[355506484304]",
             "Name": "Force Region",
             "Components": {
-                "Component_[11280909321423981689]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11280909321423981689
+                "Component_[13990796929987269592]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13990796929987269592
                 },
                 "Component_[16854315530707009745]": {
                     "$type": "EditorDisabledCompositionComponent",
@@ -136,9 +128,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -250,9 +244,11 @@
                             0.0,
                             1.0
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -279,10 +275,6 @@
                         "Compute Mass": false
                     }
                 },
-                "Component_[16753379648037728845]": {
-                    "$type": "SelectionComponent",
-                    "Id": 16753379648037728845
-                },
                 "Component_[1702798579844760976]": {
                     "$type": "EditorLockComponent",
                     "Id": 1702798579844760976

AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/ForceRegion_ImpulsesPxMeshShapedRigidBody.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -83,9 +79,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 17072051774364123210,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -115,10 +113,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 18276539780150073839
                 },
-                "Component_[2066690476385973349]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2066690476385973349
-                },
                 "Component_[4921143390685436960]": {
                     "$type": "EditorRigidBodyComponent",
                     "Id": 4921143390685436960,
@@ -130,12 +124,17 @@
                             -0.07926200330257416,
                             0.434479296207428
                         ],
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 0.88129061460495
-                        }
+                        "Inertia tensor": [
+                            0.88129061460495,
+                            0.0,
+                            0.0,
+                            0.0,
+                            0.88129061460495,
+                            0.0,
+                            0.0,
+                            0.0,
+                            0.88129061460495
+                        ]
                     }
                 },
                 "Component_[5346221168058002519]": {
@@ -214,10 +213,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -278,9 +273,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -312,14 +309,14 @@
                         }
                     ]
                 },
-                "Component_[3872163302901841777]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3872163302901841777
-                },
                 "Component_[6396247764760116092]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 6396247764760116092
                 },
+                "Component_[7725802731985081045]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7725802731985081045
+                },
                 "Component_[7728919727375645335]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 7728919727375645335

AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/ForceRegion_LinearDampingForceOnRigidBodies.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -169,6 +161,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 15124982576423132697
                 },
+                "Component_[15264324071228283130]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 15264324071228283130
+                },
                 "Component_[15404147350950921063]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 15404147350950921063
@@ -183,9 +179,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -212,10 +210,6 @@
                         }
                     ]
                 },
-                "Component_[8746009087687308085]": {
-                    "$type": "SelectionComponent",
-                    "Id": 8746009087687308085
-                },
                 "Component_[9050210137740138695]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 9050210137740138695
@@ -287,9 +281,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 284487610596488543,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -305,10 +301,6 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 6567853573351593579
                 },
-                "Component_[6657555488150791773]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6657555488150791773
-                },
                 "Component_[7363342380577489355]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 7363342380577489355
@@ -360,19 +352,17 @@
                         }
                     ]
                 },
-                "Component_[4429422174533779014]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4429422174533779014
-                },
                 "Component_[4851027798256990127]": {
                     "$type": "EditorColliderComponent",
                     "Id": 4851027798256990127,
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -421,6 +411,10 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 7182682966725935291
                 },
+                "Component_[7472058718412293425]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7472058718412293425
+                },
                 "Component_[7735698619234889834]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 7735698619234889834

AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/ForceRegion_LocalSpaceForceOnRigidBodies.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -124,9 +116,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -172,10 +166,6 @@
                         }
                     ]
                 },
-                "Component_[3228372766822292280]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3228372766822292280
-                },
                 "Component_[3953010346260389577]": {
                     "$type": "EditorLockComponent",
                     "Id": 3953010346260389577
@@ -196,6 +186,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 4777009146570219810
                 },
+                "Component_[5912585905272923206]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5912585905272923206
+                },
                 "Component_[5933256255355945925]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5933256255355945925,
@@ -282,10 +276,6 @@
                         ]
                     }
                 },
-                "Component_[13374137142518600136]": {
-                    "$type": "SelectionComponent",
-                    "Id": 13374137142518600136
-                },
                 "Component_[14261030316739436718]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 14261030316739436718
@@ -320,9 +310,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/ForceRegion_MovingForceRegionChangesNetForce.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -59,10 +55,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 11715519062967203564
                 },
-                "Component_[12116605035306086849]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12116605035306086849
-                },
                 "Component_[12527068633650846978]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 12527068633650846978
@@ -79,6 +71,10 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 17968486723623259793
                 },
+                "Component_[18319946024592317322]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 18319946024592317322
+                },
                 "Component_[3582638891871769105]": {
                     "$type": "EditorColliderComponent",
                     "Id": 3582638891871769105,
@@ -90,9 +86,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -159,10 +157,6 @@
             "Id": "Entity_[287124693539]",
             "Name": "SphereRigidBody",
             "Components": {
-                "Component_[11933716127308513926]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11933716127308513926
-                },
                 "Component_[14778399419284274541]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 14778399419284274541
@@ -237,9 +231,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/ForceRegion_MultipleComponentsCombineForces.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -124,9 +116,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -141,6 +135,10 @@
                         }
                     }
                 },
+                "Component_[10539467539571757957]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 10539467539571757957
+                },
                 "Component_[12838489135272223497]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 12838489135272223497
@@ -206,10 +204,6 @@
                 "Component_[4746672286683920775]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 4746672286683920775
-                },
-                "Component_[6112275728051139122]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6112275728051139122
                 }
             }
         },
@@ -223,9 +217,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -252,6 +248,10 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 14369151857466231221
                 },
+                "Component_[14980866372571301058]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 14980866372571301058
+                },
                 "Component_[16154030206307636514]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 16154030206307636514
@@ -308,10 +308,6 @@
                 "Component_[4746672286683920775]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 4746672286683920775
-                },
-                "Component_[6112275728051139122]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6112275728051139122
                 }
             }
         },
@@ -328,9 +324,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -342,10 +340,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 16279388574077995590
                 },
-                "Component_[17660057469603617926]": {
-                    "$type": "SelectionComponent",
-                    "Id": 17660057469603617926
-                },
                 "Component_[18407444214271538352]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 18407444214271538352
@@ -426,9 +420,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -440,10 +436,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 16279388574077995590
                 },
-                "Component_[17660057469603617926]": {
-                    "$type": "SelectionComponent",
-                    "Id": 17660057469603617926
-                },
                 "Component_[18407444214271538352]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 18407444214271538352

AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/ForceRegion_MultipleForcesInSameComponentCombineForces.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -92,10 +88,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[761453111961316947]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 761453111961316947
@@ -167,9 +159,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -212,9 +206,9 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 475116335422037420
                 },
-                "Component_[5799844388461702133]": {
-                    "$type": "SelectionComponent",
-                    "Id": 5799844388461702133
+                "Component_[6629906396685401764]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 6629906396685401764
                 },
                 "Component_[8675597473547646053]": {
                     "$type": "EditorDisabledCompositionComponent",
@@ -302,10 +296,6 @@
                         ]
                     }
                 },
-                "Component_[4508540238885657540]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4508540238885657540
-                },
                 "Component_[5400193701816852996]": {
                     "$type": "EditorColliderComponent",
                     "Id": 5400193701816852996,
@@ -315,9 +305,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/ForceRegion_NoQuiverOnHighLinearDampingForce.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -71,10 +67,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10512175486999420826
                 },
-                "Component_[10729728356565917095]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10729728356565917095
-                },
                 "Component_[11783523334734810042]": {
                     "$type": "EditorForceRegionComponent",
                     "Id": 11783523334734810042,
@@ -91,6 +83,10 @@
                     "$type": "EditorLockComponent",
                     "Id": 13500036476732578341
                 },
+                "Component_[13601221085707996595]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13601221085707996595
+                },
                 "Component_[17475484965829344677]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 17475484965829344677
@@ -140,11 +136,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -207,10 +198,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 1933240123730478370
                 },
-                "Component_[2433946146395572651]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2433946146395572651
-                },
                 "Component_[3068220161200459190]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 3068220161200459190

AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/ForceRegion_ParentChildForcesCombineForces.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -82,9 +78,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -130,6 +128,10 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 14716066842794086837
                 },
+                "Component_[16416031669382050634]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 16416031669382050634
+                },
                 "Component_[17519113110653241937]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 17519113110653241937
@@ -156,10 +158,6 @@
                         }
                     }
                 },
-                "Component_[2457515126342722840]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2457515126342722840
-                },
                 "Component_[596343620181960911]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 596343620181960911
@@ -208,9 +206,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -254,9 +254,9 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 2631293066231955056
                 },
-                "Component_[655080765307091941]": {
-                    "$type": "SelectionComponent",
-                    "Id": 655080765307091941
+                "Component_[7620459147782584658]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7620459147782584658
                 },
                 "Component_[9473616213752171715]": {
                     "$type": "EditorBoxShapeComponent",
@@ -328,10 +328,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -377,9 +373,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -439,6 +437,10 @@
                         "Entity_[1612948785617]"
                     ]
                 },
+                "Component_[1674414876533995895]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 1674414876533995895
+                },
                 "Component_[17519113110653241937]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 17519113110653241937
@@ -451,10 +453,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 185260310632811827
                 },
-                "Component_[2457515126342722840]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2457515126342722840
-                },
                 "Component_[596343620181960911]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 596343620181960911
@@ -501,9 +499,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 13125029424343233715,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -554,10 +554,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 2631293066231955056
                 },
-                "Component_[655080765307091941]": {
-                    "$type": "SelectionComponent",
-                    "Id": 655080765307091941
-                },
                 "Component_[9301036236118645777]": {
                     "$type": "EditorRigidBodyComponent",
                     "Id": 9301036236118645777,

AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/ForceRegion_PointForceOnRigidBodies.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -160,9 +152,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -214,14 +208,14 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 8666893775284351835
                 },
-                "Component_[8942463751737332902]": {
-                    "$type": "SelectionComponent",
-                    "Id": 8942463751737332902
-                },
                 "Component_[9707418614808762591]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 9707418614808762591,
                     "GameView": true
+                },
+                "Component_[9963847657929568140]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 9963847657929568140
                 }
             }
         },
@@ -277,10 +271,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 6771629689623098442
                 },
-                "Component_[7685618063763946451]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7685618063763946451
-                },
                 "Component_[8701595253904669652]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 8701595253904669652,
@@ -311,9 +301,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/ForceRegion_PositionOffset.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -129,9 +121,11 @@
                             0.0,
                             0.0
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -154,6 +148,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 11422707812942686882
                 },
+                "Component_[13243203667155267594]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13243203667155267594
+                },
                 "Component_[14237237900281326814]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 14237237900281326814
@@ -242,10 +240,6 @@
                             "SortIndex": 3
                         }
                     ]
-                },
-                "Component_[6122974305635603954]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6122974305635603954
                 }
             }
         },
@@ -257,9 +251,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -302,10 +298,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -339,6 +331,10 @@
                         }
                     ]
                 },
+                "Component_[8130835354367386354]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8130835354367386354
+                },
                 "Component_[9136380755680336740]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 9136380755680336740
@@ -357,9 +353,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -394,6 +392,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 15891766986063042570
                 },
+                "Component_[16933657985301043635]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 16933657985301043635
+                },
                 "Component_[2450079780500558114]": {
                     "$type": "EditorLockComponent",
                     "Id": 2450079780500558114
@@ -402,10 +404,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -457,9 +455,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -502,9 +502,9 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
+                "Component_[483315658493947521]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 483315658493947521
                 },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
@@ -557,9 +557,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -602,10 +604,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -639,6 +637,10 @@
                         }
                     ]
                 },
+                "Component_[8729558420291307478]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8729558420291307478
+                },
                 "Component_[9136380755680336740]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 9136380755680336740
@@ -657,9 +659,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -694,6 +698,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 15891766986063042570
                 },
+                "Component_[17653625690180643194]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17653625690180643194
+                },
                 "Component_[2450079780500558114]": {
                     "$type": "EditorLockComponent",
                     "Id": 2450079780500558114
@@ -702,10 +710,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -790,9 +794,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14224898404594011297,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -823,10 +829,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3196271264232348143
                 },
-                "Component_[4322068942380886068]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4322068942380886068
-                },
                 "Component_[4464572295159651560]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4464572295159651560
@@ -874,9 +876,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -919,10 +923,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -935,6 +935,10 @@
                         ]
                     }
                 },
+                "Component_[5484806693434552740]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5484806693434552740
+                },
                 "Component_[5911269087661464643]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 5911269087661464643
@@ -974,9 +978,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1019,10 +1025,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -1056,6 +1058,10 @@
                         }
                     ]
                 },
+                "Component_[8505571863125799077]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8505571863125799077
+                },
                 "Component_[9136380755680336740]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 9136380755680336740
@@ -1107,9 +1113,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14224898404594011297,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1140,10 +1148,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3196271264232348143
                 },
-                "Component_[4322068942380886068]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4322068942380886068
-                },
                 "Component_[4464572295159651560]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4464572295159651560
@@ -1191,9 +1195,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1224,6 +1230,10 @@
                         }
                     }
                 },
+                "Component_[15776575069262296152]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 15776575069262296152
+                },
                 "Component_[15891766986063042570]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 15891766986063042570
@@ -1236,10 +1246,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -1298,9 +1304,11 @@
                             3.0,
                             0.0
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1412,9 +1420,9 @@
                         }
                     ]
                 },
-                "Component_[6122974305635603954]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6122974305635603954
+                "Component_[5893257077180569446]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5893257077180569446
                 }
             }
         },
@@ -1459,9 +1467,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14224898404594011297,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1492,10 +1502,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3196271264232348143
                 },
-                "Component_[4322068942380886068]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4322068942380886068
-                },
                 "Component_[4464572295159651560]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4464572295159651560
@@ -1576,9 +1582,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14224898404594011297,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1609,10 +1617,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3196271264232348143
                 },
-                "Component_[4322068942380886068]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4322068942380886068
-                },
                 "Component_[4464572295159651560]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4464572295159651560
@@ -1667,9 +1671,11 @@
                             0.0,
                             3.0
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1781,9 +1787,9 @@
                         }
                     ]
                 },
-                "Component_[6122974305635603954]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6122974305635603954
+                "Component_[8917810987558000894]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8917810987558000894
                 }
             }
         },
@@ -1795,9 +1801,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1809,6 +1817,10 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 11773955025499748960
                 },
+                "Component_[12088240635022253573]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 12088240635022253573
+                },
                 "Component_[12379720822775260097]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 12379720822775260097,
@@ -1840,10 +1852,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -1928,9 +1936,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14224898404594011297,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1961,10 +1971,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3196271264232348143
                 },
-                "Component_[4322068942380886068]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4322068942380886068
-                },
                 "Component_[4464572295159651560]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4464572295159651560
@@ -2012,9 +2018,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -2057,10 +2065,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -2094,6 +2098,10 @@
                         }
                     ]
                 },
+                "Component_[786376167476127993]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 786376167476127993
+                },
                 "Component_[9136380755680336740]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 9136380755680336740
@@ -2112,9 +2120,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -2157,9 +2167,9 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
+                "Component_[3609716012330359002]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3609716012330359002
                 },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
@@ -2245,9 +2255,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14224898404594011297,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -2278,10 +2290,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3196271264232348143
                 },
-                "Component_[4322068942380886068]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4322068942380886068
-                },
                 "Component_[4464572295159651560]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4464572295159651560
@@ -2329,9 +2337,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -2362,6 +2372,10 @@
                         }
                     }
                 },
+                "Component_[1398753364733312760]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 1398753364733312760
+                },
                 "Component_[15891766986063042570]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 15891766986063042570
@@ -2374,10 +2388,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,

AutomatedTesting/Levels/Physics/ForceRegion_PrefabInstantiates/ForceRegionEntity.prefab

@@ -39,10 +39,6 @@
                 "$type": "EditorLockComponent",
                 "Id": 2052804302889291078
             },
-            "Component_[2863922822500093657]": {
-                "$type": "SelectionComponent",
-                "Id": 2863922822500093657
-            },
             "Component_[5519696087052953252]": {
                 "$type": "EditorPrefabComponent",
                 "Id": 5519696087052953252
@@ -69,10 +65,6 @@
                         }
                     ]
                 },
-                "Component_[11972970532048219080]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11972970532048219080
-                },
                 "Component_[12192522742539893057]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 12192522742539893057
@@ -94,6 +86,10 @@
                         }
                     ]
                 },
+                "Component_[13801150941276366001]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13801150941276366001
+                },
                 "Component_[17342015521141665263]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 17342015521141665263
@@ -129,9 +125,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/ForceRegion_PxMeshShapedForce.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -61,9 +57,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -139,9 +137,9 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 18244240723284900447
                 },
-                "Component_[2384529240485117149]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2384529240485117149
+                "Component_[587394366223174429]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 587394366223174429
                 },
                 "Component_[607250426053999174]": {
                     "$type": "EditorEntityIconComponent",
@@ -219,12 +217,17 @@
                     "Configuration": {
                         "entityId": "",
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
                 "Component_[18301470101490524797]": {
@@ -270,19 +273,17 @@
                     "$type": "EditorColliderComponent",
                     "Id": 6742936953893799137,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
                     "ShapeConfiguration": {
                         "ShapeType": 0
                     }
-                },
-                "Component_[7354819447050428862]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7354819447050428862
                 }
             }
         }

AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/ForceRegion_RotationalOffset.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -130,9 +122,11 @@
                             0.0,
                             0.708984375
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -244,9 +238,9 @@
                         }
                     ]
                 },
-                "Component_[6122974305635603954]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6122974305635603954
+                "Component_[6387915907247308328]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 6387915907247308328
                 }
             }
         },
@@ -258,9 +252,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -303,9 +299,9 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
+                "Component_[5093658278033215283]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5093658278033215283
                 },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
@@ -363,9 +359,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -420,10 +418,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -462,6 +456,10 @@
                         }
                     ]
                 },
+                "Component_[9122163073077435100]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 9122163073077435100
+                },
                 "Component_[9136380755680336740]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 9136380755680336740
@@ -480,9 +478,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -525,9 +525,9 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
+                "Component_[4387924250392629883]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4387924250392629883
                 },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
@@ -580,9 +580,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -617,6 +619,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 15891766986063042570
                 },
+                "Component_[16682476456632150710]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 16682476456632150710
+                },
                 "Component_[2450079780500558114]": {
                     "$type": "EditorLockComponent",
                     "Id": 2450079780500558114
@@ -625,10 +631,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -685,9 +687,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -718,6 +722,10 @@
                         }
                     }
                 },
+                "Component_[15070763185710998413]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 15070763185710998413
+                },
                 "Component_[15891766986063042570]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 15891766986063042570
@@ -730,10 +738,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -818,9 +822,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14224898404594011297,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -851,10 +857,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3196271264232348143
                 },
-                "Component_[4322068942380886068]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4322068942380886068
-                },
                 "Component_[4464572295159651560]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4464572295159651560
@@ -902,9 +904,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -959,10 +963,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -1001,6 +1001,10 @@
                         }
                     ]
                 },
+                "Component_[8850631706297673266]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8850631706297673266
+                },
                 "Component_[9136380755680336740]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 9136380755680336740
@@ -1019,9 +1023,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1052,6 +1058,10 @@
                         }
                     }
                 },
+                "Component_[13154483884331833601]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13154483884331833601
+                },
                 "Component_[15891766986063042570]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 15891766986063042570
@@ -1064,10 +1074,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -1152,9 +1158,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14224898404594011297,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1185,10 +1193,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3196271264232348143
                 },
-                "Component_[4322068942380886068]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4322068942380886068
-                },
                 "Component_[4464572295159651560]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4464572295159651560
@@ -1236,9 +1240,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1273,6 +1279,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 15891766986063042570
                 },
+                "Component_[18141216088001977333]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 18141216088001977333
+                },
                 "Component_[2450079780500558114]": {
                     "$type": "EditorLockComponent",
                     "Id": 2450079780500558114
@@ -1281,10 +1291,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -1344,9 +1350,11 @@
                             0.0,
                             0.708984375
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1437,6 +1445,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 3202926484013115517
                 },
+                "Component_[4126118587115496841]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4126118587115496841
+                },
                 "Component_[5003642034301844595]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 5003642034301844595,
@@ -1457,10 +1469,6 @@
                             "SortIndex": 3
                         }
                     ]
-                },
-                "Component_[6122974305635603954]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6122974305635603954
                 }
             }
         },
@@ -1505,9 +1513,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14224898404594011297,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1538,10 +1548,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3196271264232348143
                 },
-                "Component_[4322068942380886068]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4322068942380886068
-                },
                 "Component_[4464572295159651560]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4464572295159651560
@@ -1622,9 +1628,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14224898404594011297,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1655,10 +1663,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3196271264232348143
                 },
-                "Component_[4322068942380886068]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4322068942380886068
-                },
                 "Component_[4464572295159651560]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4464572295159651560
@@ -1714,9 +1718,11 @@
                             0.7071437239646912,
                             0.708984375
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1775,6 +1781,10 @@
                     "$type": "EditorLockComponent",
                     "Id": 17255931630896525843
                 },
+                "Component_[2084606549780077974]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 2084606549780077974
+                },
                 "Component_[2101484393736205036]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 2101484393736205036,
@@ -1827,10 +1837,6 @@
                             "SortIndex": 3
                         }
                     ]
-                },
-                "Component_[6122974305635603954]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6122974305635603954
                 }
             }
         },
@@ -1842,9 +1848,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1879,6 +1887,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 15891766986063042570
                 },
+                "Component_[17655716505527630519]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17655716505527630519
+                },
                 "Component_[2450079780500558114]": {
                     "$type": "EditorLockComponent",
                     "Id": 2450079780500558114
@@ -1887,10 +1899,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -1975,9 +1983,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14224898404594011297,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -2008,10 +2018,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3196271264232348143
                 },
-                "Component_[4322068942380886068]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4322068942380886068
-                },
                 "Component_[4464572295159651560]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4464572295159651560
@@ -2059,9 +2065,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -2104,10 +2112,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -2124,6 +2128,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 5911269087661464643
                 },
+                "Component_[5983003562163138967]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5983003562163138967
+                },
                 "Component_[7806598650913923730]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 7806598650913923730,
@@ -2159,9 +2167,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -2176,6 +2186,10 @@
                         }
                     }
                 },
+                "Component_[10914572999228522307]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 10914572999228522307
+                },
                 "Component_[11773955025499748960]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 11773955025499748960
@@ -2216,10 +2230,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,
@@ -2309,9 +2319,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14224898404594011297,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -2342,10 +2354,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3196271264232348143
                 },
-                "Component_[4322068942380886068]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4322068942380886068
-                },
                 "Component_[4464572295159651560]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4464572295159651560
@@ -2393,9 +2401,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10641714068494953363,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -2430,6 +2440,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 15891766986063042570
                 },
+                "Component_[2304322499782661365]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 2304322499782661365
+                },
                 "Component_[2450079780500558114]": {
                     "$type": "EditorLockComponent",
                     "Id": 2450079780500558114
@@ -2438,10 +2452,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 2849452631059171820
                 },
-                "Component_[4373559361383615054]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4373559361383615054
-                },
                 "Component_[5177784304866978075]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 5177784304866978075,

AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/ForceRegion_SimpleDragForceOnRigidBodies.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -138,15 +130,21 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 2666651999496282559
                 },
+                "Component_[3602094712739312751]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3602094712739312751
+                },
                 "Component_[4190351693097703533]": {
                     "$type": "EditorColliderComponent",
                     "Id": 4190351693097703533,
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -193,10 +191,6 @@
                         ]
                     }
                 },
-                "Component_[7131239797354804502]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7131239797354804502
-                },
                 "Component_[9253882679972673809]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 9253882679972673809,
@@ -237,9 +231,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -300,10 +296,6 @@
                         }
                     ]
                 },
-                "Component_[3588192566961159594]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3588192566961159594
-                },
                 "Component_[6926982803772662053]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 6926982803772662053

AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/ForceRegion_SmallMagnitudeDeviationOnLargeForces.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -94,9 +90,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -138,6 +136,10 @@
                         ]
                     }
                 },
+                "Component_[4078031199745025593]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4078031199745025593
+                },
                 "Component_[5763927342520629215]": {
                     "$type": "EditorLockComponent",
                     "Id": 5763927342520629215
@@ -146,10 +148,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 7531376322926995655
                 },
-                "Component_[8264507417233530976]": {
-                    "$type": "SelectionComponent",
-                    "Id": 8264507417233530976
-                },
                 "Component_[8358337765875207462]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 8358337765875207462
@@ -182,10 +180,6 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 1115113803276103220
                 },
-                "Component_[11924195204198903977]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11924195204198903977
-                },
                 "Component_[1276345366428075735]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 1276345366428075735
@@ -198,9 +192,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 16172305626787000438,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/ForceRegion_SphereShapedForce.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -92,10 +88,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[4502579211853420197]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 4502579211853420197
@@ -156,9 +148,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -169,6 +163,10 @@
                         }
                     }
                 },
+                "Component_[13699730929521034254]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13699730929521034254
+                },
                 "Component_[16742559604579969148]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 16742559604579969148
@@ -181,10 +179,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 4394422991431442012
                 },
-                "Component_[6273568731103770037]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6273568731103770037
-                },
                 "Component_[6689678886724215129]": {
                     "$type": "EditorLockComponent",
                     "Id": 6689678886724215129
@@ -235,9 +229,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -265,10 +261,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 15509001367106311440
                 },
-                "Component_[16442108914364885784]": {
-                    "$type": "SelectionComponent",
-                    "Id": 16442108914364885784
-                },
                 "Component_[1941132031561600273]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 1941132031561600273

AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/ForceRegion_SplineForceOnRigidBodies.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -98,9 +94,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -147,9 +145,9 @@
                     "$type": "EditorLockComponent",
                     "Id": 6996958029592442366
                 },
-                "Component_[7234536879080653142]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7234536879080653142
+                "Component_[7885430517313815047]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7885430517313815047
                 },
                 "Component_[8379145965981853801]": {
                     "$type": "EditorEntitySortComponent",
@@ -242,9 +240,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 4457568364146036575,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -280,10 +280,6 @@
                             56.0
                         ]
                     }
-                },
-                "Component_[9881234323561781444]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9881234323561781444
                 }
             }
         },
@@ -303,6 +299,10 @@
                         ]
                     }
                 },
+                "Component_[10824731405786987184]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 10824731405786987184
+                },
                 "Component_[11958516455748178589]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11958516455748178589
@@ -334,9 +334,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -348,10 +350,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 18312154701274824579
                 },
-                "Component_[5503056011896155663]": {
-                    "$type": "SelectionComponent",
-                    "Id": 5503056011896155663
-                },
                 "Component_[5503383422952588599]": {
                     "$type": "EditorSphereShapeComponent",
                     "Id": 5503383422952588599,
@@ -436,9 +434,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -450,10 +450,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 18312154701274824579
                 },
-                "Component_[5503056011896155663]": {
-                    "$type": "SelectionComponent",
-                    "Id": 5503056011896155663
-                },
                 "Component_[5503383422952588599]": {
                     "$type": "EditorSphereShapeComponent",
                     "Id": 5503383422952588599,
@@ -488,6 +484,10 @@
                 "Component_[9622679977791551339]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 9622679977791551339
+                },
+                "Component_[9808826355636870171]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 9808826355636870171
                 }
             }
         },
@@ -515,6 +515,10 @@
                     "$type": "EditorLockComponent",
                     "Id": 12905621489618495352
                 },
+                "Component_[13630277075092398255]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13630277075092398255
+                },
                 "Component_[14910199652269985177]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 14910199652269985177,
@@ -538,9 +542,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -552,10 +558,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 18312154701274824579
                 },
-                "Component_[5503056011896155663]": {
-                    "$type": "SelectionComponent",
-                    "Id": 5503056011896155663
-                },
                 "Component_[5503383422952588599]": {
                     "$type": "EditorSphereShapeComponent",
                     "Id": 5503383422952588599,
@@ -640,9 +642,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -654,10 +658,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 18312154701274824579
                 },
-                "Component_[5503056011896155663]": {
-                    "$type": "SelectionComponent",
-                    "Id": 5503056011896155663
-                },
                 "Component_[5503383422952588599]": {
                     "$type": "EditorSphereShapeComponent",
                     "Id": 5503383422952588599,
@@ -677,6 +677,10 @@
                         }
                     }
                 },
+                "Component_[570979903557905559]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 570979903557905559
+                },
                 "Component_[6960222251430158177]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 6960222251430158177

AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/ForceRegion_SplineRegionWithModifiedTransform.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -75,9 +71,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14852461319282422545,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -163,10 +161,6 @@
                             "SortIndex": 3
                         }
                     ]
-                },
-                "Component_[9781300856110304578]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9781300856110304578
                 }
             }
         },
@@ -196,9 +190,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -253,6 +249,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 8572430005774015373
                 },
+                "Component_[8904415192085086079]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8904415192085086079
+                },
                 "Component_[9188864009972696870]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 9188864009972696870,
@@ -269,10 +269,6 @@
                             "SortIndex": 2
                         }
                     ]
-                },
-                "Component_[9781300856110304578]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9781300856110304578
                 }
             }
         },
@@ -284,6 +280,10 @@
                     "$type": "EditorLockComponent",
                     "Id": 10405021042248159955
                 },
+                "Component_[12089750689633134015]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 12089750689633134015
+                },
                 "Component_[13459286072711980262]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 13459286072711980262,
@@ -302,9 +302,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -375,10 +377,6 @@
                             "SortIndex": 2
                         }
                     ]
-                },
-                "Component_[9781300856110304578]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9781300856110304578
                 }
             }
         },
@@ -408,9 +406,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -453,6 +453,10 @@
                         }
                     }
                 },
+                "Component_[3067654867744298937]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3067654867744298937
+                },
                 "Component_[6220057123735521038]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 6220057123735521038
@@ -481,10 +485,6 @@
                             "SortIndex": 2
                         }
                     ]
-                },
-                "Component_[9781300856110304578]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9781300856110304578
                 }
             }
         },
@@ -514,9 +514,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -539,6 +541,10 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 17211297289344545407
                 },
+                "Component_[17884481120891166287]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17884481120891166287
+                },
                 "Component_[2235796114524801607]": {
                     "$type": "EditorSphereShapeComponent",
                     "Id": 2235796114524801607,
@@ -587,10 +593,6 @@
                             "SortIndex": 2
                         }
                     ]
-                },
-                "Component_[9781300856110304578]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9781300856110304578
                 }
             }
         },
@@ -707,9 +709,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -829,13 +833,13 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 165699220815603099
                 },
+                "Component_[17658317937142073417]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17658317937142073417
+                },
                 "Component_[2460290057035236623]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 2460290057035236623
-                },
-                "Component_[7928301240147624334]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7928301240147624334
                 }
             }
         }

AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/ForceRegion_WorldSpaceForceOnRigidBodies.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -74,10 +70,6 @@
                         }
                     ]
                 },
-                "Component_[16552379245302227119]": {
-                    "$type": "SelectionComponent",
-                    "Id": 16552379245302227119
-                },
                 "Component_[3221035514528112017]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 3221035514528112017,
@@ -121,9 +113,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -142,6 +136,10 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 6679033685309347475
                 },
+                "Component_[672703097116189883]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 672703097116189883
+                },
                 "Component_[6834749143646896747]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 6834749143646896747
@@ -184,10 +182,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 14184826875203987683
                 },
-                "Component_[15166068009966661228]": {
-                    "$type": "SelectionComponent",
-                    "Id": 15166068009966661228
-                },
                 "Component_[16162525862031058734]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 16162525862031058734
@@ -213,9 +207,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -295,10 +291,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[8826722283956091153]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 8826722283956091153

AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/ForceRegion_ZeroLinearDampingDoesNothing.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -92,10 +88,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[735314560482743923]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 735314560482743923
@@ -159,9 +151,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 15207509147789878003,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -197,6 +191,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 4063930810265535511
                 },
+                "Component_[4938441519899494402]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4938441519899494402
+                },
                 "Component_[6305042967059717778]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 6305042967059717778
@@ -205,10 +203,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 6579162722167290272
                 },
-                "Component_[7505241169297468186]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7505241169297468186
-                },
                 "Component_[9901087016055414497]": {
                     "$type": "EditorLockComponent",
                     "Id": 9901087016055414497
@@ -272,10 +266,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 14814439440515955733
                 },
-                "Component_[15163432692112924310]": {
-                    "$type": "SelectionComponent",
-                    "Id": 15163432692112924310
-                },
                 "Component_[256177509800666852]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 256177509800666852
@@ -310,15 +300,21 @@
                         }
                     ]
                 },
+                "Component_[8924198280690702493]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8924198280690702493
+                },
                 "Component_[9615281521574313681]": {
                     "$type": "EditorColliderComponent",
                     "Id": 9615281521574313681,
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -352,9 +348,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -378,10 +376,6 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 12642490403915699899
                 },
-                "Component_[15610374916332332393]": {
-                    "$type": "SelectionComponent",
-                    "Id": 15610374916332332393
-                },
                 "Component_[17438165335713050007]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 17438165335713050007,
@@ -422,12 +416,17 @@
                             0.0,
                             0.5
                         ],
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.000000953674316
-                        }
+                        "Inertia tensor": [
+                            10.000000953674316,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.000000953674316,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.000000953674316
+                        ]
                     }
                 },
                 "Component_[6180223862466446734]": {

AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/ForceRegion_ZeroLocalSpaceForceDoesNothing.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -190,9 +182,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -207,6 +201,10 @@
                         }
                     }
                 },
+                "Component_[3526603432953702275]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3526603432953702275
+                },
                 "Component_[3642268784022034771]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 3642268784022034771,
@@ -221,10 +219,6 @@
                         }
                     }
                 },
-                "Component_[3958314576452149141]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3958314576452149141
-                },
                 "Component_[5079483651742217799]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 5079483651742217799
@@ -252,9 +246,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -307,10 +303,6 @@
                     "$type": "EditorLockComponent",
                     "Id": 4049958820765177422
                 },
-                "Component_[6457248176216218598]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6457248176216218598
-                },
                 "Component_[7105892263773553905]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 7105892263773553905,
@@ -338,12 +330,17 @@
                             0.0,
                             0.5
                         ],
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.000000953674316
-                        }
+                        "Inertia tensor": [
+                            10.000000953674316,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.000000953674316,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.000000953674316
+                        ]
                     }
                 }
             }
@@ -389,9 +386,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 4232158654100578738,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -414,10 +413,6 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 592510569866213886
                 },
-                "Component_[6207391197758784171]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6207391197758784171
-                },
                 "Component_[6829315767193964115]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 6829315767193964115,
@@ -431,6 +426,10 @@
                         }
                     }
                 },
+                "Component_[8589431087825935532]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8589431087825935532
+                },
                 "Component_[8949240157660157638]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 8949240157660157638

AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/ForceRegion_ZeroPointForceDoesNothing.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -179,6 +171,10 @@
                         }
                     ]
                 },
+                "Component_[2172970840575710674]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 2172970840575710674
+                },
                 "Component_[2894675157918644101]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 2894675157918644101,
@@ -199,9 +195,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -216,10 +214,6 @@
                         }
                     }
                 },
-                "Component_[3958314576452149141]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3958314576452149141
-                },
                 "Component_[5079483651742217799]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 5079483651742217799
@@ -247,9 +241,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -302,10 +298,6 @@
                     "$type": "EditorLockComponent",
                     "Id": 4049958820765177422
                 },
-                "Component_[6457248176216218598]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6457248176216218598
-                },
                 "Component_[7105892263773553905]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 7105892263773553905,
@@ -333,12 +325,17 @@
                             0.0,
                             0.5
                         ],
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.000000953674316
-                        }
+                        "Inertia tensor": [
+                            10.000000953674316,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.000000953674316,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.000000953674316
+                        ]
                     }
                 }
             }
@@ -351,9 +348,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 12542751962260553639,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -422,9 +421,9 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 592510569866213886
                 },
-                "Component_[6207391197758784171]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6207391197758784171
+                "Component_[7104193989178785876]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7104193989178785876
                 },
                 "Component_[8949240157660157638]": {
                     "$type": "EditorOnlyEntityComponent",

AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/ForceRegion_ZeroSimpleDragForceDoesNothing.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -59,6 +55,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 1058672161870704752
                 },
+                "Component_[12042550642434868091]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 12042550642434868091
+                },
                 "Component_[12116468728378293251]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 12116468728378293251,
@@ -96,10 +96,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 16390152007823170626
                 },
-                "Component_[4231458678471163444]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4231458678471163444
-                },
                 "Component_[5226966346162381737]": {
                     "$type": "EditorForceRegionComponent",
                     "Id": 5226966346162381737,
@@ -130,9 +126,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -157,10 +155,6 @@
             "Id": "Entity_[285613356524]",
             "Name": "Sphere",
             "Components": {
-                "Component_[10572912425605638221]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10572912425605638221
-                },
                 "Component_[15461500731098694891]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 15461500731098694891,
@@ -207,9 +201,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/ForceRegion_ZeroSplineForceDoesNothing.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -98,9 +94,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -145,14 +143,14 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3946436068336355998
                 },
+                "Component_[5436314495931969430]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5436314495931969430
+                },
                 "Component_[6996958029592442366]": {
                     "$type": "EditorLockComponent",
                     "Id": 6996958029592442366
                 },
-                "Component_[7234536879080653142]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7234536879080653142
-                },
                 "Component_[8379145965981853801]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8379145965981853801
@@ -244,9 +242,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 4457568364146036575,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -282,10 +282,6 @@
                             56.0
                         ]
                     }
-                },
-                "Component_[9881234323561781444]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9881234323561781444
                 }
             }
         },
@@ -336,9 +332,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -350,10 +348,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 18312154701274824579
                 },
-                "Component_[5503056011896155663]": {
-                    "$type": "SelectionComponent",
-                    "Id": 5503056011896155663
-                },
                 "Component_[5503383422952588599]": {
                     "$type": "EditorSphereShapeComponent",
                     "Id": 5503383422952588599,
@@ -373,6 +367,10 @@
                         }
                     }
                 },
+                "Component_[5586086115611890411]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5586086115611890411
+                },
                 "Component_[6960222251430158177]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 6960222251430158177
@@ -438,9 +436,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -452,9 +452,9 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 18312154701274824579
                 },
-                "Component_[5503056011896155663]": {
-                    "$type": "SelectionComponent",
-                    "Id": 5503056011896155663
+                "Component_[3593384816103627024]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3593384816103627024
                 },
                 "Component_[5503383422952588599]": {
                     "$type": "EditorSphereShapeComponent",
@@ -540,9 +540,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -550,14 +552,14 @@
                         "ShapeType": 0
                     }
                 },
+                "Component_[17624463191548141287]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17624463191548141287
+                },
                 "Component_[18312154701274824579]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 18312154701274824579
                 },
-                "Component_[5503056011896155663]": {
-                    "$type": "SelectionComponent",
-                    "Id": 5503056011896155663
-                },
                 "Component_[5503383422952588599]": {
                     "$type": "EditorSphereShapeComponent",
                     "Id": 5503383422952588599,
@@ -611,6 +613,10 @@
                         ]
                     }
                 },
+                "Component_[10853864583250132273]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 10853864583250132273
+                },
                 "Component_[11958516455748178589]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11958516455748178589
@@ -642,9 +648,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -656,10 +664,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 18312154701274824579
                 },
-                "Component_[5503056011896155663]": {
-                    "$type": "SelectionComponent",
-                    "Id": 5503056011896155663
-                },
                 "Component_[5503383422952588599]": {
                     "$type": "EditorSphereShapeComponent",
                     "Id": 5503383422952588599,

AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/ForceRegion_ZeroWorldSpaceForceDoesNothing.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -203,9 +195,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -220,9 +214,9 @@
                         }
                     }
                 },
-                "Component_[3958314576452149141]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3958314576452149141
+                "Component_[3792005848495104629]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3792005848495104629
                 },
                 "Component_[5079483651742217799]": {
                     "$type": "EditorVisibilityComponent",
@@ -251,9 +245,11 @@
                             0.0,
                             0.5
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -302,10 +298,6 @@
                     "$type": "EditorLockComponent",
                     "Id": 4049958820765177422
                 },
-                "Component_[6457248176216218598]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6457248176216218598
-                },
                 "Component_[7105892263773553905]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 7105892263773553905,
@@ -333,12 +325,17 @@
                             0.0,
                             0.5
                         ],
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.000000953674316
-                        }
+                        "Inertia tensor": [
+                            10.000000953674316,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.000000953674316,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.000000953674316
+                        ]
                     }
                 }
             }
@@ -351,9 +348,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 14156005219870653977,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -368,6 +367,10 @@
                         }
                     ]
                 },
+                "Component_[14286913393959357259]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 14286913393959357259
+                },
                 "Component_[16077279250477418332]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 16077279250477418332
@@ -409,10 +412,6 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 592510569866213886
                 },
-                "Component_[6207391197758784171]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6207391197758784171
-                },
                 "Component_[7563372064540743544]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 7563372064540743544,

AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/Joints_BallNoLimitsConstrained.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -55,10 +51,6 @@
             "Id": "Entity_[286081428076]",
             "Name": "lead",
             "Components": {
-                "Component_[10023033763705225227]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10023033763705225227
-                },
                 "Component_[13011255769289009335]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 13011255769289009335
@@ -99,11 +91,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -119,12 +106,17 @@
                         "Gravity Enabled": false,
                         "Compute Mass": false,
                         "Mass": 999.0,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 0.010010000318288803
-                        }
+                        "Inertia tensor": [
+                            0.010010000318288803,
+                            0.0,
+                            0.0,
+                            0.0,
+                            0.010010000318288803,
+                            0.0,
+                            0.0,
+                            0.0,
+                            0.010010000318288803
+                        ]
                     }
                 },
                 "Component_[2634845782760090713]": {
@@ -230,10 +222,6 @@
                         }
                     ]
                 },
-                "Component_[3317660974688951744]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3317660974688951744
-                },
                 "Component_[6861005041189176147]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 6861005041189176147
@@ -249,11 +237,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfigs": [
@@ -270,6 +253,10 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 8497797771983319252
                 },
+                "Component_[8697887525241204415]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8697887525241204415
+                },
                 "Component_[9487204736869257485]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 9487204736869257485
@@ -369,12 +356,17 @@
                         ],
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
                 "Component_[2304545190715981019]": {
@@ -385,10 +377,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 281621200381688046
                 },
-                "Component_[3788104328409405778]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3788104328409405778
-                },
                 "Component_[5053986797366085195]": {
                     "$type": "EditorColliderComponent",
                     "Id": 5053986797366085195,
@@ -399,11 +387,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     }
                 },

AutomatedTesting/Levels/Physics/Material_CharacterController/Material_CharacterController.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -104,14 +100,14 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 16230689882780910812
                 },
-                "Component_[17914199320544874011]": {
-                    "$type": "SelectionComponent",
-                    "Id": 17914199320544874011
-                },
                 "Component_[18377528337686856462]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 18377528337686856462
                 },
+                "Component_[2273851137384159771]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 2273851137384159771
+                },
                 "Component_[2372725671404085774]": {
                     "$type": "EditorColliderComponent",
                     "Id": 2372725671404085774,
@@ -124,11 +120,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -201,10 +192,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -243,10 +230,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 1191036568178048800
                 },
-                "Component_[1312913198288358182]": {
-                    "$type": "SelectionComponent",
-                    "Id": 1312913198288358182
-                },
                 "Component_[17767073666136164898]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 17767073666136164898
@@ -357,10 +340,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 1191036568178048800
                 },
-                "Component_[1312913198288358182]": {
-                    "$type": "SelectionComponent",
-                    "Id": 1312913198288358182
-                },
                 "Component_[17767073666136164898]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 17767073666136164898
@@ -471,10 +450,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 1191036568178048800
                 },
-                "Component_[1312913198288358182]": {
-                    "$type": "SelectionComponent",
-                    "Id": 1312913198288358182
-                },
                 "Component_[17767073666136164898]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 17767073666136164898
@@ -579,11 +554,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -606,10 +576,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 212116149561142254
                 },
-                "Component_[3469442090661448878]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3469442090661448878
-                },
                 "Component_[4124763457304427835]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4124763457304427835
@@ -745,9 +711,9 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 16230689882780910812
                 },
-                "Component_[17914199320544874011]": {
-                    "$type": "SelectionComponent",
-                    "Id": 17914199320544874011
+                "Component_[1804743484822373134]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 1804743484822373134
                 },
                 "Component_[18377528337686856462]": {
                     "$type": "EditorPendingCompositionComponent",
@@ -765,11 +731,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -854,10 +815,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 16230689882780910812
                 },
-                "Component_[17914199320544874011]": {
-                    "$type": "SelectionComponent",
-                    "Id": 17914199320544874011
-                },
                 "Component_[18377528337686856462]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 18377528337686856462
@@ -874,11 +831,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -889,6 +841,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 8407016953149050130
                 },
+                "Component_[8643832216909363747]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8643832216909363747
+                },
                 "Component_[8715876380695213524]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 8715876380695213524,
@@ -924,11 +880,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -951,10 +902,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 212116149561142254
                 },
-                "Component_[3469442090661448878]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3469442090661448878
-                },
                 "Component_[4124763457304427835]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4124763457304427835
@@ -1051,11 +998,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1078,10 +1020,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 212116149561142254
                 },
-                "Component_[3469442090661448878]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3469442090661448878
-                },
                 "Component_[4124763457304427835]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4124763457304427835

AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/Material_DefaultLibraryConsistentOnAllFeatures.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -59,10 +55,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -104,11 +96,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -158,6 +145,10 @@
                     "$type": "EditorLockComponent",
                     "Id": 5110395982372092581
                 },
+                "Component_[5802532315539827478]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5802532315539827478
+                },
                 "Component_[6266147445640237600]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 6266147445640237600,
@@ -180,10 +171,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -209,6 +196,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 156509540013497987
                 },
+                "Component_[17166791731025807082]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17166791731025807082
+                },
                 "Component_[1721990367369414539]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 1721990367369414539
@@ -225,11 +216,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -376,10 +362,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 15970275978245520354
                 },
-                "Component_[202435863520473857]": {
-                    "$type": "SelectionComponent",
-                    "Id": 202435863520473857
-                },
                 "Component_[2546823006136226180]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 2546823006136226180
@@ -435,8 +417,8 @@
                     "Id": 14358908923983911426,
                     "Configuration": {
                         "entityId": "",
-                        "Gravity Enabled": false,
                         "Kinematic": true,
+                        "Gravity Enabled": false,
                         "Compute Mass": false
                     }
                 },
@@ -458,11 +440,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -476,10 +453,6 @@
                         }
                     }
                 },
-                "Component_[4791314600057497309]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4791314600057497309
-                },
                 "Component_[7946554280901980058]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 7946554280901980058
@@ -568,8 +541,8 @@
                     "Id": 14358908923983911426,
                     "Configuration": {
                         "entityId": "",
-                        "Gravity Enabled": false,
                         "Kinematic": true,
+                        "Gravity Enabled": false,
                         "Compute Mass": false
                     }
                 },
@@ -591,11 +564,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -609,10 +577,6 @@
                         }
                     }
                 },
-                "Component_[4791314600057497309]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4791314600057497309
-                },
                 "Component_[7946554280901980058]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 7946554280901980058
@@ -708,10 +672,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2251383250964041996
                 },
-                "Component_[3557869430458031692]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3557869430458031692
-                },
                 "Component_[4920652687285202617]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4920652687285202617
@@ -790,10 +750,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 17823417752576404336
                 },
-                "Component_[2401496945657124059]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2401496945657124059
-                },
                 "Component_[4104197490219530434]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4104197490219530434
@@ -877,10 +833,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -922,11 +874,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -940,6 +887,10 @@
                         }
                     }
                 },
+                "Component_[18032270469084513644]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 18032270469084513644
+                },
                 "Component_[2005399217246976371]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2005399217246976371
@@ -1035,10 +986,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -1096,10 +1043,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 17823417752576404336
                 },
-                "Component_[2401496945657124059]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2401496945657124059
-                },
                 "Component_[4104197490219530434]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4104197490219530434
@@ -1183,10 +1126,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -1208,6 +1147,10 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 13530932529430511545
                 },
+                "Component_[147038757022866361]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 147038757022866361
+                },
                 "Component_[156509540013497987]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 156509540013497987
@@ -1228,11 +1171,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1304,10 +1242,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -1349,11 +1283,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1371,6 +1300,10 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2005399217246976371
                 },
+                "Component_[2361213470063869563]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 2361213470063869563
+                },
                 "Component_[3428108517473506]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 3428108517473506,
@@ -1425,10 +1358,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -1454,6 +1383,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 156509540013497987
                 },
+                "Component_[17119093722250109879]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17119093722250109879
+                },
                 "Component_[1721990367369414539]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 1721990367369414539
@@ -1470,11 +1403,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1585,10 +1513,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 17823417752576404336
                 },
-                "Component_[2401496945657124059]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2401496945657124059
-                },
                 "Component_[4104197490219530434]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4104197490219530434
@@ -1635,11 +1559,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1705,10 +1624,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 17823417752576404336
                 },
-                "Component_[2401496945657124059]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2401496945657124059
-                },
                 "Component_[4104197490219530434]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4104197490219530434
@@ -1755,11 +1670,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -1865,10 +1775,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 15970275978245520354
                 },
-                "Component_[202435863520473857]": {
-                    "$type": "SelectionComponent",
-                    "Id": 202435863520473857
-                },
                 "Component_[2546823006136226180]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 2546823006136226180
@@ -1915,10 +1821,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -1944,6 +1846,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 156509540013497987
                 },
+                "Component_[17136072271366858184]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17136072271366858184
+                },
                 "Component_[1721990367369414539]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 1721990367369414539
@@ -1960,11 +1866,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -2071,10 +1972,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 17823417752576404336
                 },
-                "Component_[2401496945657124059]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2401496945657124059
-                },
                 "Component_[4104197490219530434]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4104197490219530434
@@ -2121,11 +2018,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -2177,10 +2069,6 @@
                     "$type": "EditorLockComponent",
                     "Id": 10961108575362702323
                 },
-                "Component_[11690509593126538189]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11690509593126538189
-                },
                 "Component_[13783802219168995402]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 13783802219168995402
@@ -2276,10 +2164,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 1580182453287462118
                 },
-                "Component_[3146614964891511007]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3146614964891511007
-                },
                 "Component_[4187386723339130447]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 4187386723339130447
@@ -2348,10 +2232,6 @@
                     "$type": "EditorLockComponent",
                     "Id": 10961108575362702323
                 },
-                "Component_[11690509593126538189]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11690509593126538189
-                },
                 "Component_[13783802219168995402]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 13783802219168995402
@@ -2447,10 +2327,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 1580182453287462118
                 },
-                "Component_[3146614964891511007]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3146614964891511007
-                },
                 "Component_[4187386723339130447]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 4187386723339130447
@@ -2498,10 +2374,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -2543,11 +2415,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -2608,6 +2475,10 @@
                             36.875
                         ]
                     }
+                },
+                "Component_[8573838388405794989]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8573838388405794989
                 }
             }
         },
@@ -2619,10 +2490,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -2664,11 +2531,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -2710,6 +2572,10 @@
                         }
                     }
                 },
+                "Component_[4020601037831651611]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4020601037831651611
+                },
                 "Component_[5040620082781400644]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 5040620082781400644
@@ -2740,10 +2606,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -2785,11 +2647,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -2850,6 +2707,10 @@
                             34.0
                         ]
                     }
+                },
+                "Component_[7340993600096537651]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7340993600096537651
                 }
             }
         },
@@ -2861,10 +2722,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -2906,11 +2763,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -2971,6 +2823,10 @@
                             34.25
                         ]
                     }
+                },
+                "Component_[7244603542322900077]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7244603542322900077
                 }
             }
         },
@@ -3021,10 +2877,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 17823417752576404336
                 },
-                "Component_[2401496945657124059]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2401496945657124059
-                },
                 "Component_[4104197490219530434]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4104197490219530434
@@ -3071,11 +2923,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -3106,10 +2953,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -3151,11 +2994,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -3216,6 +3054,10 @@
                             33.25
                         ]
                     }
+                },
+                "Component_[9180160843010240171]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 9180160843010240171
                 }
             }
         },
@@ -3227,10 +3069,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -3272,11 +3110,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -3337,6 +3170,10 @@
                             37.0
                         ]
                     }
+                },
+                "Component_[6801176898729589264]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 6801176898729589264
                 }
             }
         },
@@ -3348,10 +3185,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -3393,11 +3226,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -3415,6 +3243,10 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2005399217246976371
                 },
+                "Component_[3157657273367205879]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3157657273367205879
+                },
                 "Component_[3428108517473506]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 3428108517473506,
@@ -3469,10 +3301,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -3494,6 +3322,10 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 13530932529430511545
                 },
+                "Component_[15106594784498510757]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 15106594784498510757
+                },
                 "Component_[156509540013497987]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 156509540013497987
@@ -3514,11 +3346,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -3625,10 +3452,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 17823417752576404336
                 },
-                "Component_[2401496945657124059]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2401496945657124059
-                },
                 "Component_[4104197490219530434]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4104197490219530434
@@ -3675,11 +3498,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -3710,10 +3528,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10840566128898283059
                 },
-                "Component_[10983094587467278454]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10983094587467278454
-                },
                 "Component_[11383036399300899746]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 11383036399300899746,
@@ -3755,11 +3569,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -3801,6 +3610,10 @@
                         }
                     }
                 },
+                "Component_[4672818955097144643]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4672818955097144643
+                },
                 "Component_[5040620082781400644]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 5040620082781400644
@@ -3866,10 +3679,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 17823417752576404336
                 },
-                "Component_[2401496945657124059]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2401496945657124059
-                },
                 "Component_[4104197490219530434]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4104197490219530434
@@ -3916,11 +3725,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {

AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/0.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -88,10 +84,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[4712694840150876798]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 4712694840150876798
@@ -135,10 +127,6 @@
                         }
                     ]
                 },
-                "Component_[11346323631807681262]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11346323631807681262
-                },
                 "Component_[1153076453892596685]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 1153076453892596685
@@ -214,12 +202,17 @@
                         ],
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
                 "Component_[7385062050909259476]": {
@@ -233,10 +226,6 @@
             "Id": "Entity_[285015917770]",
             "Name": "terrain",
             "Components": {
-                "Component_[12368241148684771968]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12368241148684771968
-                },
                 "Component_[14478545718944713607]": {
                     "$type": "EditorLockComponent",
                     "Id": 14478545718944713607
@@ -255,11 +244,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -317,6 +301,10 @@
                 "Component_[7071637913266534486]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 7071637913266534486
+                },
+                "Component_[7476780700387468022]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7476780700387468022
                 }
             }
         },
@@ -341,9 +329,9 @@
                         }
                     ]
                 },
-                "Component_[16014778893970138866]": {
-                    "$type": "SelectionComponent",
-                    "Id": 16014778893970138866
+                "Component_[15909051135029218004]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 15909051135029218004
                 },
                 "Component_[17048341836974969891]": {
                     "$type": "EditorDisabledCompositionComponent",
@@ -369,11 +357,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {

AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/1.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -55,10 +51,6 @@
             "Id": "Entity_[261705524673]",
             "Name": "sphere",
             "Components": {
-                "Component_[11646493884547176136]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11646493884547176136
-                },
                 "Component_[11906722936407481270]": {
                     "$type": "EditorColliderComponent",
                     "Id": 11906722936407481270,
@@ -94,12 +86,17 @@
                         ],
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
                 "Component_[14780167336961960724]": {
@@ -211,10 +208,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[4712694840150876798]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 4712694840150876798
@@ -237,10 +230,6 @@
             "Id": "Entity_[285015917770]",
             "Name": "terrain",
             "Components": {
-                "Component_[12368241148684771968]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12368241148684771968
-                },
                 "Component_[14478545718944713607]": {
                     "$type": "EditorLockComponent",
                     "Id": 14478545718944713607
@@ -271,11 +260,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -314,6 +298,10 @@
                         }
                     ]
                 },
+                "Component_[4881643477244228967]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4881643477244228967
+                },
                 "Component_[5741926347424366246]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 5741926347424366246
@@ -345,10 +333,6 @@
                         }
                     ]
                 },
-                "Component_[16014778893970138866]": {
-                    "$type": "SelectionComponent",
-                    "Id": 16014778893970138866
-                },
                 "Component_[17048341836974969891]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 17048341836974969891
@@ -373,11 +357,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -429,6 +408,10 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 6873431808813245234
                 },
+                "Component_[9082731732445471258]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 9082731732445471258
+                },
                 "Component_[9461177873056538692]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 9461177873056538692

AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/Material_EmptyLibraryUsesDefault.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -59,9 +55,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 10131916318786260150,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -126,10 +124,6 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 15308818810773485994
                 },
-                "Component_[15840538373800101541]": {
-                    "$type": "SelectionComponent",
-                    "Id": 15840538373800101541
-                },
                 "Component_[17755930108359081035]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 17755930108359081035
@@ -149,6 +143,10 @@
                 "Component_[6534162403380073417]": {
                     "$type": "EditorLockComponent",
                     "Id": 6534162403380073417
+                },
+                "Component_[938689551918509263]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 938689551918509263
                 }
             }
         },
@@ -168,10 +166,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 13724541256316894675
                 },
-                "Component_[14278953062209923807]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14278953062209923807
-                },
                 "Component_[16046379088641642538]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 16046379088641642538,
@@ -197,9 +191,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 17099031793310612741,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -219,12 +215,17 @@
                     "Configuration": {
                         "entityId": "",
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
                 "Component_[3607123429290193540]": {
@@ -274,10 +275,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 13724541256316894675
                 },
-                "Component_[14278953062209923807]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14278953062209923807
-                },
                 "Component_[16046379088641642538]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 16046379088641642538,
@@ -303,9 +300,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 17099031793310612741,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -325,12 +324,17 @@
                     "Configuration": {
                         "entityId": "",
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
                 "Component_[3607123429290193540]": {
@@ -380,10 +384,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 13724541256316894675
                 },
-                "Component_[14278953062209923807]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14278953062209923807
-                },
                 "Component_[16046379088641642538]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 16046379088641642538,
@@ -414,9 +414,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 17099031793310612741,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -442,12 +444,17 @@
                             0.0,
                             -0.5
                         ],
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 2.3999998569488525
-                        },
+                        "Inertia tensor": [
+                            2.3999998569488525,
+                            0.0,
+                            0.0,
+                            0.0,
+                            2.3999998569488525,
+                            0.0,
+                            0.0,
+                            0.0,
+                            2.3999998569488525
+                        ],
                         "Debug Draw Center of Mass": true
                     }
                 },
@@ -493,10 +500,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 13724541256316894675
                 },
-                "Component_[14278953062209923807]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14278953062209923807
-                },
                 "Component_[14564167809659215569]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 14564167809659215569,
@@ -527,9 +530,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 17099031793310612741,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -555,12 +560,17 @@
                             0.0,
                             -0.5
                         ],
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 2.3999998569488525
-                        },
+                        "Inertia tensor": [
+                            2.3999998569488525,
+                            0.0,
+                            0.0,
+                            0.0,
+                            2.3999998569488525,
+                            0.0,
+                            0.0,
+                            0.0,
+                            2.3999998569488525
+                        ],
                         "Debug Draw Center of Mass": true
                     }
                 },

AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/Material_LibraryChangesReflectInstantly.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -55,10 +51,6 @@
             "Id": "Entity_[1011301294950]",
             "Name": "trigger",
             "Components": {
-                "Component_[10177271249943941360]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10177271249943941360
-                },
                 "Component_[15134750255872632480]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 15134750255872632480,
@@ -102,6 +94,10 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 17044248283146127093
                 },
+                "Component_[17612961656424497006]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17612961656424497006
+                },
                 "Component_[17656225355810724488]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 17656225355810724488
@@ -136,11 +132,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -213,10 +204,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[8964779992189042072]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 8964779992189042072
@@ -239,10 +226,6 @@
             "Id": "Entity_[281156854630]",
             "Name": "sphere_0",
             "Components": {
-                "Component_[10422448568969909101]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10422448568969909101
-                },
                 "Component_[10608077766366924597]": {
                     "$type": "EditorSphereShapeComponent",
                     "Id": 10608077766366924597,
@@ -369,10 +352,6 @@
                         ]
                     }
                 },
-                "Component_[12287644288883736884]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12287644288883736884
-                },
                 "Component_[13363420471903321484]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 13363420471903321484
@@ -471,10 +450,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10880848152918698630
                 },
-                "Component_[10993747078839261711]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10993747078839261711
-                },
                 "Component_[11962089952362907403]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 11962089952362907403
@@ -675,10 +650,6 @@
                         }
                     ]
                 },
-                "Component_[6408021591593091139]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6408021591593091139
-                },
                 "Component_[969119709860529359]": {
                     "$type": "EditorRigidBodyComponent",
                     "Id": 969119709860529359,
@@ -727,10 +698,6 @@
                         ]
                     }
                 },
-                "Component_[13558624633219310097]": {
-                    "$type": "SelectionComponent",
-                    "Id": 13558624633219310097
-                },
                 "Component_[17851857614423757842]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 17851857614423757842
@@ -906,10 +873,6 @@
                     "Id": 17998392348447200702,
                     "GameView": true
                 },
-                "Component_[1964072586603507375]": {
-                    "$type": "SelectionComponent",
-                    "Id": 1964072586603507375
-                },
                 "Component_[3796980743963885327]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 3796980743963885327
@@ -928,6 +891,10 @@
             "Id": "Entity_[306926658406]",
             "Name": "block",
             "Components": {
+                "Component_[11967684837246765052]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 11967684837246765052
+                },
                 "Component_[12382634988339210856]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 12382634988339210856,
@@ -995,10 +962,6 @@
                         }
                     }
                 },
-                "Component_[5493593570289811910]": {
-                    "$type": "SelectionComponent",
-                    "Id": 5493593570289811910
-                },
                 "Component_[8410997340656467467]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 8410997340656467467
@@ -1091,10 +1054,6 @@
                 "Component_[7027064350878945104]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 7027064350878945104
-                },
-                "Component_[789490538071906007]": {
-                    "$type": "SelectionComponent",
-                    "Id": 789490538071906007
                 }
             }
         }

AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/0/0.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -101,18 +97,19 @@
                         ],
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
-                "Component_[15836496613906916845]": {
-                    "$type": "SelectionComponent",
-                    "Id": 15836496613906916845
-                },
                 "Component_[16597972522349022176]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 16597972522349022176
@@ -129,9 +126,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 4355996461495376905,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -206,10 +205,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 3552038377029839116
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -274,18 +269,19 @@
                         ],
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
-                "Component_[15836496613906916845]": {
-                    "$type": "SelectionComponent",
-                    "Id": 15836496613906916845
-                },
                 "Component_[16597972522349022176]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 16597972522349022176
@@ -302,9 +298,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 4355996461495376905,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -359,6 +357,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 10871399259191966069
                 },
+                "Component_[11531003981497427439]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 11531003981497427439
+                },
                 "Component_[12515684864447251759]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 12515684864447251759
@@ -393,10 +395,6 @@
                     "$type": "EditorLockComponent",
                     "Id": 3078346116579265539
                 },
-                "Component_[4904090692018630100]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4904090692018630100
-                },
                 "Component_[7960354929538954982]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 7960354929538954982
@@ -407,9 +405,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -503,10 +503,6 @@
                 "Component_[2029679326492259668]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 2029679326492259668
-                },
-                "Component_[6843859049760163738]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6843859049760163738
                 }
             }
         }

AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/1/1.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -61,9 +57,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -125,14 +123,14 @@
                         }
                     ]
                 },
-                "Component_[17871090743916940997]": {
-                    "$type": "SelectionComponent",
-                    "Id": 17871090743916940997
-                },
                 "Component_[18263618414370492472]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 18263618414370492472
                 },
+                "Component_[450055663958573819]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 450055663958573819
+                },
                 "Component_[4769459002306564121]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 4769459002306564121
@@ -200,10 +198,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 3552038377029839116
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -268,18 +262,19 @@
                         ],
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
-                "Component_[15836496613906916845]": {
-                    "$type": "SelectionComponent",
-                    "Id": 15836496613906916845
-                },
                 "Component_[16597972522349022176]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 16597972522349022176
@@ -296,9 +291,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 4355996461495376905,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -384,10 +381,6 @@
                 "Component_[2029679326492259668]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 2029679326492259668
-                },
-                "Component_[6843859049760163738]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6843859049760163738
                 }
             }
         },
@@ -441,18 +434,19 @@
                         ],
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
-                "Component_[15836496613906916845]": {
-                    "$type": "SelectionComponent",
-                    "Id": 15836496613906916845
-                },
                 "Component_[16597972522349022176]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 16597972522349022176
@@ -469,9 +463,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 4355996461495376905,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/Material_NoEffectIfNoColliderShape.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -92,10 +88,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[7164043216881357760]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 7164043216881357760
@@ -122,17 +114,15 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 10233737701874797018
                 },
-                "Component_[11193065989988835644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11193065989988835644
-                },
                 "Component_[11885287454855755410]": {
                     "$type": "EditorColliderComponent",
                     "Id": 11885287454855755410,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     }
@@ -205,6 +195,10 @@
                         }
                     ]
                 },
+                "Component_[955724289592309383]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 955724289592309383
+                },
                 "Component_[9806670091592883612]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 9806670091592883612
@@ -238,17 +232,15 @@
                         }
                     }
                 },
-                "Component_[11193065989988835644]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11193065989988835644
-                },
                 "Component_[11885287454855755410]": {
                     "$type": "EditorColliderComponent",
                     "Id": 11885287454855755410,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -268,6 +260,10 @@
                     "$type": "EditorLockComponent",
                     "Id": 17462258511890366623
                 },
+                "Component_[2933959899102505394]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 2933959899102505394
+                },
                 "Component_[5437855560987636045]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 5437855560987636045
@@ -348,9 +344,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -374,10 +372,6 @@
                         }
                     }
                 },
-                "Component_[14158587883552441503]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14158587883552441503
-                },
                 "Component_[15218441006761085606]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 15218441006761085606
@@ -411,6 +405,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3321317640247600009
                 },
+                "Component_[7595437039523567506]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7595437039523567506
+                },
                 "Component_[7911748468698987442]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 7911748468698987442,
@@ -472,9 +470,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -498,14 +498,14 @@
                         }
                     }
                 },
-                "Component_[14158587883552441503]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14158587883552441503
-                },
                 "Component_[15218441006761085606]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 15218441006761085606
                 },
+                "Component_[17436374398764502348]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17436374398764502348
+                },
                 "Component_[17921237041097851030]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 17921237041097851030,
@@ -627,17 +627,15 @@
                         }
                     }
                 },
-                "Component_[3624335115656130395]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3624335115656130395
-                },
                 "Component_[5389333556473580041]": {
                     "$type": "EditorColliderComponent",
                     "Id": 5389333556473580041,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -745,17 +743,15 @@
                         }
                     }
                 },
-                "Component_[3624335115656130395]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3624335115656130395
-                },
                 "Component_[5389333556473580041]": {
                     "$type": "EditorColliderComponent",
                     "Id": 5389333556473580041,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/Material_PerFaceMaterialGetsCorrectMaterial.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -55,6 +51,10 @@
             "Id": "Entity_[263299149192]",
             "Name": "Perface_Entity",
             "Components": {
+                "Component_[11696143035287514767]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 11696143035287514767
+                },
                 "Component_[12895135369190770831]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 12895135369190770831,
@@ -72,10 +72,6 @@
                         }
                     ]
                 },
-                "Component_[12933367835807479524]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12933367835807479524
-                },
                 "Component_[14094829544062915163]": {
                     "$type": "EditorColliderComponent",
                     "Id": 14094829544062915163,
@@ -219,10 +215,6 @@
                         }
                     ]
                 },
-                "Component_[1341105588245574408]": {
-                    "$type": "SelectionComponent",
-                    "Id": 1341105588245574408
-                },
                 "Component_[14079522067308699507]": {
                     "$type": "EditorLockComponent",
                     "Id": 14079522067308699507
@@ -244,12 +236,17 @@
                         "Linear damping": 0.0,
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
                 "Component_[17367340743922879512]": {
@@ -342,10 +339,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10435545141396253755
                 },
-                "Component_[10589025713121715221]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10589025713121715221
-                },
                 "Component_[1360399676717184302]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 1360399676717184302
@@ -421,12 +414,17 @@
                         "Linear damping": 0.0,
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 }
             },
@@ -463,10 +461,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10435545141396253755
                 },
-                "Component_[10589025713121715221]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10589025713121715221
-                },
                 "Component_[1360399676717184302]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 1360399676717184302
@@ -542,12 +536,17 @@
                         "Linear damping": 0.0,
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 }
             },
@@ -594,10 +593,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[722204632874297368]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 722204632874297368

AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/Material_RestitutionCombinePriorityOrder.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -77,9 +73,9 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 13396737954818371455
                 },
-                "Component_[14094079953882345085]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14094079953882345085
+                "Component_[13430278792265392683]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13430278792265392683
                 },
                 "Component_[15151923958895865240]": {
                     "$type": "EditorOnlyEntityComponent",
@@ -220,10 +216,6 @@
                         }
                     ]
                 },
-                "Component_[10516303889368809827]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10516303889368809827
-                },
                 "Component_[11252974442733513437]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11252974442733513437
@@ -315,6 +307,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 10327124523666310780
                 },
+                "Component_[11172438983929971957]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 11172438983929971957
+                },
                 "Component_[11959116158231937437]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 11959116158231937437,
@@ -343,10 +339,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 13396737954818371455
                 },
-                "Component_[14094079953882345085]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14094079953882345085
-                },
                 "Component_[15151923958895865240]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 15151923958895865240
@@ -492,14 +484,14 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 13396737954818371455
                 },
-                "Component_[14094079953882345085]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14094079953882345085
-                },
                 "Component_[15151923958895865240]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 15151923958895865240
                 },
+                "Component_[16060773451043724036]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 16060773451043724036
+                },
                 "Component_[2374380279612689881]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 2374380279612689881,
@@ -641,10 +633,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 13396737954818371455
                 },
-                "Component_[14094079953882345085]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14094079953882345085
-                },
                 "Component_[15151923958895865240]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 15151923958895865240
@@ -744,6 +732,10 @@
                         }
                     }
                 },
+                "Component_[4987343837484879472]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4987343837484879472
+                },
                 "Component_[6437575279376969517]": {
                     "$type": "EditorLockComponent",
                     "Id": 6437575279376969517
@@ -784,10 +776,6 @@
                         }
                     ]
                 },
-                "Component_[10516303889368809827]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10516303889368809827
-                },
                 "Component_[11252974442733513437]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11252974442733513437
@@ -901,10 +889,6 @@
                         }
                     ]
                 },
-                "Component_[10516303889368809827]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10516303889368809827
-                },
                 "Component_[11252974442733513437]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11252974442733513437
@@ -1018,10 +1002,6 @@
                         }
                     ]
                 },
-                "Component_[10516303889368809827]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10516303889368809827
-                },
                 "Component_[11252974442733513437]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11252974442733513437

AutomatedTesting/Levels/Physics/NameNode_Prints/NameNode_Prints.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -92,10 +88,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -126,10 +118,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 10668615725757120918
                 },
-                "Component_[11499318648734982432]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11499318648734982432
-                },
                 "Component_[11809244746758920254]": {
                     "$type": "EditorColliderComponent",
                     "Id": 11809244746758920254,
@@ -146,11 +134,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -161,6 +144,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 12668293490291972571
                 },
+                "Component_[12902745641494942852]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 12902745641494942852
+                },
                 "Component_[13829008864828557117]": {
                     "$type": "EditorLockComponent",
                     "Id": 13829008864828557117
@@ -236,10 +223,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 10668615725757120918
                 },
-                "Component_[11499318648734982432]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11499318648734982432
-                },
                 "Component_[11809244746758920254]": {
                     "$type": "EditorColliderComponent",
                     "Id": 11809244746758920254,
@@ -256,11 +239,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -315,6 +293,10 @@
                         }
                     ]
                 },
+                "Component_[3028105337823205546]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3028105337823205546
+                },
                 "Component_[485296799080181542]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 485296799080181542,
@@ -358,11 +340,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -373,6 +350,10 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 12612842838095137446
                 },
+                "Component_[13898773828324844644]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 13898773828324844644
+                },
                 "Component_[14768773875483735434]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 14768773875483735434,
@@ -436,10 +417,6 @@
                 "Component_[7296510245297829595]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 7296510245297829595
-                },
-                "Component_[8046044211277469545]": {
-                    "$type": "SelectionComponent",
-                    "Id": 8046044211277469545
                 }
             },
             "IsRuntimeActive": false
@@ -448,6 +425,10 @@
             "Id": "Entity_[461816450099]",
             "Name": "C19536275_0",
             "Components": {
+                "Component_[10630509762856920685]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 10630509762856920685
+                },
                 "Component_[10824038651895419042]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 10824038651895419042
@@ -548,10 +529,6 @@
                 "Component_[7296510245297829595]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 7296510245297829595
-                },
-                "Component_[8046044211277469545]": {
-                    "$type": "SelectionComponent",
-                    "Id": 8046044211277469545
                 }
             },
             "IsRuntimeActive": false
@@ -657,13 +634,13 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 414394093141836853
                 },
+                "Component_[6325028548166347714]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 6325028548166347714
+                },
                 "Component_[7296510245297829595]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 7296510245297829595
-                },
-                "Component_[8046044211277469545]": {
-                    "$type": "SelectionComponent",
-                    "Id": 8046044211277469545
                 }
             },
             "IsRuntimeActive": false
@@ -709,6 +686,10 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 12612842838095137446
                 },
+                "Component_[14126978007795755949]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 14126978007795755949
+                },
                 "Component_[14768773875483735434]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 14768773875483735434,
@@ -772,10 +753,6 @@
                 "Component_[7296510245297829595]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 7296510245297829595
-                },
-                "Component_[8046044211277469545]": {
-                    "$type": "SelectionComponent",
-                    "Id": 8046044211277469545
                 }
             },
             "IsRuntimeActive": false

AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/Physics_WorldBodyBusWorksOnEditorComponents.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -59,9 +55,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 16300212154464470531,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -77,10 +75,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2355668156940730228
                 },
-                "Component_[2801111889414931848]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2801111889414931848
-                },
                 "Component_[4403703683034890123]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4403703683034890123
@@ -149,9 +143,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10271136976310200923,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -167,9 +163,9 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2355668156940730228
                 },
-                "Component_[2801111889414931848]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2801111889414931848
+                "Component_[280625196657739250]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 280625196657739250
                 },
                 "Component_[4403703683034890123]": {
                     "$type": "EditorDisabledCompositionComponent",
@@ -226,9 +222,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10271136976310200923,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -244,10 +242,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2355668156940730228
                 },
-                "Component_[2801111889414931848]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2801111889414931848
-                },
                 "Component_[4403703683034890123]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4403703683034890123
@@ -264,6 +258,10 @@
                         ]
                     }
                 },
+                "Component_[5449671723874720078]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5449671723874720078
+                },
                 "Component_[5743451229161796048]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 5743451229161796048
@@ -303,9 +301,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 16300212154464470531,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -321,10 +321,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2355668156940730228
                 },
-                "Component_[2801111889414931848]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2801111889414931848
-                },
                 "Component_[4403703683034890123]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4403703683034890123
@@ -393,9 +389,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10271136976310200923,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -411,10 +409,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2355668156940730228
                 },
-                "Component_[2801111889414931848]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2801111889414931848
-                },
                 "Component_[4403703683034890123]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4403703683034890123
@@ -435,6 +429,10 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 5743451229161796048
                 },
+                "Component_[6575495009457126236]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 6575495009457126236
+                },
                 "Component_[6813315874512071748]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 6813315874512071748
@@ -470,9 +468,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 16300212154464470531,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -488,10 +488,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2355668156940730228
                 },
-                "Component_[2801111889414931848]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2801111889414931848
-                },
                 "Component_[4403703683034890123]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4403703683034890123
@@ -560,9 +556,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 10271136976310200923,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -587,6 +585,10 @@
                         }
                     }
                 },
+                "Component_[12545020046919826868]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 12545020046919826868
+                },
                 "Component_[17486590914851669702]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 17486590914851669702
@@ -595,10 +597,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2355668156940730228
                 },
-                "Component_[2801111889414931848]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2801111889414931848
-                },
                 "Component_[4403703683034890123]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4403703683034890123
@@ -654,9 +652,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 16300212154464470531,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -689,10 +689,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2355668156940730228
                 },
-                "Component_[2801111889414931848]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2801111889414931848
-                },
                 "Component_[4403703683034890123]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4403703683034890123
@@ -769,10 +765,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2355668156940730228
                 },
-                "Component_[2801111889414931848]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2801111889414931848
-                },
                 "Component_[4403703683034890123]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4403703683034890123
@@ -839,9 +831,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 9011838012457954872,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -865,9 +859,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 17487900436023939565,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -881,10 +877,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2355668156940730228
                 },
-                "Component_[2801111889414931848]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2801111889414931848
-                },
                 "Component_[4403703683034890123]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 4403703683034890123
@@ -905,6 +897,10 @@
                         ]
                     }
                 },
+                "Component_[5278210653403985606]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 5278210653403985606
+                },
                 "Component_[5743451229161796048]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 5743451229161796048

AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/RigidBody_AngularDampingAffectsRotation.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -148,10 +140,6 @@
                         }
                     ]
                 },
-                "Component_[14532080444774604174]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14532080444774604174
-                },
                 "Component_[15460193905310649551]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 15460193905310649551
@@ -219,10 +207,6 @@
                         ]
                     }
                 },
-                "Component_[10591944275956345455]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10591944275956345455
-                },
                 "Component_[1149538037597439289]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 1149538037597439289
@@ -237,9 +221,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -263,6 +249,10 @@
                     "$type": "EditorLockComponent",
                     "Id": 18007512079132112583
                 },
+                "Component_[2408464323461693031]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 2408464323461693031
+                },
                 "Component_[3013370522614808895]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3013370522614808895
@@ -324,10 +314,6 @@
                         ]
                     }
                 },
-                "Component_[10591944275956345455]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10591944275956345455
-                },
                 "Component_[1149538037597439289]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 1149538037597439289
@@ -342,9 +328,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -400,6 +388,10 @@
                             "SortIndex": 2
                         }
                     ]
+                },
+                "Component_[9753463628623177388]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 9753463628623177388
                 }
             }
         },
@@ -419,10 +411,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 13208852873506236611
                 },
-                "Component_[13222097061619369926]": {
-                    "$type": "SelectionComponent",
-                    "Id": 13222097061619369926
-                },
                 "Component_[14812140231390143898]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 14812140231390143898
@@ -449,9 +437,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 16066027089711095181,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -558,10 +548,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 13208852873506236611
                 },
-                "Component_[13222097061619369926]": {
-                    "$type": "SelectionComponent",
-                    "Id": 13222097061619369926
-                },
                 "Component_[14812140231390143898]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 14812140231390143898
@@ -588,9 +574,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 16066027089711095181,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -697,10 +685,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 13208852873506236611
                 },
-                "Component_[13222097061619369926]": {
-                    "$type": "SelectionComponent",
-                    "Id": 13222097061619369926
-                },
                 "Component_[14812140231390143898]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 14812140231390143898
@@ -727,9 +711,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 16066027089711095181,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -846,10 +832,6 @@
                         ]
                     }
                 },
-                "Component_[10591944275956345455]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10591944275956345455
-                },
                 "Component_[1149538037597439289]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 1149538037597439289
@@ -858,15 +840,21 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 15964844323015613661
                 },
+                "Component_[16686658831696409071]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 16686658831696409071
+                },
                 "Component_[17282705340948180667]": {
                     "$type": "EditorColliderComponent",
                     "Id": 17282705340948180667,
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -946,10 +934,6 @@
                         ]
                     }
                 },
-                "Component_[10591944275956345455]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10591944275956345455
-                },
                 "Component_[1149538037597439289]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 1149538037597439289
@@ -964,9 +948,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -994,6 +980,10 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3013370522614808895
                 },
+                "Component_[3932881930085784751]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3932881930085784751
+                },
                 "Component_[5534018830273953734]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 5534018830273953734
@@ -1046,10 +1036,6 @@
                         ]
                     }
                 },
-                "Component_[10591944275956345455]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10591944275956345455
-                },
                 "Component_[1149538037597439289]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 1149538037597439289
@@ -1064,9 +1050,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1102,6 +1090,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 6131237205847493259
                 },
+                "Component_[865997925272758608]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 865997925272758608
+                },
                 "Component_[9434410003036206430]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 9434410003036206430
@@ -1151,10 +1143,6 @@
                         ]
                     }
                 },
-                "Component_[10591944275956345455]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10591944275956345455
-                },
                 "Component_[1149538037597439289]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 1149538037597439289
@@ -1169,9 +1157,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -1199,6 +1189,10 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3013370522614808895
                 },
+                "Component_[3227657461315542851]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3227657461315542851
+                },
                 "Component_[5534018830273953734]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 5534018830273953734

AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/RigidBody_InitialAngularVelocity.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -162,9 +154,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 12951355599267579564,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -219,10 +213,6 @@
                     "$type": "EditorLockComponent",
                     "Id": 2831691161233173832
                 },
-                "Component_[4665167481611369785]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4665167481611369785
-                },
                 "Component_[4970361985768575813]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 4970361985768575813,
@@ -266,10 +256,6 @@
                         }
                     ]
                 },
-                "Component_[10331925645927272359]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10331925645927272359
-                },
                 "Component_[10596250505207393570]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 10596250505207393570
@@ -282,6 +268,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 408871196476742770
                 },
+                "Component_[4240380267615554668]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4240380267615554668
+                },
                 "Component_[4725557049047311832]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 4725557049047311832
@@ -301,9 +291,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/RigidBody_InitialLinearVelocity.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -67,10 +63,6 @@
                         ]
                     }
                 },
-                "Component_[11276642112795332830]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11276642112795332830
-                },
                 "Component_[11716281764184623533]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 11716281764184623533
@@ -106,9 +98,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -118,6 +112,10 @@
                         }
                     ]
                 },
+                "Component_[216819592811779490]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 216819592811779490
+                },
                 "Component_[3302118507919839154]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 3302118507919839154
@@ -200,10 +198,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 3582225014418902287
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -234,10 +228,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 2280595334114802403
                 },
-                "Component_[3002168776546645566]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3002168776546645566
-                },
                 "Component_[3030257996947907887]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 3030257996947907887,
@@ -306,9 +296,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 9159776008985726394,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/RigidBody_LinearDampingAffectsMotion.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -90,9 +86,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -126,6 +124,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 17106484645172612912
                 },
+                "Component_[17543558456555778346]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17543558456555778346
+                },
                 "Component_[17708193097712213074]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 17708193097712213074,
@@ -160,10 +162,6 @@
                 "Component_[7566595799749134094]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 7566595799749134094
-                },
-                "Component_[8818011697750170772]": {
-                    "$type": "SelectionComponent",
-                    "Id": 8818011697750170772
                 }
             }
         },
@@ -212,10 +210,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -259,10 +253,6 @@
                         }
                     ]
                 },
-                "Component_[14532080444774604174]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14532080444774604174
-                },
                 "Component_[15460193905310649551]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 15460193905310649551
@@ -333,6 +323,10 @@
                         }
                     ]
                 },
+                "Component_[14125570464837926705]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 14125570464837926705
+                },
                 "Component_[15251041960189410484]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 15251041960189410484
@@ -343,9 +337,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -413,10 +409,6 @@
                 "Component_[7566595799749134094]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 7566595799749134094
-                },
-                "Component_[8818011697750170772]": {
-                    "$type": "SelectionComponent",
-                    "Id": 8818011697750170772
                 }
             }
         },
@@ -459,9 +451,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -518,6 +512,10 @@
                         "UniformScale": 3.0
                     }
                 },
+                "Component_[17840053283255387968]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17840053283255387968
+                },
                 "Component_[4252376017882677834]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 4252376017882677834
@@ -529,10 +527,6 @@
                 "Component_[7566595799749134094]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 7566595799749134094
-                },
-                "Component_[8818011697750170772]": {
-                    "$type": "SelectionComponent",
-                    "Id": 8818011697750170772
                 }
             }
         },
@@ -552,10 +546,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 13208852873506236611
                 },
-                "Component_[13222097061619369926]": {
-                    "$type": "SelectionComponent",
-                    "Id": 13222097061619369926
-                },
                 "Component_[14812140231390143898]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 14812140231390143898
@@ -581,9 +571,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 16066027089711095181,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/RigidBody_MassDifferentValuesWorks.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -59,9 +55,9 @@
                     "$type": "EditorLockComponent",
                     "Id": 10185161546517584499
                 },
-                "Component_[10536030598467430649]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10536030598467430649
+                "Component_[1032130510390196713]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 1032130510390196713
                 },
                 "Component_[12335834086104166461]": {
                     "$type": "EditorInspectorComponent",
@@ -103,9 +99,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -159,19 +157,17 @@
                     "$type": "EditorLockComponent",
                     "Id": 10185161546517584499
                 },
-                "Component_[10536030598467430649]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10536030598467430649
-                },
                 "Component_[11676612620968322981]": {
                     "$type": "EditorColliderComponent",
                     "Id": 11676612620968322981,
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -237,6 +233,10 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 5816541080168941300
                 },
+                "Component_[6418352395209967460]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 6418352395209967460
+                },
                 "Component_[7151267576376688961]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 7151267576376688961
@@ -296,10 +296,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -347,10 +343,6 @@
                         ]
                     }
                 },
-                "Component_[14750018756059242159]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14750018756059242159
-                },
                 "Component_[15504055482504256662]": {
                     "$type": "EditorLockComponent",
                     "Id": 15504055482504256662
@@ -405,9 +397,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 17085632993552713258,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -423,10 +417,6 @@
                     "$type": "EditorVisibilityComponent",
                     "Id": 2646422733150336382
                 },
-                "Component_[3080683692678717260]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3080683692678717260
-                },
                 "Component_[3099655263685875895]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 3099655263685875895,
@@ -551,9 +541,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 4585016080616893121,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -561,10 +553,6 @@
                         "ShapeType": 0
                     }
                 },
-                "Component_[7786508561410024741]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7786508561410024741
-                },
                 "Component_[9676896356615942129]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 9676896356615942129
@@ -579,19 +567,17 @@
                     "$type": "EditorLockComponent",
                     "Id": 10185161546517584499
                 },
-                "Component_[10536030598467430649]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10536030598467430649
-                },
                 "Component_[12113475241723976949]": {
                     "$type": "EditorColliderComponent",
                     "Id": 12113475241723976949,
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -665,6 +651,10 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 809396532358010893
                 },
+                "Component_[8916876439994997474]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 8916876439994997474
+                },
                 "Component_[9090651604957931210]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 9090651604957931210

AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/RigidBody_MomentOfInertiaManualSetting.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -92,10 +88,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -155,12 +147,17 @@
                             0.25
                         ],
                         "Compute inertia": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10000.0
-                        }
+                        "Inertia tensor": [
+                            10000.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10000.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10000.0
+                        ]
                     }
                 },
                 "Component_[2967603762597971538]": {
@@ -181,10 +178,6 @@
                         "UniformScale": 2.0
                     }
                 },
-                "Component_[4206850997686106107]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4206850997686106107
-                },
                 "Component_[5392686469694720113]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 5392686469694720113
@@ -210,9 +203,11 @@
                             0.0,
                             0.125
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -258,13 +253,19 @@
                         }
                     }
                 },
+                "Component_[18051671306501498215]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 18051671306501498215
+                },
                 "Component_[2757154626874696767]": {
                     "$type": "EditorShapeColliderComponent",
                     "Id": 2757154626874696767,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -316,10 +317,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 7778583323115120252
                 },
-                "Component_[7845429639411639216]": {
-                    "$type": "SelectionComponent",
-                    "Id": 7845429639411639216
-                },
                 "Component_[8828005644065248266]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 8828005644065248266
@@ -374,12 +371,17 @@
                             0.0,
                             0.25
                         ],
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 1.5
-                        }
+                        "Inertia tensor": [
+                            1.5,
+                            0.0,
+                            0.0,
+                            0.0,
+                            1.5,
+                            0.0,
+                            0.0,
+                            0.0,
+                            1.5
+                        ]
                     }
                 },
                 "Component_[2967603762597971538]": {
@@ -400,10 +402,6 @@
                         "UniformScale": 2.0
                     }
                 },
-                "Component_[4206850997686106107]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4206850997686106107
-                },
                 "Component_[5392686469694720113]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 5392686469694720113
@@ -429,9 +427,11 @@
                             0.0,
                             0.125
                         ],
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/RigidBody_SetGravityWorks.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -92,10 +88,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[8765166714670902929]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 8765166714670902929
@@ -159,10 +151,6 @@
                         }
                     ]
                 },
-                "Component_[18150567164506774936]": {
-                    "$type": "SelectionComponent",
-                    "Id": 18150567164506774936
-                },
                 "Component_[2159294230913654042]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 2159294230913654042,
@@ -176,6 +164,10 @@
                         }
                     }
                 },
+                "Component_[4066838027017049128]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4066838027017049128
+                },
                 "Component_[4764495813565133776]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4764495813565133776
@@ -188,9 +180,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 5289109873564300682,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -234,12 +228,17 @@
                         "entityId": "",
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
                 "Component_[14736140193451661185]": {
@@ -267,9 +266,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 14778207592594232488,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -301,10 +302,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 17875611294493709075
                 },
-                "Component_[18125885518139477388]": {
-                    "$type": "SelectionComponent",
-                    "Id": 18125885518139477388
-                },
                 "Component_[9048247752809714523]": {
                     "$type": "EditorLockComponent",
                     "Id": 9048247752809714523

AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/RigidBody_SleepWhenBelowKineticThreshold.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -106,9 +102,9 @@
                         }
                     }
                 },
-                "Component_[17440085855360858421]": {
-                    "$type": "SelectionComponent",
-                    "Id": 17440085855360858421
+                "Component_[1684788451027628478]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 1684788451027628478
                 },
                 "Component_[17710225643410447498]": {
                     "$type": "EditorPendingCompositionComponent",
@@ -128,9 +124,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -171,6 +169,10 @@
                         ]
                     }
                 },
+                "Component_[1216961199732943312]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 1216961199732943312
+                },
                 "Component_[13705595800936724303]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 13705595800936724303
@@ -210,10 +212,6 @@
                         }
                     }
                 },
-                "Component_[17440085855360858421]": {
-                    "$type": "SelectionComponent",
-                    "Id": 17440085855360858421
-                },
                 "Component_[17710225643410447498]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 17710225643410447498
@@ -232,9 +230,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -300,10 +300,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[8632259647013426420]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 8632259647013426420
@@ -342,10 +338,6 @@
                         ]
                     }
                 },
-                "Component_[14578073896948839034]": {
-                    "$type": "SelectionComponent",
-                    "Id": 14578073896948839034
-                },
                 "Component_[15267743821294241076]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 15267743821294241076
@@ -393,9 +385,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 11064482613129484744,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -466,10 +460,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 8067047277662259991
                 },
-                "Component_[8204947769676427228]": {
-                    "$type": "SelectionComponent",
-                    "Id": 8204947769676427228
-                },
                 "Component_[9669700246250139094]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9669700246250139094,
@@ -550,17 +540,15 @@
                         }
                     ]
                 },
-                "Component_[15265885789909818889]": {
-                    "$type": "SelectionComponent",
-                    "Id": 15265885789909818889
-                },
                 "Component_[15549955898409156745]": {
                     "$type": "EditorColliderComponent",
                     "Id": 15549955898409156745,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -637,9 +625,9 @@
                         }
                     }
                 },
-                "Component_[17440085855360858421]": {
-                    "$type": "SelectionComponent",
-                    "Id": 17440085855360858421
+                "Component_[17392513660787212856]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17392513660787212856
                 },
                 "Component_[17710225643410447498]": {
                     "$type": "EditorPendingCompositionComponent",
@@ -659,9 +647,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/RigidBody_StartGravityEnabledWorks.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -96,10 +92,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -118,10 +110,6 @@
             "Id": "Entity_[300968265444]",
             "Name": "RigidBody",
             "Components": {
-                "Component_[10467546351044882674]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10467546351044882674
-                },
                 "Component_[11751036250091821183]": {
                     "$type": "EditorLockComponent",
                     "Id": 11751036250091821183
@@ -175,9 +163,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 2171887721398116180,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -200,12 +190,17 @@
                         "entityId": "",
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
                 "Component_[8147019729551544296]": {
@@ -263,9 +258,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 16833171179654804716,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -301,14 +298,14 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 3901897916366081391
                 },
+                "Component_[4695027413274280856]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4695027413274280856
+                },
                 "Component_[8021136952219404015]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 8021136952219404015
                 },
-                "Component_[9206125947585620166]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9206125947585620166
-                },
                 "Component_[9523680483955538265]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 9523680483955538265

AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/ScriptCanvas_CollisionEvents.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -92,10 +88,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[9432950532896492451]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 9432950532896492451,
@@ -114,10 +106,6 @@
             "Id": "Entity_[334020569918]",
             "Name": "Begin Signal",
             "Components": {
-                "Component_[10086183393590052783]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10086183393590052783
-                },
                 "Component_[11212898224298393352]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11212898224298393352
@@ -177,10 +165,6 @@
                     "$type": "EditorLockComponent",
                     "Id": 12405124462018761521
                 },
-                "Component_[17303801290637898798]": {
-                    "$type": "SelectionComponent",
-                    "Id": 17303801290637898798
-                },
                 "Component_[17471919493216976961]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 17471919493216976961
@@ -252,10 +236,6 @@
                     "$type": "EditorLockComponent",
                     "Id": 17945696094944770262
                 },
-                "Component_[18325697466939096425]": {
-                    "$type": "SelectionComponent",
-                    "Id": 18325697466939096425
-                },
                 "Component_[3493262362913959097]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 3493262362913959097
@@ -333,9 +313,11 @@
                     "$type": "EditorShapeColliderComponent",
                     "Id": 14110900608286705866,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -350,6 +332,10 @@
                         }
                     ]
                 },
+                "Component_[283934156241595823]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 283934156241595823
+                },
                 "Component_[3148068961413705897]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 3148068961413705897
@@ -374,10 +360,6 @@
                         ]
                     }
                 },
-                "Component_[6089046069377098239]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6089046069377098239
-                },
                 "Component_[714241131360278670]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 714241131360278670
@@ -447,12 +429,17 @@
                     "Configuration": {
                         "entityId": "",
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 2.5
-                        }
+                        "Inertia tensor": [
+                            2.5,
+                            0.0,
+                            0.0,
+                            0.0,
+                            2.5,
+                            0.0,
+                            0.0,
+                            0.0,
+                            2.5
+                        ]
                     }
                 },
                 "Component_[17736810712679913703]": {
@@ -463,112 +450,113 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 2499566050349593055
                 },
-                "Component_[2556187931131992823]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2556187931131992823
-                },
                 "Component_[584441947048980638]": {
                     "$type": "EditorScriptCanvasComponent",
                     "Id": 584441947048980638,
-                    "m_name": "collision_events_script.scriptcanvas",
-                    "runtimeDataIsValid": true,
-                    "runtimeDataOverrides": {
-                        "source": {
+                    "configuration": {
+                        "sourceHandle": {
                             "id": "{80C6B26A-79AA-5734-B254-388DB32E2407}",
                             "path": "D:/Projects/o3de-dev/o3de/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas"
                         },
-                        "entityId": [
-                            [
-                                {
-                                    "m_id": "{79C630E7-2ED7-40E9-929D-6D88FC32ADD9}"
-                                },
-                                ""
+                        "propertyOverrides": {
+                            "source": {
+                                "id": "{80C6B26A-79AA-5734-B254-388DB32E2407}",
+                                "path": "D:/Projects/o3de-dev/o3de/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas"
+                            },
+                            "entityId": [
+                                [
+                                    {
+                                        "m_id": "{79C630E7-2ED7-40E9-929D-6D88FC32ADD9}"
+                                    },
+                                    ""
+                                ],
+                                [
+                                    {
+                                        "m_id": "{C802DF6D-82C4-4648-81AD-99DB01A03B3B}"
+                                    },
+                                    ""
+                                ],
+                                [
+                                    {
+                                        "m_id": "{F1E1AFD6-DCE6-4A1F-AF22-59F2B7B943CC}"
+                                    },
+                                    ""
+                                ]
                             ],
-                            [
+                            "overrides": [
                                 {
-                                    "m_id": "{C802DF6D-82C4-4648-81AD-99DB01A03B3B}"
+                                    "Datum": {
+                                        "isOverloadedStorage": false,
+                                        "scriptCanvasType": {
+                                            "m_type": 1
+                                        },
+                                        "isNullPointer": false,
+                                        "$type": "EntityId",
+                                        "value": "Entity_[338315537214]",
+                                        "label": "Persist Signal ID"
+                                    },
+                                    "InputControlVisibility": {
+                                        "Value": 850104567
+                                    },
+                                    "VariableId": {
+                                        "m_id": "{79C630E7-2ED7-40E9-929D-6D88FC32ADD9}"
+                                    },
+                                    "VariableName": "Persist Signal ID",
+                                    "InitialValueSource": 1
                                 },
-                                ""
-                            ],
-                            [
                                 {
-                                    "m_id": "{F1E1AFD6-DCE6-4A1F-AF22-59F2B7B943CC}"
-                                },
-                                ""
-                            ]
-                        ],
-                        "overrides": [
-                            {
-                                "Datum": {
-                                    "scriptCanvasType": {
-                                        "m_type": 1
+                                    "Datum": {
+                                        "isOverloadedStorage": false,
+                                        "scriptCanvasType": {
+                                            "m_type": 1
+                                        },
+                                        "isNullPointer": false,
+                                        "$type": "EntityId",
+                                        "value": "Entity_[342610504510]",
+                                        "label": "End Signal ID"
                                     },
-                                    "isNullPointer": false,
-                                    "$type": "EntityId",
-                                    "value": "Entity_[338315537214]",
-                                    "label": "Persist Signal ID"
-                                },
-                                "InputControlVisibility": {
-                                    "Value": 850104567
-                                },
-                                "VariableId": {
-                                    "m_id": "{79C630E7-2ED7-40E9-929D-6D88FC32ADD9}"
-                                },
-                                "VariableName": "Persist Signal ID",
-                                "InitialValueSource": 1
-                            },
-                            {
-                                "Datum": {
-                                    "scriptCanvasType": {
-                                        "m_type": 1
+                                    "InputControlVisibility": {
+                                        "Value": 850104567
                                     },
-                                    "isNullPointer": false,
-                                    "$type": "EntityId",
-                                    "value": "Entity_[342610504510]",
-                                    "label": "End Signal ID"
-                                },
-                                "InputControlVisibility": {
-                                    "Value": 850104567
-                                },
-                                "VariableId": {
-                                    "m_id": "{C802DF6D-82C4-4648-81AD-99DB01A03B3B}"
-                                },
-                                "VariableName": "End Signal ID",
-                                "InitialValueSource": 1
-                            },
-                            {
-                                "Datum": {
-                                    "scriptCanvasType": {
-                                        "m_type": 1
+                                    "VariableId": {
+                                        "m_id": "{C802DF6D-82C4-4648-81AD-99DB01A03B3B}"
                                     },
-                                    "isNullPointer": false,
-                                    "$type": "EntityId",
-                                    "value": "Entity_[334020569918]",
-                                    "label": "Begin Signal ID"
-                                },
-                                "InputControlVisibility": {
-                                    "Value": 850104567
+                                    "VariableName": "End Signal ID",
+                                    "InitialValueSource": 1
                                 },
-                                "VariableId": {
-                                    "m_id": "{F1E1AFD6-DCE6-4A1F-AF22-59F2B7B943CC}"
-                                },
-                                "VariableName": "Begin Signal ID",
-                                "InitialValueSource": 1
-                            }
-                        ]
-                    },
-                    "sourceHandle": {
-                        "id": "{80C6B26A-79AA-5734-B254-388DB32E2407}",
-                        "path": "D:/Projects/o3de-dev/o3de/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas"
+                                {
+                                    "Datum": {
+                                        "isOverloadedStorage": false,
+                                        "scriptCanvasType": {
+                                            "m_type": 1
+                                        },
+                                        "isNullPointer": false,
+                                        "$type": "EntityId",
+                                        "value": "Entity_[334020569918]",
+                                        "label": "Begin Signal ID"
+                                    },
+                                    "InputControlVisibility": {
+                                        "Value": 850104567
+                                    },
+                                    "VariableId": {
+                                        "m_id": "{F1E1AFD6-DCE6-4A1F-AF22-59F2B7B943CC}"
+                                    },
+                                    "VariableName": "Begin Signal ID",
+                                    "InitialValueSource": 1
+                                }
+                            ]
+                        }
                     }
                 },
                 "Component_[6003927233414867950]": {
                     "$type": "EditorColliderComponent",
                     "Id": 6003927233414867950,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/ScriptCanvas_PostPhysicsUpdate.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -55,14 +51,14 @@
             "Id": "Entity_[281305126238]",
             "Name": "ForceRegion",
             "Components": {
+                "Component_[10005778345231242227]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 10005778345231242227
+                },
                 "Component_[11067593639950420183]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11067593639950420183
                 },
-                "Component_[11296977532458138796]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11296977532458138796
-                },
                 "Component_[13263255503400547953]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 13263255503400547953,
@@ -137,9 +133,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -175,22 +173,18 @@
                 "Component_[11388627947025080736]": {
                     "$type": "EditorScriptCanvasComponent",
                     "Id": 11388627947025080736,
-                    "m_name": "ontick",
-                    "runtimeDataIsValid": true,
-                    "runtimeDataOverrides": {
-                        "source": {
-                            "id": "{129013F1-8514-5A07-AD83-EC85BD0DA57C}"
+                    "configuration": {
+                        "sourceHandle": {
+                            "id": "{129013F1-8514-5A07-AD83-EC85BD0DA57C}",
+                            "path": "levels/physics/scriptcanvas_postphysicsupdate/ontick.scriptcanvas"
+                        },
+                        "propertyOverrides": {
+                            "source": {
+                                "id": "{129013F1-8514-5A07-AD83-EC85BD0DA57C}"
+                            }
                         }
-                    },
-                    "sourceHandle": {
-                        "id": "{129013F1-8514-5A07-AD83-EC85BD0DA57C}",
-                        "path": "levels/physics/scriptcanvas_postphysicsupdate/ontick.scriptcanvas"
                     }
                 },
-                "Component_[12926460860226400954]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12926460860226400954
-                },
                 "Component_[13099430927808761140]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 13099430927808761140
@@ -210,27 +204,32 @@
                         "entityId": "",
                         "Gravity Enabled": false,
                         "Compute Mass": false,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 10.0
-                        }
+                        "Inertia tensor": [
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0,
+                            0.0,
+                            0.0,
+                            0.0,
+                            10.0
+                        ]
                     }
                 },
                 "Component_[16662689546275335159]": {
                     "$type": "EditorScriptCanvasComponent",
                     "Id": 16662689546275335159,
-                    "m_name": "onpostphysicsupdate",
-                    "runtimeDataIsValid": true,
-                    "runtimeDataOverrides": {
-                        "source": {
-                            "id": "{36AE9162-BCBE-59B3-9A43-ABFCCA150B78}"
+                    "configuration": {
+                        "sourceHandle": {
+                            "id": "{36AE9162-BCBE-59B3-9A43-ABFCCA150B78}",
+                            "path": "levels/physics/scriptcanvas_postphysicsupdate/onpostphysicsupdate.scriptcanvas"
+                        },
+                        "propertyOverrides": {
+                            "source": {
+                                "id": "{36AE9162-BCBE-59B3-9A43-ABFCCA150B78}"
+                            }
                         }
-                    },
-                    "sourceHandle": {
-                        "id": "{36AE9162-BCBE-59B3-9A43-ABFCCA150B78}",
-                        "path": "levels/physics/scriptcanvas_postphysicsupdate/onpostphysicsupdate.scriptcanvas"
                     }
                 },
                 "Component_[2476622826402871625]": {
@@ -274,9 +273,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 5790409583652412480,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },

AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/ScriptCanvas_SpawnEntityWithPhysComponents.prefab

@@ -37,10 +37,6 @@
                 "$type": "EditorEntityIconComponent",
                 "Id": 5688118765544765547
             },
-            "Component_[6545738857812235305]": {
-                "$type": "SelectionComponent",
-                "Id": 6545738857812235305
-            },
             "Component_[7247035804068349658]": {
                 "$type": "EditorPrefabComponent",
                 "Id": 7247035804068349658
@@ -73,10 +69,6 @@
                         }
                     }
                 },
-                "Component_[11701138785793981042]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11701138785793981042
-                },
                 "Component_[12260880513256986252]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 12260880513256986252
@@ -91,11 +83,6 @@
                                     "Name": "Entire object"
                                 }
                             ]
-                        },
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
-                            ]
                         }
                     },
                     "ShapeConfiguration": {
@@ -147,6 +134,10 @@
                         }
                     }
                 },
+                "Component_[3741021495640157955]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3741021495640157955
+                },
                 "Component_[5681893399601237518]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 5681893399601237518
@@ -169,10 +160,6 @@
             "Id": "Entity_[3721848391988]",
             "Name": "Spawn_Point",
             "Components": {
-                "Component_[10012298246375265627]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10012298246375265627
-                },
                 "Component_[10841247711583713947]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 10841247711583713947

AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/ScriptCanvas_TriggerEvents.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -55,10 +51,6 @@
             "Id": "Entity_[279454450788]",
             "Name": "Box",
             "Components": {
-                "Component_[10349274502019720655]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10349274502019720655
-                },
                 "Component_[10909557756965435232]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 10909557756965435232
@@ -88,6 +80,10 @@
                         }
                     ]
                 },
+                "Component_[15669826384274097496]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 15669826384274097496
+                },
                 "Component_[18213634137398041457]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 18213634137398041457,
@@ -106,9 +102,11 @@
                     "ColliderConfiguration": {
                         "Trigger": true,
                         "InSceneQueries": false,
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -135,16 +133,16 @@
                 "Component_[814892852661066937]": {
                     "$type": "EditorScriptCanvasComponent",
                     "Id": 814892852661066937,
-                    "m_name": "ScriptCanvasBox",
-                    "runtimeDataIsValid": true,
-                    "runtimeDataOverrides": {
-                        "source": {
-                            "id": "{374FA4D5-6167-56A8-BC77-04D5F71C3ED2}"
+                    "configuration": {
+                        "sourceHandle": {
+                            "id": "{374FA4D5-6167-56A8-BC77-04D5F71C3ED2}",
+                            "path": "scriptcanvas/scriptcanvasbox.scriptcanvas"
+                        },
+                        "propertyOverrides": {
+                            "source": {
+                                "id": "{374FA4D5-6167-56A8-BC77-04D5F71C3ED2}"
+                            }
                         }
-                    },
-                    "sourceHandle": {
-                        "id": "{374FA4D5-6167-56A8-BC77-04D5F71C3ED2}",
-                        "path": "scriptcanvas/scriptcanvasbox.scriptcanvas"
                     }
                 }
             }
@@ -173,9 +171,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 16210676658230708095,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -183,10 +183,6 @@
                         "ShapeType": 0
                     }
                 },
-                "Component_[16690187173417031376]": {
-                    "$type": "SelectionComponent",
-                    "Id": 16690187173417031376
-                },
                 "Component_[17183713697901649461]": {
                     "$type": "EditorLockComponent",
                     "Id": 17183713697901649461

AutomatedTesting/Levels/Prefab/PrefabLevel_OpensLevelWithEntities/PrefabLevel_OpensLevelWithEntities.prefab

@@ -64,6 +64,10 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11161653124805884473
                 },
+                "Component_[11880342253837797716]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 11880342253837797716
+                },
                 "Component_[13116773315299882093]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 13116773315299882093

AutomatedTesting/Levels/Prefab/QuitOnSuccessfulSpawn/QuitOnSuccessfulSpawn.prefab

@@ -209,6 +209,10 @@
                     "$type": "EditorLockComponent",
                     "Id": 7090012899106946164
                 },
+                "Component_[9063502120995369413]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 9063502120995369413
+                },
                 "Component_[9410832619875640998]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 9410832619875640998

AutomatedTesting/Levels/TestLevel/TestLevel.prefab

@@ -146,6 +146,10 @@
                     "$type": "EditorInspectorComponent",
                     "Id": 16919232076966545697
                 },
+                "Component_[17323933878488717651]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17323933878488717651
+                },
                 "Component_[5182430712893438093]": {
                     "$type": "EditorMaterialComponent",
                     "Id": 5182430712893438093

AutomatedTesting/Levels/Utils/Tracer_ErrorEntity/Tracer_ErrorEntity.prefab

@@ -43,10 +43,6 @@
             "Component_[8018146290632383969]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 8018146290632383969
-            },
-            "Component_[8452360690590857075]": {
-                "$type": "SelectionComponent",
-                "Id": 8452360690590857075
             }
         }
     },
@@ -88,10 +84,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 17982257912988768282
                 },
-                "Component_[5540118842216992104]": {
-                    "$type": "SelectionComponent",
-                    "Id": 5540118842216992104
-                },
                 "Component_[6131282612213913817]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 6131282612213913817
@@ -100,9 +92,11 @@
                     "$type": "EditorColliderComponent",
                     "Id": 7666850511170058566,
                     "ColliderConfiguration": {
-                        "MaterialSelection": {
-                            "MaterialIds": [
-                                {}
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object"
+                                }
                             ]
                         }
                     },
@@ -132,6 +126,10 @@
                 "Component_[9055996217752214834]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 9055996217752214834
+                },
+                "Component_[9469942922917322012]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 9469942922917322012
                 }
             }
         },
@@ -176,10 +174,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 3047355939801335922
                 },
-                "Component_[3687396159953003426]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3687396159953003426
-                },
                 "Component_[7505662882395796332]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 7505662882395796332

Code/Editor/GameEngine.cpp

@@ -34,7 +34,6 @@
 #include "Settings.h"
 
 // CryCommon
-#include <CryCommon/INavigationSystem.h>
 #include <CryCommon/MainThreadRenderRequestBus.h>
 
 // Editor
@@ -830,13 +829,8 @@ void CGameEngine::OnEditorNotifyEvent(EEditorNotifyEvent event)
     }
 }
 
-void CGameEngine::OnAreaModified(const AABB& modifiedArea)
+void CGameEngine::OnAreaModified([[maybe_unused]] const AABB& modifiedArea)
 {
-    INavigationSystem* pNavigationSystem = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-    if (pNavigationSystem)
-    {
-        pNavigationSystem->WorldChanged(modifiedArea);
-    }
 }
 
 void CGameEngine::ExecuteQueuedEvents()

Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp

@@ -1119,18 +1119,24 @@ bool SandboxIntegrationManager::CanGoToSelectedEntitiesInViewports()
 
 bool SandboxIntegrationManager::CanGoToEntityOrChildren(const AZ::EntityId& entityId) const
 {
+    AZ::Entity* entity = nullptr;
+    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, entityId);
+    if (entity == nullptr)
+    {
+        return false;
+    }
+
+    // If this is a layer entity, check if the layer has any children that are visible in the viewport
     bool isLayerEntity = false;
     AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
         isLayerEntity,
         entityId,
         &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::HasLayer);
-    // If this entity is not a layer
     if (!isLayerEntity)
     {
-        // check if the entity exists to determine if we can go to it (e.g. system & internal entities are not visible in the viewport)
-        AZ::Entity* entity = nullptr;
-        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, entityId);
-        return entity != nullptr;
+        // Skip if this entity doesn't have a transform;
+        // UI entities and system components don't have transforms and thus aren't visible in the Editor viewport
+        return entity->GetTransform() != nullptr;
     }
 
     AZStd::vector<AZ::EntityId> layerChildren;

Code/Framework/AzFramework/AzFramework/Physics/RagdollPhysicsBus.h

@@ -17,7 +17,7 @@ namespace Physics
     enum class SimulationType
     {
         Kinematic, ///< For ragdoll nodes controlled directly by animation.
-        Dynamic ///< For ragdoll nodes driven by the physics simulation.
+        Simulated ///< For ragdoll nodes driven by the physics simulation.
     };
 
     /// Contains pose and velocity information, simulation type and joint strength properties for a node in the ragdoll

Code/Framework/AzFramework/AzFramework/Physics/RigidBodyBus.h

@@ -9,6 +9,8 @@
 #pragma once
 
 #include <AzCore/Component/ComponentBus.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Component/Entity.h>
 #include <AzCore/Math/Aabb.h>
 #include <AzCore/Math/Vector3.h>
 #include <AzFramework/Physics/Common/PhysicsSceneQueries.h>
@@ -20,7 +22,7 @@ namespace AzPhysics
 
 namespace Physics
 {
-
+    //! Requests interface for a rigid body (static or dynamic).
     class RigidBodyRequests
         : public AZ::ComponentBus
     {
@@ -79,13 +81,66 @@ namespace Physics
 
     using RigidBodyRequestBus = AZ::EBus<RigidBodyRequests>;
 
-
+    //! Notifications interface for a rigid body (static or dynamic).
     class RigidBodyNotifications
         : public AZ::ComponentBus
     {
+    private:
+        template<class Bus>
+        struct RigidBodyNotificationsConnectionPolicy : public AZ::EBusConnectionPolicy<Bus>
+        {
+            static void Connect(
+                typename Bus::BusPtr& busPtr,
+                typename Bus::Context& context,
+                typename Bus::HandlerNode& handler,
+                typename Bus::Context::ConnectLockGuard& connectLock,
+                const typename Bus::BusIdType& id = 0)
+            {
+                AZ::EBusConnectionPolicy<Bus>::Connect(busPtr, context, handler, connectLock, id);
+
+                AZ::Entity* entity = nullptr;
+                AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, id);
+                if (entity)
+                {
+                    // Only immediately dispatch if the entity is already active, otherwise when
+                    // entity will get activated it will make the notifications itself.
+                    const AZ::Entity::State entityState = entity->GetState();
+                    if (entityState == AZ::Entity::State::Active)
+                    {
+                        // Only immediately dispatch if the entity is a RigidBodyRequestBus' handler.
+                        RigidBodyRequestBus::EnumerateHandlersId(
+                            id,
+                            [&handler, id](const RigidBodyRequests* rigidBodyhandler)
+                            {
+                                if (rigidBodyhandler->IsPhysicsEnabled())
+                                {
+                                    handler->OnPhysicsEnabled(id);
+                                }
+                                else
+                                {
+                                    handler->OnPhysicsDisabled(id);
+                                }
+                                return true;
+                            });
+                    }
+                }
+            }
+        };
+
     public:
-        virtual void OnPhysicsEnabled() = 0;
-        virtual void OnPhysicsDisabled() = 0;
+        //! With this connection policy, RigidBodyNotifications::OnPhysicsEnabled and
+        //! RigidBodyNotifications::OnPhysicsDisabled events will be immediately
+        //! dispatched when a handler connects to the bus.
+        template<class Bus>
+        using ConnectionPolicy = RigidBodyNotificationsConnectionPolicy<Bus>;
+
+        virtual void OnPhysicsEnabled([[maybe_unused]] const AZ::EntityId& entityId)
+        {
+        }
+
+        virtual void OnPhysicsDisabled([[maybe_unused]] const AZ::EntityId& entityId)
+        {
+        }
     };
 
     using RigidBodyNotificationBus = AZ::EBus<RigidBodyNotifications>;

Code/Framework/AzFramework/AzFramework/Visibility/BoundsBus.h

@@ -78,6 +78,11 @@ namespace AzFramework
         }
 
         AZ::TransformInterface* transformInterface = entity->GetTransform();
+        if (!transformInterface)
+        {
+            return AZ::Aabb::CreateNull();
+        }
+
         const AZ::Vector3 worldTranslation = transformInterface->GetWorldTranslation();
         return AZ::Aabb::CreateCenterHalfExtents(worldTranslation, AZ::Vector3(0.5f));
     }

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp

@@ -1533,15 +1533,15 @@ namespace AzToolsFramework
             AZ_PROFILE_FUNCTION(AzToolsFramework);
 
             {
-                AZ_PROFILE_SCOPE(AzToolsFramework, "Internal::DetachPrefab:UndoCapture");
+                AZ_PROFILE_SCOPE(AzToolsFramework, "Internal::DetachPrefab::UndoCapture");
 
                 ScopedUndoBatch undoBatch("Detach Prefab");
 
                 InstanceOptionalReference getParentInstanceResult = owningInstance->get().GetParentInstance();
                 AZ_Assert(getParentInstanceResult.has_value(), "Can't get parent Instance from Instance of given container entity.");
 
-                auto& parentInstance = getParentInstanceResult->get();
-                const auto parentTemplateId = parentInstance.GetTemplateId();
+                Instance& parentInstance = getParentInstanceResult->get();
+                const TemplateId parentTemplateId = parentInstance.GetTemplateId();
 
                 // Block detaching prefab as override since it is not supported.
                 if (!m_prefabFocusHandler.IsOwningPrefabBeingFocused(parentInstance.GetContainerEntityId()))
@@ -1550,84 +1550,90 @@ namespace AzToolsFramework
                         "To perform a prefab edit, please first enter Prefab Edit Mode on the direct owning prefab."));
                 }
 
+                // Get parent entity and generate a DOM before we modify its children
+                AZ::Entity* parentEntity = nullptr;
                 {
-                    auto instancePtr = parentInstance.DetachNestedInstance(owningInstance->get().GetInstanceAlias());
-                    AZ_Assert(instancePtr, "Can't detach selected Instance from its parent Instance.");
-
-                    RemoveLink(instancePtr, parentTemplateId, undoBatch.GetUndoBatch());
-
-                    Prefab::PrefabDom instanceDomBefore;
-                    m_instanceToTemplateInterface->GenerateInstanceDomBySerializing(instanceDomBefore, parentInstance);
-
-                    AZStd::unordered_map<AZ::EntityId, AZStd::string> oldEntityAliases;
-                    oldEntityAliases.emplace(containerEntityId, instancePtr->GetEntityAlias(containerEntityId)->get());
-
-                    auto containerEntityPtr = instancePtr->DetachContainerEntity();
-                    auto& containerEntity = *containerEntityPtr.release();
-                    auto editorPrefabComponent = containerEntity.FindComponent<EditorPrefabComponent>();
-                    containerEntity.Deactivate();
-                    [[maybe_unused]] const bool editorPrefabComponentRemoved = containerEntity.RemoveComponent(editorPrefabComponent);
-                    AZ_Assert(editorPrefabComponentRemoved, "Remove EditorPrefabComponent failed.");
-                    delete editorPrefabComponent;
-                    containerEntity.Activate();
-
-                    [[maybe_unused]] const bool containerEntityAdded = parentInstance.AddEntity(containerEntity);
-                    AZ_Assert(containerEntityAdded, "Add target Instance's container entity to its parent Instance failed.");
-
-                    EntityIdList entityIds;
-                    entityIds.emplace_back(containerEntity.GetId());
-
-                    instancePtr->GetEntities(
-                        [&](AZStd::unique_ptr<AZ::Entity>& entityPtr)
-                    {
-                        oldEntityAliases.emplace(entityPtr->GetId(), instancePtr->GetEntityAlias(entityPtr->GetId())->get());
-                        return true;
-                    });
-
-                    instancePtr->DetachEntities(
-                        [&](AZStd::unique_ptr<AZ::Entity> entityPtr)
-                    {
-                        auto& entity = *entityPtr.release();
-                        [[maybe_unused]] const bool entityAdded = parentInstance.AddEntity(entity);
-                        AZ_Assert(entityAdded, "Add target Instance's entity to its parent Instance failed.");
-
-                        entityIds.emplace_back(entity.GetId());
-                    });
-
-                    Prefab::PrefabDom instanceDomAfter;
-                    m_instanceToTemplateInterface->GenerateInstanceDomBySerializing(instanceDomAfter, parentInstance);
-
-                    PrefabUndoInstance* command = aznew PrefabUndoInstance("Instance detachment");
-                    command->Capture(instanceDomBefore, instanceDomAfter, parentTemplateId);
-                    command->SetParent(undoBatch.GetUndoBatch());
-                    {
-                        AZ_PROFILE_SCOPE(AzToolsFramework, "Internal::DetachPrefab:RunRedo");
-                        command->Redo();
-                    }
-
-                    instancePtr->DetachNestedInstances(
-                        [&](AZStd::unique_ptr<Instance> detachedNestedInstance)
+                    AZ::EntityId parentEntityId;
+                    AZ::TransformBus::EventResult(parentEntityId, containerEntityId, &AZ::TransformBus::Events::GetParentId);
+                    parentEntity = GetEntityById(parentEntityId);
+                }
+                AZ_Assert(parentEntity, "Can't get the parent entity of the detached prefab instance.");
+
+                PrefabDom parentEntityDomBefore;
+                m_instanceToTemplateInterface->GenerateEntityDomBySerializing(parentEntityDomBefore, *parentEntity);
+
+                // Detach the prefab instance and remove the link
+                AZStd::unique_ptr<Instance> detachedInstance =
+                    parentInstance.DetachNestedInstance(owningInstance->get().GetInstanceAlias());
+                AZ_Assert(detachedInstance, "Can't detach selected Instance from its parent Instance.");
+
+                RemoveLink(detachedInstance, parentTemplateId, undoBatch.GetUndoBatch());
+
+                // Detach container entity from the detached instance
+                AZStd::unique_ptr<AZ::Entity> containerEntityPtr = detachedInstance->DetachContainerEntity();
+                AZ::Entity& containerEntity = *containerEntityPtr.release();
+                EditorPrefabComponent* editorPrefabComponent = containerEntity.FindComponent<EditorPrefabComponent>();
+                containerEntity.Deactivate();
+                [[maybe_unused]] const bool editorPrefabComponentRemoved = containerEntity.RemoveComponent(editorPrefabComponent);
+                AZ_Assert(editorPrefabComponentRemoved, "Remove EditorPrefabComponent failed.");
+                delete editorPrefabComponent;
+                containerEntity.Activate();
+
+                // Add the container entity to parent instance and add it to list so that we can update it in template as well.
+                [[maybe_unused]] const bool containerEntityAdded = parentInstance.AddEntity(containerEntity);
+                AZ_Assert(containerEntityAdded, "Add target Instance's container entity to its parent Instance failed.");
+
+                AZStd::vector<const AZ::Entity*> detachedEntitiesToUpdate;
+                detachedEntitiesToUpdate.push_back(&containerEntity);
+
+                // Detach nested instances and add them to the parent instance
+                detachedInstance->DetachNestedInstances(
+                    [&](AZStd::unique_ptr<Instance> detachedNestedInstance)
                     {
                         PrefabDom& nestedInstanceTemplateDom =
                             m_prefabSystemComponentInterface->FindTemplateDom(detachedNestedInstance->GetTemplateId());
 
                         Instance& nestedInstanceUnderNewParent = parentInstance.AddInstance(AZStd::move(detachedNestedInstance));
-                        
+
                         PrefabDom nestedInstanceDomUnderNewParent;
                         m_instanceToTemplateInterface->GenerateInstanceDomBySerializing(
                             nestedInstanceDomUnderNewParent, nestedInstanceUnderNewParent);
+
+                        nestedInstanceDomUnderNewParent.RemoveMember(PrefabDomUtils::LinkIdName);
+
                         PrefabDom reparentPatch;
                         m_instanceToTemplateInterface->GeneratePatch(
                             reparentPatch, nestedInstanceTemplateDom, nestedInstanceDomUnderNewParent);
-                        
+
                         CreateLink(nestedInstanceUnderNewParent, parentTemplateId, undoBatch.GetUndoBatch(), AZStd::move(reparentPatch), true);
                     });
-                }
 
-                AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-                    &AzToolsFramework::ToolsApplicationRequestBus::Events::ClearDirtyEntities);
+                // Detach entities and add them to the parent instance, then update entity DOMs in template
+                detachedInstance->DetachEntities(
+                    [&detachedEntitiesToUpdate, &parentInstance](AZStd::unique_ptr<AZ::Entity> entityPtr)
+                    {
+                        AZ::Entity* detachedEntity = entityPtr.release();
+                        [[maybe_unused]] const bool entityAdded = parentInstance.AddEntity(*detachedEntity);
+                        AZ_Assert(entityAdded, "Add target Instance's entity to its parent Instance failed.");
+
+                        detachedEntitiesToUpdate.push_back(detachedEntity);
+                    });
+
+                PrefabUndoHelpers::AddEntityDoms(detachedEntitiesToUpdate, parentInstance.GetTemplateId(), undoBatch.GetUndoBatch());
+
+                // Update parent entity of the container entity in template with the new sort order information
+                // Note: Currently, we do not update the parent entity DOM value in cached instance DOM of parent instance.
+                // So, in prefab template progation it would trigger reloading on the parent entity to consume the detached container
+                // entity (id) that was also reloaded. If not, the detached container would be added to the end of list.
+                PrefabDom parentEntityDomAfter;
+                m_instanceToTemplateInterface->GenerateEntityDomBySerializing(parentEntityDomAfter, *parentEntity);
+                PrefabUndoHelpers::UpdateEntity(
+                    parentEntityDomBefore, parentEntityDomAfter, parentEntity->GetId(), undoBatch.GetUndoBatch(), false);
             }
 
+            AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+                &AzToolsFramework::ToolsApplicationRequestBus::Events::ClearDirtyEntities);
+
             return AZ::Success();
         }
 

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoHelpers.cpp

@@ -82,6 +82,17 @@ namespace AzToolsFramework
                 
             }
 
+            void AddEntityDoms(
+                const AZStd::vector<const AZ::Entity*>& entityList,
+                TemplateId templateId,
+                UndoSystem::URSequencePoint* undoBatch)
+            {
+                PrefabUndoAddEntityDoms* undoState = aznew PrefabUndoAddEntityDoms("Undo Adding Entity DOMs");
+                undoState->SetParent(undoBatch);
+                undoState->Capture(entityList, templateId);
+                undoState->Redo();
+            }
+
             void RemoveEntityDoms(
                 const AZStd::vector<AZStd::pair<const PrefabDomValue*, AZStd::string>>& entityDomAndPathList,
                 TemplateId templateId,
@@ -97,11 +108,12 @@ namespace AzToolsFramework
                 const PrefabDomValue& entityDomBeforeUpdatingEntity,
                 const PrefabDomValue& entityDomAfterUpdatingEntity,
                 AZ::EntityId entityId,
-                UndoSystem::URSequencePoint* undoBatch)
+                UndoSystem::URSequencePoint* undoBatch,
+                bool updateCache)
             {
                 PrefabUndoEntityUpdate* state = aznew PrefabUndoEntityUpdate("Undo Updating Entity");
                 state->SetParent(undoBatch);
-                state->Capture(entityDomBeforeUpdatingEntity, entityDomAfterUpdatingEntity, entityId);
+                state->Capture(entityDomBeforeUpdatingEntity, entityDomAfterUpdatingEntity, entityId, updateCache);
                 state->Redo();
             }
 

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoHelpers.h

@@ -38,12 +38,22 @@ namespace AzToolsFramework
                 Instance& owningInstance,
                 Instance& focusedInstance,
                 UndoSystem::URSequencePoint* undoBatch);
+            
+            //! Helper function for adding entity DOMs to prefab template with undo-redo support.
+            //! Note: It does not include updating relevant parent entities.
+            //! @param entityList The list of entities that will be added to template.
+            //! @param templateId The id of the prefab template under which the entity DOMs will live.
+            //! @param undoBatch The undo batch node to register the add-entitiy-doms undo node to.
+            void AddEntityDoms(
+                const AZStd::vector<const AZ::Entity*>& entityList,
+                TemplateId templateId,
+                UndoSystem::URSequencePoint* undoBatch);
 
             //! Helper function for removing entity DOMs to prefab template with undo-redo support.
             //! Note: It does not include updating relevant parent entities.
             //! @param entityDomAndPathList The list of pairs of entity DOM before removal and its alias path in template.
             //! @param templateId The id of the prefab template under which the removed entity DOMs will live.
-            //! @param undoBatch The undo batch node to register the remove-entities undo node to.
+            //! @param undoBatch The undo batch node to register the remove-entity-doms undo node to.
             void RemoveEntityDoms(
                 const AZStd::vector<AZStd::pair<const PrefabDomValue*, AZStd::string>>& entityDomAndPathList,
                 TemplateId templateId,
@@ -54,11 +64,13 @@ namespace AzToolsFramework
             //! @param entityDomAfterUpdatingEntity The DOM of the entity after updating.
             //! @param entityId The id of the entity.
             //! @param undoBatch The undo batch node to register the update-entity undo node to.
+            //! @param updateCache Flag that determines if the cached instance DOM is updated to avoid reloading in next tick.
             void UpdateEntity(
                 const PrefabDomValue& entityDomBeforeUpdatingEntity,
                 const PrefabDomValue& entityDomAfterUpdatingEntity,
                 AZ::EntityId entityId,
-                UndoSystem::URSequencePoint* undoBatch);
+                UndoSystem::URSequencePoint* undoBatch,
+                bool updateCache = true);
 
             //! Helper function for updating entities as overrides to focused template with undo-redo support.
             //! @param entityList Entity list for entities to be updated in focused template.

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Undo/PrefabUndo.cpp

@@ -34,6 +34,34 @@ namespace AzToolsFramework
             m_instanceToTemplateInterface->GeneratePatch(m_undoPatch, endState, initialState);
         }
 
+        // PrefabUndoAddEntityDoms
+
+        PrefabUndoAddEntityDoms::PrefabUndoAddEntityDoms(const AZStd::string& undoOperationName)
+            : PrefabUndoBase(undoOperationName)
+        {
+        }
+
+        void PrefabUndoAddEntityDoms::Capture(const AZStd::vector<const AZ::Entity*>& entityList, TemplateId templateId)
+        {
+            m_templateId = templateId;
+
+            m_redoPatch.SetArray();
+            m_undoPatch.SetArray();
+
+            for (const AZ::Entity* entity : entityList)
+            {
+                if (entity)
+                {
+                    PrefabDom entityDom;
+                    m_instanceToTemplateInterface->GenerateEntityDomBySerializing(entityDom, *entity);
+
+                    const AZStd::string& entityAliasPath = m_instanceToTemplateInterface->GenerateEntityAliasPath(entity->GetId());
+                    PrefabUndoUtils::AppendAddEntityPatch(m_redoPatch, entityDom, entityAliasPath);
+                    PrefabUndoUtils::AppendRemovePatch(m_undoPatch, entityAliasPath);
+                }
+            }
+        }
+
         // PrefabUndoRemoveEntityDoms
 
         PrefabUndoRemoveEntityDoms::PrefabUndoRemoveEntityDoms(const AZStd::string& undoOperationName)
@@ -70,7 +98,8 @@ namespace AzToolsFramework
             AZ_Assert(m_instanceEntityMapperInterface, "Failed to grab instance entity mapper interface");
         }
 
-        void PrefabUndoEntityUpdate::Capture(const PrefabDomValue& initialState, const PrefabDomValue& endState, AZ::EntityId entityId)
+        void PrefabUndoEntityUpdate::Capture(
+            const PrefabDomValue& initialState, const PrefabDomValue& endState, AZ::EntityId entityId, bool updateCache)
         {
             //get the entity alias for future undo/redo
             auto instanceReference = m_instanceEntityMapperInterface->FindOwningInstance(entityId);
@@ -94,10 +123,13 @@ namespace AzToolsFramework
             PrefabUndoUtils::GenerateUpdateEntityPatch(m_undoPatch, endState, initialState, entityAliasPath);
 
             // Preemptively updates the cached DOM to prevent reloading instance DOM.
-            PrefabDomReference cachedOwningInstanceDom = instance.GetCachedInstanceDom();
-            if (cachedOwningInstanceDom.has_value())
+            if (updateCache)
             {
-                PrefabUndoUtils::UpdateEntityInInstanceDom(cachedOwningInstanceDom, endState, entityAliasPath);
+                PrefabDomReference cachedOwningInstanceDom = instance.GetCachedInstanceDom();
+                if (cachedOwningInstanceDom.has_value())
+                {
+                    PrefabUndoUtils::UpdateEntityInInstanceDom(cachedOwningInstanceDom, endState, entityAliasPath);
+                }
             }
         }
 

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Undo/PrefabUndo.h

@@ -29,7 +29,16 @@ namespace AzToolsFramework
                 const PrefabDom& endState,
                 TemplateId templateId);
         };
-        
+
+        //! Undo class for handling addition of entity DOMs to a prefab template.
+        class PrefabUndoAddEntityDoms : public PrefabUndoBase
+        {
+        public:
+            explicit PrefabUndoAddEntityDoms(const AZStd::string& undoOperationName);
+
+            void Capture(const AZStd::vector<const AZ::Entity*>& entityList, TemplateId templateId);
+        };
+
         //! Undo class for handling removal of entity DOMs to a prefab template.
         class PrefabUndoRemoveEntityDoms
             : public PrefabUndoBase
@@ -51,7 +60,7 @@ namespace AzToolsFramework
 
             explicit PrefabUndoEntityUpdate(const AZStd::string& undoOperationName);
 
-            void Capture(const PrefabDomValue& initialState, const PrefabDomValue& endState, AZ::EntityId entity);
+            void Capture(const PrefabDomValue& initialState, const PrefabDomValue& endState, AZ::EntityId entity, bool updateCache = true);
 
             void Undo() override;
             void Redo() override;

Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp

@@ -570,7 +570,7 @@ namespace AzToolsFramework
                 // Do not show the option when it is not a prefab edit.
                 if (s_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(parentEntityId))
                 {
-                    QAction* detachPrefabAction = menu->addAction(QObject::tr("Detach Prefab..."));
+                    QAction* detachPrefabAction = menu->addAction(QObject::tr("Detach Prefab"));
                     QObject::connect(
                         detachPrefabAction, &QAction::triggered, detachPrefabAction,
                         [this, selectedEntityId]

Code/Framework/AzToolsFramework/Tests/Prefab/PrefabDetachPrefabTests.cpp

@@ -0,0 +1,344 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
+#include <Prefab/PrefabTestFixture.h>
+
+namespace UnitTest
+{
+    using PrefabDetachPrefabTests = PrefabTestFixture;
+
+    TEST_F(PrefabDetachPrefabTests, DetachPrefabUnderLevelSucceeds)
+    {
+        // Level
+        // | Car       (prefab)  <-- detach prefab
+        //   | Tire
+
+        const AZStd::string carPrefabName = "CarPrefab";
+        const AZStd::string tireEntityName = "Tire";
+
+        AZ::IO::Path engineRootPath;
+        m_settingsRegistryInterface->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+        AZ::IO::Path carPrefabFilepath = engineRootPath / carPrefabName;
+
+        AZ::EntityId tireEntityId = CreateEditorEntityUnderRoot(tireEntityName);
+        AZ::EntityId carContainerId = CreateEditorPrefab(carPrefabFilepath, { tireEntityId });
+
+        InstanceAlias carInstanceAlias = FindNestedInstanceAliasInInstance(GetRootContainerEntityId(), carPrefabName);
+
+        // Detach the car prefab.
+        PrefabOperationResult result = m_prefabPublicInterface->DetachPrefab(carContainerId);
+        ASSERT_TRUE(result.IsSuccess());
+
+        PropagateAllTemplateChanges();
+
+        // Validate there is no nested instance in the level prefab instance.
+        ValidateNestedInstanceNotUnderInstance(GetRootContainerEntityId(), carInstanceAlias);
+
+        InstanceOptionalReference levelInstance = m_instanceEntityMapperInterface->FindOwningInstance(GetRootContainerEntityId());
+        EXPECT_TRUE(levelInstance.has_value());
+
+        // Validate there are two entities in the level prefab instance.
+        EXPECT_EQ(levelInstance->get().GetEntityAliasCount(), 2);
+
+        // Validate that the car's parent entity is the level container entity.
+        AZStd::string carEntityAliasAfterDetach = FindEntityAliasInInstance(GetRootContainerEntityId(), carPrefabName);
+        AZ::EntityId carEntityIdAfterDetach = levelInstance->get().GetEntityId(carEntityAliasAfterDetach);
+        EXPECT_TRUE(carEntityIdAfterDetach.IsValid());
+
+        AZ::EntityId parentEntityIdForCar;
+        AZ::TransformBus::EventResult(parentEntityIdForCar, carEntityIdAfterDetach, &AZ::TransformInterface::GetParentId);
+        EXPECT_EQ(levelInstance->get().GetContainerEntityId(), parentEntityIdForCar);
+
+        // Validate that the tire's parent entity is the car.
+        AZStd::string tireEntityAliasAfterDetach = FindEntityAliasInInstance(GetRootContainerEntityId(), tireEntityName);
+        AZ::EntityId tireEntityIdAfterDetach = levelInstance->get().GetEntityId(tireEntityAliasAfterDetach);
+        EXPECT_TRUE(tireEntityIdAfterDetach.IsValid());
+
+        AZ::EntityId parentEntityIdForTire;
+        AZ::TransformBus::EventResult(parentEntityIdForTire, tireEntityIdAfterDetach, &AZ::TransformInterface::GetParentId);
+        EXPECT_EQ(carEntityIdAfterDetach, parentEntityIdForTire);
+    }
+
+    TEST_F(PrefabDetachPrefabTests, DetachPrefabUnderParentSucceeds)
+    {
+        // Level
+        // | Garage
+        //   | Car       (prefab)  <-- detach prefab
+        //     | Tire
+
+        const AZStd::string carPrefabName = "CarPrefab";
+        const AZStd::string garageEntityName = "Garage";
+        const AZStd::string tireEntityName = "Tire";
+
+        AZ::IO::Path engineRootPath;
+        m_settingsRegistryInterface->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+        AZ::IO::Path carPrefabFilepath = engineRootPath / carPrefabName;
+
+        AZ::EntityId garageEntityId = CreateEditorEntityUnderRoot(garageEntityName);
+        AZ::EntityId tireEntityId = CreateEditorEntity(tireEntityName, garageEntityId);
+        AZ::EntityId carContainerId = CreateEditorPrefab(carPrefabFilepath, { tireEntityId });
+
+        InstanceAlias carInstanceAlias = FindNestedInstanceAliasInInstance(GetRootContainerEntityId(), carPrefabName);
+
+        // Detach the car prefab.
+        PrefabOperationResult result = m_prefabPublicInterface->DetachPrefab(carContainerId);
+        ASSERT_TRUE(result.IsSuccess());
+
+        PropagateAllTemplateChanges();
+
+        // Validate there is no nested instance in the level prefab instance.
+        ValidateNestedInstanceNotUnderInstance(GetRootContainerEntityId(), carInstanceAlias);
+
+        InstanceOptionalReference levelInstance = m_instanceEntityMapperInterface->FindOwningInstance(GetRootContainerEntityId());
+        EXPECT_TRUE(levelInstance.has_value());
+
+        // Validate there are three entities in the level prefab instance.
+        EXPECT_EQ(levelInstance->get().GetEntityAliasCount(), 3);        
+
+        // Validate that the garage's parent entity is the level container entity.
+        AZStd::string garageEntityAliasAfterDetach = FindEntityAliasInInstance(GetRootContainerEntityId(), garageEntityName);
+        AZ::EntityId garageEntityIdAfterDetach = levelInstance->get().GetEntityId(garageEntityAliasAfterDetach);
+        EXPECT_TRUE(garageEntityIdAfterDetach.IsValid());
+
+        AZ::EntityId parentEntityIdForGarage;
+        AZ::TransformBus::EventResult(parentEntityIdForGarage, garageEntityIdAfterDetach, &AZ::TransformInterface::GetParentId);
+        EXPECT_EQ(levelInstance->get().GetContainerEntityId(), parentEntityIdForGarage);
+
+        // Validate that the car's parent entity is the garage.
+        AZStd::string carEntityAliasAfterDetach = FindEntityAliasInInstance(GetRootContainerEntityId(), carPrefabName);
+        AZ::EntityId carEntityIdAfterDetach = levelInstance->get().GetEntityId(carEntityAliasAfterDetach);
+        EXPECT_TRUE(carEntityIdAfterDetach.IsValid());
+
+        AZ::EntityId parentEntityIdForCar;
+        AZ::TransformBus::EventResult(parentEntityIdForCar, carEntityIdAfterDetach, &AZ::TransformInterface::GetParentId);
+        EXPECT_EQ(garageEntityIdAfterDetach, parentEntityIdForCar);
+
+        // Validate that the tire's parent entity is the car.
+        AZStd::string tireEntityAliasAfterDetach = FindEntityAliasInInstance(GetRootContainerEntityId(), tireEntityName);
+        AZ::EntityId tireEntityIdAfterDetach = levelInstance->get().GetEntityId(tireEntityAliasAfterDetach);
+        EXPECT_TRUE(tireEntityIdAfterDetach.IsValid());
+
+        AZ::EntityId parentEntityIdForTire;
+        AZ::TransformBus::EventResult(parentEntityIdForTire, tireEntityIdAfterDetach, &AZ::TransformInterface::GetParentId);
+        EXPECT_EQ(carEntityIdAfterDetach, parentEntityIdForTire);
+    }
+
+    TEST_F(PrefabDetachPrefabTests, DetachPrefabWithNestedPrefabSucceeds)
+    {
+        // Level
+        // | Car       (prefab)  <-- detach prefab
+        //   | Wheel   (prefab)
+        //     | Tire
+
+        const AZStd::string carPrefabName = "CarPrefab";
+        const AZStd::string wheelPrefabName = "WheelPrefab";
+        const AZStd::string tireEntityName = "Tire";
+
+        AZ::IO::Path engineRootPath;
+        m_settingsRegistryInterface->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+        AZ::IO::Path carPrefabFilepath = engineRootPath / carPrefabName;
+        AZ::IO::Path wheelPrefabFilepath = engineRootPath / wheelPrefabName;
+
+        AZ::EntityId tireEntityId = CreateEditorEntityUnderRoot(tireEntityName);
+        AZ::EntityId wheelContainerId = CreateEditorPrefab(wheelPrefabFilepath, { tireEntityId });
+        EntityAlias tireEntityAlias = FindEntityAliasInInstance(wheelContainerId, tireEntityName);
+
+        AZ::EntityId carContainerId = CreateEditorPrefab(carPrefabFilepath, { wheelContainerId });
+        InstanceAlias carInstanceAlias = FindNestedInstanceAliasInInstance(GetRootContainerEntityId(), carPrefabName);
+
+        // Detach the car prefab.
+        PrefabOperationResult result = m_prefabPublicInterface->DetachPrefab(carContainerId);
+        ASSERT_TRUE(result.IsSuccess());
+
+        PropagateAllTemplateChanges();
+
+        // Validate there is no car instance in the level prefab instance.
+        ValidateNestedInstanceNotUnderInstance(GetRootContainerEntityId(), carInstanceAlias);
+
+        // Validate there is wheel instance in the level prefab instance.
+        InstanceAlias wheelInstanceAlias = FindNestedInstanceAliasInInstance(GetRootContainerEntityId(), wheelPrefabName);
+        ValidateNestedInstanceUnderInstance(GetRootContainerEntityId(), wheelInstanceAlias);
+
+        InstanceOptionalReference levelInstance = m_instanceEntityMapperInterface->FindOwningInstance(GetRootContainerEntityId());
+        EXPECT_TRUE(levelInstance.has_value());
+        
+        AZStd::vector<InstanceOptionalReference> nestedInstances;
+        levelInstance->get().GetNestedInstances(
+            [&nestedInstances](AZStd::unique_ptr<Instance>& nestedInstance)
+            {
+                nestedInstances.push_back(*(nestedInstance.get()));
+            });
+
+        EXPECT_EQ(nestedInstances.size(), 1) << "There should be only one nested instance in level after detaching.";
+        EXPECT_TRUE(nestedInstances[0].has_value());
+
+        // Validate that the car's parent entity is the level container entity.
+        AZStd::string carEntityAliasAfterDetach = FindEntityAliasInInstance(GetRootContainerEntityId(), carPrefabName);
+        AZ::EntityId carEntityIdAfterDetach = levelInstance->get().GetEntityId(carEntityAliasAfterDetach);
+        EXPECT_TRUE(carEntityIdAfterDetach.IsValid());
+
+        AZ::EntityId parentEntityIdForCar;
+        AZ::TransformBus::EventResult(parentEntityIdForCar, carEntityIdAfterDetach, &AZ::TransformInterface::GetParentId);
+        EXPECT_EQ(levelInstance->get().GetContainerEntityId(), parentEntityIdForCar);
+
+        // Validate that the wheel's parent entity is the car.
+        Instance& wheelInstanceAfterDetach = nestedInstances[0]->get();
+        AZ::EntityId wheelContainerIdAfterDetach = wheelInstanceAfterDetach.GetContainerEntityId();
+        EXPECT_TRUE(wheelContainerIdAfterDetach.IsValid());
+
+        AZ::EntityId parentEntityIdForWheel;
+        AZ::TransformBus::EventResult(parentEntityIdForWheel, wheelContainerIdAfterDetach, &AZ::TransformInterface::GetParentId);
+        EXPECT_EQ(carEntityIdAfterDetach, parentEntityIdForWheel);
+
+        // Validate that the tire's parent entity is the wheel.
+        tireEntityId = wheelInstanceAfterDetach.GetEntityId(tireEntityAlias);
+        EXPECT_TRUE(tireEntityId.IsValid());
+        AZ::EntityId parentEntityIdForTire;
+        AZ::TransformBus::EventResult(parentEntityIdForTire, tireEntityId, &AZ::TransformInterface::GetParentId);
+        EXPECT_EQ(wheelContainerIdAfterDetach, parentEntityIdForTire);
+    }
+
+    TEST_F(PrefabDetachPrefabTests, DetachPrefabValidatesDetachedContainerEntityOrder)
+    {
+        // Validate the detached container entity's sort order in its parent.
+        // The detached container entity should not be moved to the beginning or end of the child entity list.
+        //
+        // Level
+        // | Station
+        // | Car       (prefab)  <-- detach prefab
+        //   | Tire
+        // | House
+
+        const AZStd::string carPrefabName = "CarPrefab";
+
+        const AZStd::string tireEntityName = "Tire";
+        const AZStd::string stationEntityName = "Station";
+        const AZStd::string houseEntityName = "House";
+
+        AZ::IO::Path engineRootPath;
+        m_settingsRegistryInterface->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+        AZ::IO::Path carPrefabFilepath = engineRootPath / carPrefabName;
+
+        CreateEditorEntityUnderRoot(stationEntityName);
+        AZ::EntityId tireEntityId = CreateEditorEntityUnderRoot(tireEntityName);
+        AZ::EntityId carContainerId = CreateEditorPrefab(carPrefabFilepath, { tireEntityId });
+        CreateEditorEntityUnderRoot(houseEntityName);
+
+        // Validate child entity order before detaching the car prefab.
+        AzToolsFramework::EntityOrderArray entityOrderArrayBeforeDetach =
+            AzToolsFramework::GetEntityChildOrder(GetRootContainerEntityId());
+        EXPECT_EQ(entityOrderArrayBeforeDetach.size(), 3);
+
+        AZStd::string childEntityName;
+        AZ::ComponentApplicationBus::BroadcastResult(
+            childEntityName, &AZ::ComponentApplicationRequests::GetEntityName, entityOrderArrayBeforeDetach[0]);
+        EXPECT_EQ(childEntityName, stationEntityName);
+        AZ::ComponentApplicationBus::BroadcastResult(
+            childEntityName, &AZ::ComponentApplicationRequests::GetEntityName, entityOrderArrayBeforeDetach[1]);
+        EXPECT_EQ(childEntityName, carPrefabName);
+        AZ::ComponentApplicationBus::BroadcastResult(
+            childEntityName, &AZ::ComponentApplicationRequests::GetEntityName, entityOrderArrayBeforeDetach[2]);
+        EXPECT_EQ(childEntityName, houseEntityName);
+
+        // Detach the car prefab.
+        PrefabOperationResult result = m_prefabPublicInterface->DetachPrefab(carContainerId);
+        ASSERT_TRUE(result.IsSuccess());
+
+        PropagateAllTemplateChanges();
+
+        // Validate child entity order after detaching the car prefab.
+        AzToolsFramework::EntityOrderArray entityOrderArrayAfterDetach =
+            AzToolsFramework::GetEntityChildOrder(GetRootContainerEntityId());
+        EXPECT_EQ(entityOrderArrayAfterDetach.size(), 3);
+
+        childEntityName = "";
+        AZ::ComponentApplicationBus::BroadcastResult(
+            childEntityName, &AZ::ComponentApplicationRequests::GetEntityName, entityOrderArrayAfterDetach[0]);
+        EXPECT_EQ(childEntityName, stationEntityName);
+        AZ::ComponentApplicationBus::BroadcastResult(
+            childEntityName, &AZ::ComponentApplicationRequests::GetEntityName, entityOrderArrayAfterDetach[1]);
+        EXPECT_EQ(childEntityName, carPrefabName);
+        AZ::ComponentApplicationBus::BroadcastResult(
+            childEntityName, &AZ::ComponentApplicationRequests::GetEntityName, entityOrderArrayAfterDetach[2]);
+        EXPECT_EQ(childEntityName, houseEntityName);
+    }
+
+    TEST_F(PrefabDetachPrefabTests, DetachPrefabValidatesDetachedChildEntityOrder)
+    {
+        // Validate the sort order of top-level child entities.
+        //
+        // Level
+        // | Car       (prefab)  <-- detach prefab
+        //   | Engine
+        //   | Wheel   (prefab)
+        //     | Tire
+        //   | Battery
+
+        const AZStd::string carPrefabName = "CarPrefab";
+        const AZStd::string wheelPrefabName = "WheelPrefab";
+
+        const AZStd::string tireEntityName = "Tire";
+        const AZStd::string engineEntityName = "Engine";
+        const AZStd::string batteryEntityName = "Battery";
+
+        AZ::IO::Path engineRootPath;
+        m_settingsRegistryInterface->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
+        AZ::IO::Path carPrefabFilepath = engineRootPath / carPrefabName;
+        AZ::IO::Path wheelPrefabFilepath = engineRootPath / wheelPrefabName;
+
+        AZ::EntityId engineEntityId = CreateEditorEntityUnderRoot(engineEntityName);
+        AZ::EntityId tireEntityId = CreateEditorEntityUnderRoot(tireEntityName);
+        AZ::EntityId wheelContainerId = CreateEditorPrefab(wheelPrefabFilepath, { tireEntityId });
+        AZ::EntityId batteryEntityId = CreateEditorEntityUnderRoot(batteryEntityName);
+        AZ::EntityId carContainerId = CreateEditorPrefab(carPrefabFilepath, { engineEntityId, wheelContainerId, batteryEntityId });
+
+        // Validate child entity order under car before detaching the car prefab.
+        AzToolsFramework::EntityOrderArray entityOrderArrayBeforeDetach = AzToolsFramework::GetEntityChildOrder(carContainerId);
+        EXPECT_EQ(entityOrderArrayBeforeDetach.size(), 3);
+
+        AZStd::string childEntityName;
+        AZ::ComponentApplicationBus::BroadcastResult(
+            childEntityName, &AZ::ComponentApplicationRequests::GetEntityName, entityOrderArrayBeforeDetach[0]);
+        EXPECT_EQ(childEntityName, engineEntityName);
+        AZ::ComponentApplicationBus::BroadcastResult(
+            childEntityName, &AZ::ComponentApplicationRequests::GetEntityName, entityOrderArrayBeforeDetach[1]);
+        EXPECT_EQ(childEntityName, wheelPrefabName);
+        AZ::ComponentApplicationBus::BroadcastResult(
+            childEntityName, &AZ::ComponentApplicationRequests::GetEntityName, entityOrderArrayBeforeDetach[2]);
+        EXPECT_EQ(childEntityName, batteryEntityName);
+
+        // Detach the car prefab.
+        PrefabOperationResult result = m_prefabPublicInterface->DetachPrefab(carContainerId);
+        ASSERT_TRUE(result.IsSuccess());
+
+        PropagateAllTemplateChanges();
+
+        InstanceOptionalReference levelInstance = m_instanceEntityMapperInterface->FindOwningInstance(GetRootContainerEntityId());
+        EXPECT_TRUE(levelInstance.has_value());
+
+        // Validate child entity order under the car after detaching the car prefab.
+        EntityAlias carEntityAliasAfterDetach = FindEntityAliasInInstance(levelInstance->get().GetContainerEntityId(), carPrefabName);
+        AZ::EntityId carContainerIdAfterDetach = levelInstance->get().GetEntityId(carEntityAliasAfterDetach);
+        
+        AzToolsFramework::EntityOrderArray entityOrderArrayAfterDetach =
+            AzToolsFramework::GetEntityChildOrder(carContainerIdAfterDetach);
+        EXPECT_EQ(entityOrderArrayAfterDetach.size(), 3);
+
+        childEntityName = "";
+        AZ::ComponentApplicationBus::BroadcastResult(
+            childEntityName, &AZ::ComponentApplicationRequests::GetEntityName, entityOrderArrayAfterDetach[0]);
+        EXPECT_EQ(childEntityName, engineEntityName);
+        AZ::ComponentApplicationBus::BroadcastResult(
+            childEntityName, &AZ::ComponentApplicationRequests::GetEntityName, entityOrderArrayAfterDetach[1]);
+        EXPECT_EQ(childEntityName, wheelPrefabName);
+        AZ::ComponentApplicationBus::BroadcastResult(
+            childEntityName, &AZ::ComponentApplicationRequests::GetEntityName, entityOrderArrayAfterDetach[2]);
+        EXPECT_EQ(childEntityName, batteryEntityName);
+    }
+} // namespace UnitTest

Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake

@@ -101,6 +101,7 @@ set(FILES
     Prefab/PrefabCreateTests.cpp
     Prefab/PrefabDeleteTests.cpp
     Prefab/PrefabDeleteAsOverrideTests.cpp
+    Prefab/PrefabDetachPrefabTests.cpp
     Prefab/PrefabDuplicateTests.cpp
     Prefab/PrefabEntityAliasTests.cpp
     Prefab/PrefabInstanceDomGeneratorTestFixture.cpp

Code/Legacy/CryCommon/INavigationSystem.h

@@ -1,248 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYCOMMON_INAVIGATIONSYSTEM_H
-#define CRYINCLUDE_CRYCOMMON_INAVIGATIONSYSTEM_H
-#pragma once
-
-#include "CryCommon/Cry_Geo.h"
-
-#include <AzCore/std/functional.h>
-
-#include <IMNM.h>
-#include <ISystem.h>
-
-struct IOffMeshNavigationManager;
-
-enum ENavigationIDTag
-{
-    MeshIDTag = 0,
-    AgentTypeIDTag,
-    VolumeIDTag,
-};
-
-template <ENavigationIDTag T>
-struct TNavigationID
-{
-    explicit TNavigationID(uint32 _id = 0)
-        : id(_id) {}
-
-    TNavigationID& operator=(const TNavigationID& other) { id = other.id; return *this; }
-
-    ILINE operator uint32() const { return id; }
-    ILINE bool operator==(const TNavigationID& other) const { return id == other.id; }
-    ILINE bool operator!=(const TNavigationID& other) const { return id != other.id; }
-    ILINE bool operator<(const TNavigationID& other) const { return id < other.id; }
-
-private:
-    uint32 id;
-};
-
-
-typedef TNavigationID<MeshIDTag> NavigationMeshID;
-typedef TNavigationID<AgentTypeIDTag> NavigationAgentTypeID;
-typedef TNavigationID<VolumeIDTag> NavigationVolumeID;
-typedef AZStd::function<void(NavigationAgentTypeID, NavigationMeshID, uint32)> NavigationMeshChangeCallback;
-
-struct INavigationSystemUser
-{
-    virtual ~INavigationSystemUser() {}
-
-    virtual void Reset() = 0;
-    virtual void UpdateForSynchronousOrAsynchronousReadingOperation() = 0;
-    virtual void UpdateForSynchronousWritingOperations() = 0;
-    virtual void CompleteRunningTasks() = 0;
-};
-
-struct INavigationSystem
-{
-    enum ENavigationEvent
-    {
-        MeshReloaded = 0,
-        MeshReloadedAfterExporting,
-        NavigationCleared,
-    };
-
-    enum EAccessbilityDir
-    {
-        AccessibilityToward,
-        AccessibilityAway,
-    };
-
-    struct INavigationSystemListener
-    {
-        // <interfuscator:shuffle>
-        virtual ~INavigationSystemListener(){}
-        virtual void OnNavigationEvent(const ENavigationEvent event) = 0;
-        // </interfuscator:shuffle>
-    };
-
-    enum WorkingState
-    {
-        Idle = 0,
-        Working,
-    };
-
-
-    struct CreateAgentTypeParams
-    {
-        CreateAgentTypeParams(const Vec3& _voxelSize = Vec3(0.1f), uint16 _radiusVoxelCount = 4,
-            uint16 _climbableVoxelCount = 4, uint16 _heightVoxelCount = 18,
-            [[maybe_unused]] uint16 _maxWaterDepthVoxelCount = 6)
-            : voxelSize(_voxelSize)
-            , climbableInclineGradient(1.0f)
-            , climbableStepRatio(0.75f)
-            , radiusVoxelCount(_radiusVoxelCount)
-            , climbableVoxelCount(_climbableVoxelCount)
-            , heightVoxelCount(_heightVoxelCount)
-            , maxWaterDepthVoxelCount()
-        {
-        }
-
-        Vec3 voxelSize;
-
-        float climbableInclineGradient;
-        float climbableStepRatio;
-
-        uint16 radiusVoxelCount;
-        uint16 climbableVoxelCount;
-        uint16 heightVoxelCount;
-        uint16 maxWaterDepthVoxelCount;
-    };
-
-    struct CreateMeshParams
-    {
-        CreateMeshParams(const Vec3& _origin = Vec3(ZERO), const Vec3i& _tileSize = Vec3i(8), const uint32 _tileCount = 1024)
-            : origin(_origin)
-            , tileSize(_tileSize)
-            , tileCount(_tileCount)
-        {
-        }
-
-        Vec3 origin;
-        Vec3i tileSize;
-        uint32 tileCount;
-    };
-
-    // <interfuscator:shuffle>
-    virtual ~INavigationSystem() {}
-    virtual NavigationAgentTypeID CreateAgentType(const char* name, const CreateAgentTypeParams& params) = 0;
-    virtual NavigationAgentTypeID GetAgentTypeID(const char* name) const = 0;
-    virtual NavigationAgentTypeID GetAgentTypeID(size_t index) const = 0;
-    virtual const char* GetAgentTypeName(NavigationAgentTypeID agentTypeID) const = 0;
-    virtual size_t GetAgentTypeCount() const = 0;
-
-    virtual NavigationMeshID CreateMesh(const char* name, NavigationAgentTypeID agentTypeID, const CreateMeshParams& params) = 0;
-    virtual NavigationMeshID CreateMesh(const char* name, NavigationAgentTypeID agentTypeID, const CreateMeshParams& params, NavigationMeshID requestedID) = 0;
-    virtual void DestroyMesh(NavigationMeshID meshID) = 0;
-
-    virtual void AddMeshChangeCallback(NavigationAgentTypeID agentTypeID, const NavigationMeshChangeCallback& callback) = 0;
-    virtual void RemoveMeshChangeCallback(NavigationAgentTypeID agentTypeID, const NavigationMeshChangeCallback& callback) = 0;
-
-    virtual void SetMeshBoundaryVolume(NavigationMeshID meshID, NavigationVolumeID volumeID) = 0;
-    virtual NavigationVolumeID CreateVolume(Vec3* vertices, size_t vertexCount, float height) = 0;
-    virtual NavigationVolumeID CreateVolume(Vec3* vertices, size_t vertexCount, float height, NavigationVolumeID requestedID) = 0;
-    virtual void DestroyVolume(NavigationVolumeID volumeID) = 0;
-    virtual void SetVolume(NavigationVolumeID volumeID, Vec3* vertices, size_t vertexCount, float height) = 0;
-    virtual bool ValidateVolume(NavigationVolumeID volumeID) = 0;
-    virtual NavigationVolumeID GetVolumeID(NavigationMeshID meshID) = 0;
-
-    virtual void SetExclusionVolume(const NavigationAgentTypeID* agentTypeIDs, size_t agentTypeIDCount, NavigationVolumeID volumeID) = 0;
-
-    virtual NavigationMeshID GetMeshID(const char* name, NavigationAgentTypeID agentTypeID) const = 0;
-    virtual const char* GetMeshName(NavigationMeshID meshID) const = 0;
-    virtual void SetMeshName(NavigationMeshID meshID, const char* name) = 0;
-
-    virtual WorkingState GetState() const = 0;
-    virtual WorkingState Update(bool blocking = false) = 0;
-    virtual void PauseNavigationUpdate() = 0;
-    virtual void RestartNavigationUpdate() = 0;
-
-    virtual size_t QueueMeshUpdate(NavigationMeshID meshID, const AABB& aabb) = 0;
-    virtual void ProcessQueuedMeshUpdates() = 0;
-
-    virtual void Clear() = 0;
-    // ClearAndNotify it's used when the listeners need to be notified about
-    // the performed clear operation.
-    virtual void ClearAndNotify() = 0;
-    virtual bool ReloadConfig() = 0;
-    virtual void DebugDraw() = 0;
-    virtual void Reset() = 0;
-
-    virtual void WorldChanged(const AABB& aabb) = 0;
-
-    virtual void SetDebugDisplayAgentType(NavigationAgentTypeID agentTypeID) = 0;
-    virtual NavigationAgentTypeID GetDebugDisplayAgentType() const = 0;
-
-    //Returns impact mesh ID and point if segment intersects
-    virtual std::tuple<bool, NavigationMeshID, Vec3> RaycastWorld(const Vec3& segP0, const Vec3& segP1) const = 0;
-
-    virtual bool GetClosestPointInNavigationMesh(const NavigationAgentTypeID agentID, const Vec3& location, float vrange, float hrange, Vec3* meshLocation, float minIslandArea = 0.f) const = 0;
-
-    //Returns nav mesh ID at the specified location based on the passed in agent type
-    virtual NavigationMeshID GetEnclosingMeshID(NavigationAgentTypeID agentTypeID, const Vec3& location) const = 0;
-
-    virtual bool IsLocationValidInNavigationMesh(const NavigationAgentTypeID agentID, const Vec3& location) const = 0;
-
-    //Test to see if the specified location is within the navmesh.  The point has to be weithin downRange and upRange offset from location
-    virtual bool IsLocationContainedWithinTriangleInNavigationMesh(const NavigationAgentTypeID agentID, const Vec3& location, float downRange, float upRange) const = 0;
-
-    //Returns a list of triangle centers within the specified AABB and navmesh
-    virtual size_t GetTriangleCenterLocationsInMesh(const NavigationMeshID meshID, const Vec3& location, const AABB& searchAABB, Vec3* centerLocations, size_t maxCenterLocationCount, float minIslandArea = 0.f) const = 0;
-
-    // Returns all borders (unconnected edges) in the specified AABB.  There are 3 Vec3's
-    // per border edge, vert 0, vert 1, and a normal pointing out from the edge.  You can
-    // pass null for pBorders to return the total number of borders (multiply this by 3 to
-    // get the total number of Vec3's you need to pass in).
-    virtual size_t GetTriangleBorders(const NavigationMeshID meshID, const AABB& aabb, Vec3* pBorders, size_t maxBorderCount, float minIslandArea = 0.f) const = 0;
-
-    //For Hunt - gets triangle centers, and island ids - this is used to compute spawn points for an area
-    virtual size_t GetTriangleInfo(const NavigationMeshID meshID, const AABB& aabb, Vec3* centerLocations, uint32* islandids, size_t max_count, float minIslandArea = 0.f) const = 0;
-
-    //returns island id of the triangle at the current position
-    virtual MNM::GlobalIslandID GetGlobalIslandIdAtPosition(const NavigationAgentTypeID agentID, const Vec3& location) = 0;
-
-    virtual bool ReadFromFile(const char* fileName, bool bAfterExporting) = 0;
-    virtual bool SaveToFile(const char* fileName) const = 0;
-
-    virtual void RegisterListener(INavigationSystemListener* pListener, const char* name = NULL) = 0;
-    virtual void UnRegisterListener(INavigationSystemListener* pListener) = 0;
-
-    virtual void RegisterUser(INavigationSystemUser* pExtension, const char* name = NULL) = 0;
-    virtual void UnRegisterUser(INavigationSystemUser* pExtension) = 0;
-
-    virtual void RegisterArea(const char* shapeName) = 0;
-    virtual void UnRegisterArea(const char* shapeName) = 0;
-    virtual bool IsAreaPresent(const char* shapeName) = 0;
-    virtual NavigationVolumeID GetAreaId(const char* shapeName) const = 0;
-    virtual void SetAreaId(const char* shapeName, NavigationVolumeID id) = 0;
-    virtual void UpdateAreaNameForId(const NavigationVolumeID id, const char* newShapeName) = 0;
-
-    virtual void StartWorldMonitoring() = 0;
-    virtual void StopWorldMonitoring() = 0;
-
-    virtual bool IsInUse() const = 0;
-
-    virtual void CalculateAccessibility() = 0;
-
-    virtual uint32 GetTileIdWhereLocationIsAtForMesh(NavigationMeshID meshID, const Vec3& location) = 0;
-    virtual void GetTileBoundsForMesh(NavigationMeshID meshID, uint32 tileID, AABB& bounds) const = 0;
-
-    virtual MNM::TriangleID GetTriangleIDWhereLocationIsAtForMesh(const NavigationAgentTypeID agentID, const Vec3& location) = 0;
-
-    virtual const IOffMeshNavigationManager& GetIOffMeshNavigationManager() const = 0;
-    virtual IOffMeshNavigationManager& GetIOffMeshNavigationManager() = 0;
-    virtual void ComputeAccessibility(const Vec3& seedPos, NavigationAgentTypeID agentTypeId = NavigationAgentTypeID(0), float range = 0.f, EAccessbilityDir dir = AccessibilityAway) = 0;
-    virtual bool TryGetAgentRadiusData(const char* agentType, Vec3& voxelSize, uint16& radiusInVoxels) const = 0;
-    // </interfuscator:shuffle>
-};
-
-
-
-#endif // CRYINCLUDE_CRYCOMMON_INAVIGATIONSYSTEM_H

Code/Legacy/CryCommon/crycommon_files.cmake

@@ -28,7 +28,6 @@ set(FILES
     IValidator.h
     IWindowMessageHandler.h
     IXml.h
-    INavigationSystem.h
     IMNM.h
     SerializationTypes.h
     CryEndian.h

Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeRagdollNode.cpp

@@ -255,7 +255,7 @@ namespace EMotionFX
                     Physics::RagdollNodeState& targetRagdollRootNodeState = outputPoseData->GetRagdollNodeState(ragdollRootNodeIndex.GetValue());
 
                     // Only move along joints parented to the ragdoll root in case the ragdoll root is actually driven by physics (simulated).
-                    if (targetRagdollRootNodeState.m_simulationType == Physics::SimulationType::Dynamic)
+                    if (targetRagdollRootNodeState.m_simulationType == Physics::SimulationType::Simulated)
                     {
                         const Physics::RagdollNodeState& currentRagdollRootNodeState = currentRagdollState[ragdollRootNodeIndex.GetValue()];
 
@@ -284,7 +284,7 @@ namespace EMotionFX
                     Physics::RagdollNodeState& targetRagdollNodeState = outputPoseData->GetRagdollNodeState(ragdollNodeIndex.GetValue());
 
                     // The joint is part of the ragdoll as well as added and selected by this ragdoll node.
-                    targetRagdollNodeState.m_simulationType = Physics::SimulationType::Dynamic;
+                    targetRagdollNodeState.m_simulationType = Physics::SimulationType::Simulated;
 
                     // Go up the chain and find the next joint that is part of the ragdoll (Parent of the ragdoll node).
                     AZ::Outcome<size_t> ragdollParentJointIndex = AZ::Failure();

Gems/EMotionFX/Code/EMotionFX/Source/PoseDataRagdoll.cpp

@@ -92,7 +92,7 @@ namespace EMotionFX
 
         // Blending from kinematic to dynamic joint
         if (nodeState.m_simulationType == Physics::SimulationType::Kinematic &&
-            destNodeState.m_simulationType == Physics::SimulationType::Dynamic)
+            destNodeState.m_simulationType == Physics::SimulationType::Simulated)
         {
             nodeState.m_position = jointTransform.m_position.Lerp(destNodeState.m_position, weight);
             nodeState.m_orientation = jointTransform.m_rotation.NLerp(destNodeState.m_orientation, weight);
@@ -107,11 +107,11 @@ namespace EMotionFX
             if (weight > strengthEpsilon)
             {
                 // TODO: Evaluate if we should calculate the initial velocities here when we switch to dynamic. Or will we need to calculate that information every frame anyway additionally to the motors!?
-                nodeState.m_simulationType = Physics::SimulationType::Dynamic;
+                nodeState.m_simulationType = Physics::SimulationType::Simulated;
             }
         }
         // Blending from dynamic to kinematic joint
-        else if (nodeState.m_simulationType == Physics::SimulationType::Dynamic &&
+        else if (nodeState.m_simulationType == Physics::SimulationType::Simulated &&
                  destNodeState.m_simulationType == Physics::SimulationType::Kinematic)
         {
             nodeState.m_position = nodeState.m_position.Lerp(destJointTransform.m_position, weight);
@@ -128,8 +128,8 @@ namespace EMotionFX
             }
         }
         // Blending between two dynamic joints
-        else if (nodeState.m_simulationType == Physics::SimulationType::Dynamic &&
-                 destNodeState.m_simulationType == Physics::SimulationType::Dynamic)
+        else if (nodeState.m_simulationType == Physics::SimulationType::Simulated &&
+                 destNodeState.m_simulationType == Physics::SimulationType::Simulated)
         {
             nodeState.m_position = nodeState.m_position.Lerp(destNodeState.m_position, weight);
             nodeState.m_orientation = nodeState.m_orientation.NLerp(destNodeState.m_orientation, weight);
@@ -192,7 +192,7 @@ namespace EMotionFX
             const Physics::RagdollNodeState& nodeState = m_nodeStates[i];
 
             AZ_Printf("EMotionFX", "     - Ragdoll Node State %d:", i);
-            AZ_Printf("EMotionFX", "         + Type %s:", nodeState.m_simulationType == Physics::SimulationType::Dynamic ? "Dynamic" : "Kinematic");
+            AZ_Printf("EMotionFX", "         + Type %s:", nodeState.m_simulationType == Physics::SimulationType::Simulated ? "Simulated" : "Kinematic");
             AZ_Printf("EMotionFX", "         + Position: (%f, %f, %f)", static_cast<float>(nodeState.m_position.GetX()), static_cast<float>(nodeState.m_position.GetY()), static_cast<float>(nodeState.m_position.GetZ()));
             AZ_Printf("EMotionFX", "         + Rotation: (%f, %f, %f, %f)", static_cast<float>(nodeState.m_orientation.GetX()), static_cast<float>(nodeState.m_orientation.GetY()), static_cast<float>(nodeState.m_orientation.GetZ()), static_cast<float>(nodeState.m_orientation.GetW()));
             AZ_Printf("EMotionFX", "         + Linear Velocity: (%f, %f, %f)", static_cast<float>(nodeState.m_linearVelocity.GetX()), static_cast<float>(nodeState.m_linearVelocity.GetY()), static_cast<float>(nodeState.m_linearVelocity.GetZ()));

Gems/EMotionFX/Code/EMotionFX/Source/RagdollInstance.cpp

@@ -461,7 +461,7 @@ namespace EMotionFX
             const size_t jointIndex = ragdollInstance->GetJointIndex(i);
             const Physics::RagdollNodeState& targetJointPose = ragdollTargetPose[i];
 
-            if (targetJointPose.m_simulationType == Physics::SimulationType::Dynamic)
+            if (targetJointPose.m_simulationType == Physics::SimulationType::Simulated)
             {
                 targetPose.SetLocalSpaceTransform(jointIndex, EMotionFX::Transform(targetJointPose.m_position, targetJointPose.m_orientation));
             }
@@ -499,7 +499,7 @@ namespace EMotionFX
 
                     const Physics::RagdollNodeState& targetParentJointPose = ragdollTargetPose[ragdollParentJointIndex.GetValue()];
 
-                    if (targetParentJointPose.m_simulationType == Physics::SimulationType::Dynamic)
+                    if (targetParentJointPose.m_simulationType == Physics::SimulationType::Simulated)
                     {
                         AZ::Color simulatedColor = defaultSimulatedColor;
                         // TODO: We might want to bake the strength into the alpha channel once we know its range.

Gems/LmbrCentral/Assets/Scripts/AI/Navigation.xml

@@ -1,5 +0,0 @@
-<Navigation version="6" >
-	<AgentTypes>
-		<AgentType name="MediumSizedCharacters" voxelSize="0.125, 0.125, 0.125" radius="4" height="16" climbableHeight="3" maxWaterDepth="8" />
-	</AgentTypes>
-</Navigation>

Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp

@@ -1,437 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorNavigationAreaComponent.h"
-
-#include "EditorNavigationUtil.h"
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <LmbrCentral/Shape/PolygonPrismShapeComponentBus.h>
-#include <Shape/PolygonPrismShape.h>
-#include <MathConversion.h>
-
-namespace LmbrCentral
-{
-    static bool NavAgentValid(NavigationAgentTypeID navAgentId)
-    {
-        return navAgentId != NavigationAgentTypeID();
-    }
-
-    static bool NavVolumeValid(NavigationVolumeID navVolumeId)
-    {
-        return navVolumeId != NavigationVolumeID();
-    }
-
-    static bool NavMeshValid(NavigationMeshID navMeshId)
-    {
-        return navMeshId != NavigationMeshID();
-    }
-
-    void EditorNavigationAreaComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<EditorNavigationAreaComponent, AzToolsFramework::Components::EditorComponentBase>()
-                ->Field("AgentTypes", &EditorNavigationAreaComponent::m_agentTypes)
-                ->Field("Exclusion", &EditorNavigationAreaComponent::m_exclusion)
-                ;
-
-            if (AZ::EditContext* editContext = serializeContext->GetEditContext())
-            {
-                editContext->Class<EditorNavigationAreaComponent>("Navigation Area", "Navigation Area configuration")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AddableByUser, false)
-                        ->Attribute(AZ::Edit::Attributes::Category, "AI")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NavigationArea.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NavigationArea.svg")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/ai/nav-area/")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                    ->DataElement(AZ::Edit::UIHandlers::CheckBox, &EditorNavigationAreaComponent::m_exclusion, "Exclusion", "Does this area add or subtract from the Navigation Mesh")
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorNavigationAreaComponent::OnNavigationAreaChanged)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &EditorNavigationAreaComponent::m_agentTypes, "Agent Types", "All agents that could potentially be used with this area")
-                        ->ElementAttribute(AZ::Edit::UIHandlers::Handler, AZ::Edit::UIHandlers::ComboBox)
-                        ->ElementAttribute(AZ::Edit::Attributes::StringList, &PopulateAgentTypeList)
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::AddNotify, &EditorNavigationAreaComponent::OnNavigationAreaChanged)
-                        ->Attribute(AZ::Edit::Attributes::RemoveNotify, &EditorNavigationAreaComponent::OnNavigationAreaChanged)
-                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorNavigationAreaComponent::OnNavigationAreaChanged)
-                        ;
-            }
-        }
-    }
-
-    EditorNavigationAreaComponent::EditorNavigationAreaComponent()
-        : m_navigationAreaChanged([this]() { UpdateMeshes(); ApplyExclusion(); })
-    {
-    }
-
-    EditorNavigationAreaComponent::~EditorNavigationAreaComponent()
-    {
-        DestroyArea();
-    }
-
-    void EditorNavigationAreaComponent::Activate()
-    {
-        EditorComponentBase::Activate();
-
-        const AZ::EntityId entityId = GetEntityId();
-        AZ::TransformNotificationBus::Handler::BusConnect(entityId);
-        ShapeComponentNotificationsBus::Handler::BusConnect(entityId);
-        NavigationAreaRequestBus::Handler::BusConnect(entityId);
-        AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
-        AzToolsFramework::EntityCompositionNotificationBus::Handler::BusConnect();
-        AZ::TickBus::Handler::BusConnect();
-
-        // use the entity id as unique name to register area
-        m_name = GetEntityId().ToString();
-
-        INavigationSystem* aiNavigation = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-        if (aiNavigation)
-        {
-            // we only wish to register new areas (this area may have been
-            // registered when the navmesh was loaded at level load)
-            if (!aiNavigation->IsAreaPresent(m_name.c_str()))
-            {
-                aiNavigation->RegisterArea(m_name.c_str());
-            }
-        }
-
-        // reset switching to game mode on activate
-        m_switchingToGameMode = false;
-
-        // We must relink during entity activation or the NavigationSystem will throw 
-        // errors in SpawnJob. Don't force an unnecessary update of the game area.  
-        // RelinkWithMesh will still update the game area if the volume hasn't been created.
-        const bool updateGameArea = false;
-        RelinkWithMesh(updateGameArea);
-    }
-
-    void EditorNavigationAreaComponent::Deactivate()
-    {
-        // only destroy the area if we know we're not currently switching to game mode
-        // or changing our composition during scrubbing
-        if (!m_switchingToGameMode && !m_compositionChanging)
-        {
-            DestroyArea();
-        }
-
-        const AZ::EntityId entityId = GetEntityId();
-        AZ::TransformNotificationBus::Handler::BusDisconnect(entityId);
-        ShapeComponentNotificationsBus::Handler::BusDisconnect(entityId);
-        NavigationAreaRequestBus::Handler::BusDisconnect(entityId);
-        AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
-        AzToolsFramework::EntityCompositionNotificationBus::Handler::BusDisconnect();
-        AZ::TickBus::Handler::BusDisconnect();
-
-        EditorComponentBase::Deactivate();
-    }
-
-    void EditorNavigationAreaComponent::OnNavigationEvent(const INavigationSystem::ENavigationEvent event)
-    {
-        switch (event)
-        {
-        case INavigationSystem::MeshReloaded:
-        case INavigationSystem::NavigationCleared:
-            RelinkWithMesh(true);
-            break;
-        case INavigationSystem::MeshReloadedAfterExporting:
-            RelinkWithMesh(false);
-            break;
-        default:
-            AZ_Assert(false, "Unhandled ENavigationEvent: %d", event);
-            break;
-        }
-    }
-
-    void EditorNavigationAreaComponent::OnShapeChanged(ShapeChangeReasons /*changeReason*/)
-    {
-        UpdateGameArea();
-    }
-
-    void EditorNavigationAreaComponent::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& /*world*/)
-    {
-        UpdateGameArea();
-    }
-
-    void EditorNavigationAreaComponent::RefreshArea()
-    {
-        UpdateGameArea();
-    }
-
-    void EditorNavigationAreaComponent::UpdateGameArea()
-    {
-        using namespace PolygonPrismUtil;
-
-        AZ::Transform transform = AZ::Transform::CreateIdentity();
-        AZ::TransformBus::EventResult(transform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
-
-        AZ::ConstPolygonPrismPtr polygonPrismPtr = nullptr;
-        PolygonPrismShapeComponentRequestBus::EventResult(polygonPrismPtr, GetEntityId(), &PolygonPrismShapeComponentRequests::GetPolygonPrism);
-
-        if (!polygonPrismPtr)
-        {
-            AZ_Error("EditorNavigationAreaComponent", false, "Polygon prism does not exist for navigation area.");
-            return;
-        }
-
-        const AZ::PolygonPrism& polygonPrism = *polygonPrismPtr;
-
-        INavigationSystem* aiNavigation = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-        if (aiNavigation)
-        {
-            const size_t vertexCount = polygonPrism.m_vertexContainer.Size();
-            const AZStd::vector<AZ::Vector2>& verticesLocal = polygonPrism.m_vertexContainer.GetVertices();
-
-            if (vertexCount > 2)
-            {
-                AZStd::vector<AZ::Vector3> verticesWorld;
-                verticesWorld.reserve(vertexCount);
-
-                for (size_t i = 0; i < vertexCount; ++i)
-                {
-                    verticesWorld.push_back(transform.TransformPoint(AZ::Vector3(verticesLocal[i])));
-                }
-
-                // The volume could be set but if the binary data didn't exist the volume was not correctly recreated
-                if (!NavVolumeValid(NavigationVolumeID(m_volume)) || !aiNavigation->ValidateVolume(NavigationVolumeID(m_volume)))
-                {
-                    CreateVolume(&verticesWorld[0], verticesWorld.size(), NavigationVolumeID(m_volume));
-                }
-                else
-                {
-                    AZStd::vector<Vec3> cryVertices;
-                    cryVertices.reserve(vertexCount);
-
-                    for (size_t i = 0; i < vertexCount; ++i)
-                    {
-                        cryVertices.push_back(AZVec3ToLYVec3(verticesWorld[i]));
-                    }
-
-                    aiNavigation->SetVolume(NavigationVolumeID(m_volume), &cryVertices[0], cryVertices.size(), polygonPrism.GetHeight());
-                }
-
-                UpdateMeshes();
-                ApplyExclusion();
-            }
-            else if (NavVolumeValid(NavigationVolumeID(m_volume)))
-            {
-                DestroyArea();
-            }
-        }
-    }
-
-    void EditorNavigationAreaComponent::UpdateMeshes()
-    {
-        INavigationSystem* aiNavigation = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-        if (aiNavigation)
-        {
-            if (m_exclusion)
-            {
-                DestroyMeshes();
-            }
-            else
-            {
-                const size_t agentTypeCount = m_agentTypes.size();
-                m_meshes.resize(agentTypeCount);
-
-                for (size_t i = 0; i < agentTypeCount; ++i)
-                {
-                    NavigationMeshID meshId = NavigationMeshID(m_meshes[i]);
-                    const NavigationAgentTypeID agentTypeId = aiNavigation->GetAgentTypeID(m_agentTypes[i].c_str());
-
-                    if (NavAgentValid(agentTypeId) && !meshId)
-                    {
-                        INavigationSystem::CreateMeshParams params; // TODO: expose at least the tile size
-                        meshId = aiNavigation->CreateMesh(m_name.c_str(), agentTypeId, params);
-                        aiNavigation->SetMeshBoundaryVolume(meshId, NavigationVolumeID(m_volume));
-
-                        AZ::Transform transform = AZ::Transform::CreateIdentity();
-                        AZ::TransformBus::EventResult(transform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
-
-                        AZ::ConstPolygonPrismPtr polygonPrismPtr;
-                        PolygonPrismShapeComponentRequestBus::EventResult(polygonPrismPtr, GetEntityId(), &PolygonPrismShapeComponentRequests::GetPolygonPrism);
-
-                        const AZ::PolygonPrism& polygonPrism = *polygonPrismPtr;
-                        aiNavigation->QueueMeshUpdate(meshId, AZAabbToLyAABB(PolygonPrismUtil::CalculateAabb(polygonPrism, transform)));
-
-                        m_meshes[i] = meshId;
-                    }
-                    else if (!NavAgentValid(agentTypeId) && meshId)
-                    {
-                        aiNavigation->DestroyMesh(meshId);
-                        m_meshes[i] = 0;
-                    }
-                }
-            }
-        }
-    }
-
-    void EditorNavigationAreaComponent::ApplyExclusion()
-    {
-        INavigationSystem* aiNavigation = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-        if (aiNavigation)
-        {
-            std::vector<NavigationAgentTypeID> affectedAgentTypes;
-
-            if (m_exclusion)
-            {
-                const size_t agentTypeCount = m_agentTypes.size();
-                affectedAgentTypes.reserve(agentTypeCount);
-
-                for (size_t i = 0; i < agentTypeCount; ++i)
-                {
-                    NavigationAgentTypeID agentTypeID = aiNavigation->GetAgentTypeID(m_agentTypes[i].c_str());
-                    affectedAgentTypes.push_back(agentTypeID);
-                }
-            }
-
-            if (affectedAgentTypes.empty())
-            {
-                // this will remove this volume from all agent type and mesh exclusion containers
-                aiNavigation->SetExclusionVolume(0, 0, NavigationVolumeID(m_volume));
-            }
-            else
-            {
-                aiNavigation->SetExclusionVolume(&affectedAgentTypes[0], affectedAgentTypes.size(), NavigationVolumeID(m_volume));
-            }
-        }
-    }
-
-    void EditorNavigationAreaComponent::RelinkWithMesh(bool updateGameArea)
-    {
-        INavigationSystem* aiNavigation = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-        if (aiNavigation)
-        {
-            m_volume = aiNavigation->GetAreaId(m_name.c_str());
-
-            if (!m_exclusion)
-            {
-                const size_t agentTypeCount = m_agentTypes.size();
-                m_meshes.resize(agentTypeCount);
-
-                for (size_t i = 0; i < agentTypeCount; ++i)
-                {
-                    const NavigationAgentTypeID agentTypeId = aiNavigation->GetAgentTypeID(m_agentTypes[i].c_str());
-                    m_meshes[i] = aiNavigation->GetMeshID(m_name.c_str(), agentTypeId);
-                }
-            }
-
-            // Update the game area if requested or in the case that the volume doesn't exist yet.
-            // This can happen when a volume doesn't have an associated mesh which is always the  
-            // case with exclusion volumes.
-            if (updateGameArea || !aiNavigation->ValidateVolume(NavigationVolumeID(m_volume)))
-            {
-                UpdateGameArea();
-            }
-        }
-    }
-
-    void EditorNavigationAreaComponent::CreateVolume(AZ::Vector3* vertices, size_t vertexCount, NavigationVolumeID requestedID)
-    {
-        INavigationSystem* aiNavigation = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-        if (aiNavigation)
-        {
-            AZStd::vector<Vec3> cryVertices;
-            cryVertices.reserve(vertexCount);
-
-            for (size_t i = 0; i < vertexCount; ++i)
-            {
-                cryVertices.push_back(AZVec3ToLYVec3(vertices[i]));
-            }
-
-            AZ::ConstPolygonPrismPtr polygonPrismPtr;
-            PolygonPrismShapeComponentRequestBus::EventResult(polygonPrismPtr, GetEntityId(), &PolygonPrismShapeComponentRequests::GetPolygonPrism);
-
-            const AZ::PolygonPrism& polygonPrism = *polygonPrismPtr;
-            m_volume = aiNavigation->CreateVolume(cryVertices.begin(), vertexCount, polygonPrism.GetHeight(), requestedID);
-            aiNavigation->RegisterListener(this, m_name.c_str());
-
-            if (!NavVolumeValid(requestedID))
-            {
-                aiNavigation->SetAreaId(m_name.c_str(), NavigationVolumeID(m_volume));
-            }
-        }
-    }
-
-    void EditorNavigationAreaComponent::DestroyVolume()
-    {
-        INavigationSystem* aiNavigation = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-        if (aiNavigation)
-        {
-            if (NavVolumeValid(NavigationVolumeID(m_volume)))
-            {
-                aiNavigation->DestroyVolume(NavigationVolumeID(m_volume));
-                aiNavigation->UnRegisterListener(this);
-
-                m_volume = NavigationVolumeID();
-            }
-        }
-    }
-
-    void EditorNavigationAreaComponent::DestroyMeshes()
-    {
-        INavigationSystem* aiNavigation = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-        if (aiNavigation)
-        {
-            for (size_t i = 0; i < m_meshes.size(); ++i)
-            {
-                if (NavMeshValid(NavigationMeshID(m_meshes[i])))
-                {
-                    aiNavigation->DestroyMesh(NavigationMeshID(m_meshes[i]));
-                }
-            }
-
-            m_meshes.clear();
-        }
-    }
-
-    void EditorNavigationAreaComponent::DestroyArea()
-    {
-        INavigationSystem* aiNavigation = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-        if (aiNavigation)
-        {
-            aiNavigation->UnRegisterArea(m_name.c_str());
-            DestroyMeshes();
-            DestroyVolume();
-        }
-    }
-
-    void EditorNavigationAreaComponent::OnStartPlayInEditorBegin()
-    {
-        m_switchingToGameMode = true;
-    }
-
-    void EditorNavigationAreaComponent::OnEntityCompositionChanging(const AzToolsFramework::EntityIdList& entityIds)
-    {
-        if (AZStd::find(entityIds.begin(), entityIds.end(), GetEntityId()) != entityIds.end())
-        {
-            m_compositionChanging = true;
-        }
-    }
-
-    void EditorNavigationAreaComponent::OnEntityCompositionChanged(const AzToolsFramework::EntityIdList& entityIds)
-    {
-        if (AZStd::find(entityIds.begin(), entityIds.end(), GetEntityId()) != entityIds.end())
-        {
-            m_compositionChanging = false;
-        }
-    }
-
-    void EditorNavigationAreaComponent::OnTick(float /*deltaTime*/, AZ::ScriptTimePoint /*time*/)
-    {
-        m_compositionChanging = false;
-
-        // disconnect from the composition and tick bus because we no longer need to
-        // be concerned with entity scrubbing causing our navigation area to get rebuilt
-        AzToolsFramework::EntityCompositionNotificationBus::Handler::BusDisconnect();
-        AZ::TickBus::Handler::BusDisconnect();
-    }
-
-} // namespace LmbrCentral

Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.h

@@ -1,123 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/Component/TransformBus.h>
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <AzToolsFramework/API/EntityCompositionNotificationBus.h>
-#include <LmbrCentral/Shape/ShapeComponentBus.h>
-#include <LmbrCentral/Ai/NavigationAreaBus.h>
-#include <AzCore/Component/TickBus.h>
-
-// ISerialize.h required by INavigationSystem.h
-#include <ISerialize.h>
-#include <INavigationSystem.h>
-
-namespace AZ
-{
-    class PolygonPrism;
-    class SerializeContext;
-    class Vector3;
-}
-
-namespace LmbrCentral
-{
-    /**
-     * EditorNavigationAreaComponent makes use of PolygonPrismShape to construct a volume to generate
-     * a Nav Mesh for the terrain to be used by AI characters for navigation.
-     */
-    class EditorNavigationAreaComponent
-        : public AzToolsFramework::Components::EditorComponentBase
-        , public INavigationSystem::INavigationSystemListener
-        , private ShapeComponentNotificationsBus::Handler
-        , private AZ::TransformNotificationBus::Handler
-        , private NavigationAreaRequestBus::Handler
-        , private AzToolsFramework::EditorEntityContextNotificationBus::Handler
-        , private AzToolsFramework::EntityCompositionNotificationBus::Handler
-        , private AZ::TickBus::Handler
-    {
-    public:
-        AZ_COMPONENT(EditorNavigationAreaComponent, "{8391FF77-7F4E-4576-9617-37793F88C5DA}", AzToolsFramework::Components::EditorComponentBase);
-
-        EditorNavigationAreaComponent();
-        ~EditorNavigationAreaComponent() override;
-
-    protected:
-        // AZ::Component
-        void Activate() override;
-        void Deactivate() override;
-
-    private:
-        // ShapeComponentNotificationsBus::Handler
-        void OnShapeChanged(ShapeChangeReasons changeReason) override;
-
-        // TransformNotificationBus
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-
-        // NavigationAreaRequestBus
-        void RefreshArea() override;
-
-        // INavigationSystemListener
-        void OnNavigationEvent(const INavigationSystem::ENavigationEvent event) override;
-
-        // EditorNavigationAreaComponent
-        void UpdateGameArea();
-        void RelinkWithMesh(bool updateGameArea);
-        void UpdateMeshes();
-        void ApplyExclusion();
-        void DestroyVolume();
-        void DestroyMeshes();
-        void CreateVolume(AZ::Vector3* vertices, size_t vertexCount, NavigationVolumeID requestedID);
-        void DestroyArea();
-        
-        // EditorEntityContextNotificationBus
-        void OnStartPlayInEditorBegin() override;
-
-        // EntityCompositionNotificationBus 
-        void OnEntityCompositionChanging(const AzToolsFramework::EntityIdList& entityIds) override;
-        void OnEntityCompositionChanged(const AzToolsFramework::EntityIdList& entityIds) override;
-
-        // TickBus
-        void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
-
-        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
-        {
-            provided.push_back(AZ_CRC("NavigationAreaService", 0xd6ec6566));
-        }
-
-        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
-        {
-            required.push_back(AZ_CRC("PolygonPrismShapeService", 0x1cbc4ed4));
-        }
-
-        static void Reflect(AZ::ReflectContext* context);
-
-        /**
-         * Called when editor property grid values are modified to ensure navigation area updates correctly.
-         */
-        void OnNavigationAreaChanged() const
-        {
-            if (m_navigationAreaChanged)
-            {
-                m_navigationAreaChanged();
-            }
-        }
-
-        AZStd::vector<AZStd::string> m_agentTypes; ///< Define a list of AgentTypes corresponding to those defined in Scripts/AI/Navigation.xml.
-        AZStd::vector<AZ::u32> m_meshes; ///< NavigationMeshID - vector of mesh ids for each AgentType.
-        AZStd::string m_name; ///< Name used to register volume (currently Entity name).
-        AZ::u32 m_volume = 0; ///< NavigationVolumeID - id of created nav mesh volume.
-        bool m_exclusion = false; ///< Is this area an exclusion volume or not (should it add or subtract from the nav mesh).
-        AZStd::function<void()> m_navigationAreaChanged = nullptr; ///< Callback when the navigation area is modified.
-
-        bool m_switchingToGameMode = false; ///< Set if GameView was started so we know not to destroy navigation areas in Deactivate.
-        bool m_compositionChanging = false; ///< Set if composition is changing so we know not to destroy navigation areas while scrubbing.
-    };
-} // namespace LmbrCentral

Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp

@@ -1,99 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorNavigationSeedComponent.h"
-#include "EditorNavigationUtil.h"
-
-// Cry pathfinding system
-#include <INavigationSystem.h>
-#include <MathConversion.h>
-
-#include <AzCore/Component/TransformBus.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-
-namespace LmbrCentral
-{
-    void EditorNavigationSeedComponent::Reflect(AZ::ReflectContext* context)
-    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
-        {
-            serializeContext->Class<EditorNavigationSeedComponent, AzToolsFramework::Components::EditorComponentBase>()
-                ->Version(1)
-                ->Field("Agent Type", &EditorNavigationSeedComponent::m_agentType);
-
-            if (auto editContext = serializeContext->GetEditContext())
-            {
-                editContext->Class<EditorNavigationSeedComponent>("Navigation Seed", "Determines reachable navigation nodes")
-                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::AddableByUser, false)
-                        ->Attribute(AZ::Edit::Attributes::Category, "AI")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NavigationSeed.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NavigationSeed.svg")
-                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/ai/nav-seed/")
-                    ->DataElement(AZ::Edit::UIHandlers::ComboBox, &EditorNavigationSeedComponent::m_agentType, "Agent Type", "Describes the type of the Entity for navigation purposes.")
-                        ->Attribute(AZ::Edit::Attributes::StringList, &PopulateAgentTypeList)
-                        ->Attribute("ChangeNotify", &EditorNavigationSeedComponent::OnAgentTypeChanged);
-            }
-        }
-    }
-
-    void EditorNavigationSeedComponent::TriggerReachaibilityRecalculation() const
-    {
-        // We have to call the legacy method to account for Legacy seeds that might be out there
-        INavigationSystem* navigationSystem = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-        if (navigationSystem)
-        {
-            navigationSystem->CalculateAccessibility();
-        }
-    }
-
-    AZ::u32 EditorNavigationSeedComponent::OnAgentTypeChanged() const
-    {
-        TriggerReachaibilityRecalculation();
-        return AZ_CRC("RefreshNone", 0x98a5045b);
-    }
-
-    void EditorNavigationSeedComponent::RecalculateReachabilityAroundSelf()
-    {
-        AZ::Vector3 translation = AZ::Vector3::CreateZero();
-        AZ::TransformBus::EventResult(translation, m_entity->GetId(), &AZ::TransformInterface::GetWorldTranslation);
-        
-        INavigationSystem* navigationSystem = nullptr; // INavigationSystem will be converted to an AZInterface (LY-111343)
-        if (navigationSystem)
-        {
-            auto agentType = navigationSystem->GetAgentTypeID(m_agentType.c_str());
-            navigationSystem->ComputeAccessibility(AZVec3ToLYVec3(translation), agentType);
-        }
-    }
-
-    void EditorNavigationSeedComponent::OnTransformChanged(const AZ::Transform&, const AZ::Transform&)
-    {
-        TriggerReachaibilityRecalculation();
-    }
-
-    void EditorNavigationSeedComponent::Activate()
-    {
-        Base::Activate();
-
-        NavigationSeedRequestsBus::Handler::BusConnect();
-        AZ::TransformNotificationBus::Handler::BusConnect(m_entity->GetId());
-
-        TriggerReachaibilityRecalculation();
-    }
-
-    void EditorNavigationSeedComponent::Deactivate()
-    {
-        Base::Deactivate();
-
-        NavigationSeedRequestsBus::Handler::BusDisconnect();
-        AZ::TransformNotificationBus::Handler::BusDisconnect(m_entity->GetId());
-    }
-} // LmbrCentral

Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.h

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include <AzCore/Component/TransformBus.h>
-#include <LmbrCentral/Ai/NavigationSeedBus.h>
-
-namespace LmbrCentral
-{
-    class EditorNavigationSeedComponent
-        : public AzToolsFramework::Components::EditorComponentBase
-        , private NavigationSeedRequestsBus::Handler
-        , private AZ::TransformNotificationBus::Handler
-    {
-        using Base = AzToolsFramework::Components::EditorComponentBase;
-
-    public:
-        AZ_EDITOR_COMPONENT(EditorNavigationSeedComponent, "{A836E9F7-0C5A-4397-AD01-523EBC1E41A5}");
-        EditorNavigationSeedComponent() = default;
-
-    protected:
-        void Activate() override;
-        void Deactivate() override;
-
-        static void Reflect(AZ::ReflectContext* context);
-
-    private:
-        AZStd::string m_agentType;
-
-        void TriggerReachaibilityRecalculation() const;
-        AZ::u32 OnAgentTypeChanged() const;
-
-        // NavigationSeedRequestBus
-        void RecalculateReachabilityAroundSelf() override;
-
-        // TransformNotificationBus
-        void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
-    };
-} // namespace LmbrCentral