Merge remote-tracking branch 'origin/point-release/25051' into merge_point-release_25051

Signed-off-by: Jan Hanca <[email protected]>

Gems/ROS2/CMakeLists.txt

@@ -10,9 +10,6 @@ if (NOT gem_name)
     set(gem_name "ROS2")
 endif()
 
-# Add pip requirements required for ros2 packages.
-update_pip_requirements(${CMAKE_CURRENT_LIST_DIR}/requirements.txt ROS2)
-
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/Code")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE)
 

Gems/ROS2/Code/Source/Frame/ROS2FrameEditorComponent.cpp

@@ -39,12 +39,18 @@ namespace ROS2
     {
         ROS2FrameComponentBus::Handler::BusConnect(GetEntityId());
         AZ::EntityBus::Handler::BusConnect(GetEntityId());
-        ROS2FrameSystemInterface::Get()->RegisterFrame(GetEntityId());
+        if (auto* frameSystemInterface = ROS2FrameSystemInterface::Get())
+        {
+            frameSystemInterface->RegisterFrame(GetEntityId());
+        }
     }
 
     void ROS2FrameEditorComponent::Deactivate()
     {
-        ROS2FrameSystemInterface::Get()->UnregisterFrame(GetEntityId());
+        if (auto* frameSystemInterface = ROS2FrameSystemInterface::Get())
+        {
+            frameSystemInterface->UnregisterFrame(GetEntityId());
+        }
         AZ::EntityBus::Handler::BusDisconnect();
         ROS2FrameComponentBus::Handler::BusDisconnect();
     }

Gems/ROS2/Code/Source/Frame/ROS2FrameSystemBus.h

@@ -7,13 +7,13 @@
  */
 #pragma once
 
+#include <AzCore/Component/EntityId.h>
+#include <AzCore/EBus/EBus.h>
 #include <AzCore/EBus/Policies.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/RTTI/RTTIMacros.h>
 #include <AzCore/std/string/string.h>
 #include <ROS2/Frame/ROS2FrameComponent.h>
-#include <AzCore/Component/EntityId.h>
-#include <AzCore/EBus/EBus.h>
 
 namespace ROS2
 {
@@ -66,7 +66,7 @@ namespace ROS2
     {
     public:
         static constexpr AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-        static constexpr AZ::EBusHandlerPolicy AddressPolicy = AZ::EBusHandlerPolicy::Single;
+        static constexpr AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
     };
 
     using ROS2FrameSystemInterface = AZ::Interface<ROS2FrameSystemRequests>;

Gems/ROS2/Code/Source/Frame/ROS2FrameSystemComponent.cpp

@@ -72,7 +72,8 @@ namespace ROS2
     {
         if (AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context))
         {
-            serialize->Class<ROS2FrameSystemComponent, AZ::Component>();
+            serialize->Class<ROS2FrameSystemComponent, AZ::Component>()->Version(1)->Attribute(
+                AZ::Edit::Attributes::SystemComponentTags, AZStd::vector<AZ::Crc32>({ AZ_CRC_CE("AssetBuilder") }));
         }
     }
 

Gems/ROS2/gem.json

@@ -1,6 +1,6 @@
 {
     "gem_name": "ROS2",
-    "version": "3.3.0",
+    "version": "3.3.1",
     "display_name": "ROS2",
     "license": "Apache-2.0",
     "license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -38,5 +38,5 @@
     "engine_api_dependencies": [],
     "restricted": "ROS2",
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2-3.3.0-gem.zip"
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2-3.3.1-gem.zip"
 }

Gems/ROS2/requirements.txt

@@ -1,2 +0,0 @@
-pyyaml==5.3
-lark==1.1.1

Gems/ROS2SampleRobots/Assets/RosbotXL/ROSbotXL.prefab

@@ -602,16 +602,20 @@
                     "Id": 2016576711781101659,
                     "Controller": {
                         "Configuration": {
-                            "materials": {
-                                "{}": {
-                                    "MaterialAsset": {
-                                        "assetId": {
-                                            "guid": "{5B369E33-6E01-5794-9DB2-7CEFC2B205D5}"
-                                        },
-                                        "assetHint": "rosbotxl/models/materials/rosbotxl_antenna_plasticmatteblack.azmaterial"
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 3551515046
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{BC08A50C-9CCD-587F-B2B5-9DB0EF6907DF}"
+                                            }
+                                        }
                                     }
                                 }
-                            }
+                            ]
                         }
                     }
                 }
@@ -1452,16 +1456,21 @@
                     "Id": 17880601295840825835,
                     "Controller": {
                         "Configuration": {
-                            "materials": {
-                                "{}": {
-                                    "MaterialAsset": {
-                                        "assetId": {
-                                            "guid": "{5B369E33-6E01-5794-9DB2-7CEFC2B205D5}"
-                                        },
-                                        "assetHint": "rosbotxl/models/materials/rosbotxl_antenna_plasticmatteblack.azmaterial"
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2725144250
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{5B369E33-6E01-5794-9DB2-7CEFC2B205D5}"
+                                            },
+                                            "assetHint": "rosbotxl/models/materials/rosbotxl_antenna_plasticmatteblack.azmaterial"
+                                        }
                                     }
                                 }
-                            }
+                            ]
                         }
                     }
                 }

Gems/ROS2SampleRobots/gem.json

@@ -1,6 +1,6 @@
 {
     "gem_name": "ROS2SampleRobots",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "display_name": "ROS2 Sample Robots",
     "license": "Apache-2.0 or MIT",
     "license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -30,5 +30,5 @@
     ],
     "engine_api_dependencies": [],
     "restricted": "ROS2SampleRobots",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2samplerobots-1.0.0-gem.zip"
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2samplerobots-1.0.1-gem.zip"
 }

Gems/WarehouseAssets/Assets/Prefabs/WarehouseScene_small.prefab

@@ -1183,142 +1183,6 @@
                 }
             }
         },
-        "Entity_[917866002800546]": {
-            "Id": "Entity_[917866002800546]",
-            "Name": "Front_gate",
-            "Components": {
-                "Component_[10813453887359688918]": {
-                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
-                    "Id": 10813453887359688918,
-                    "Parent Entity": "Entity_[918432938483618]",
-                    "Transform Data": {
-                        "Translate": [
-                            39.78621292114258,
-                            1.0,
-                            0.0
-                        ],
-                        "Rotate": [
-                            0.0,
-                            0.0,
-                            -179.99989318847656
-                        ]
-                    }
-                },
-                "Component_[11235052944295479876]": {
-                    "$type": "EditorStaticRigidBodyComponent",
-                    "Id": 11235052944295479876
-                },
-                "Component_[18360744952719232820]": {
-                    "$type": "EditorEntitySortComponent",
-                    "Id": 18360744952719232820
-                },
-                "Component_[2298197826914367238]": {
-                    "$type": "EditorLockComponent",
-                    "Id": 2298197826914367238
-                },
-                "Component_[3149718320647090514]": {
-                    "$type": "EditorVisibilityComponent",
-                    "Id": 3149718320647090514,
-                    "VisibilityFlag": false
-                },
-                "Component_[4932017064714589766]": {
-                    "$type": "EditorEntityIconComponent",
-                    "Id": 4932017064714589766
-                },
-                "Component_[7017245480046407512]": {
-                    "$type": "EditorDisabledCompositionComponent",
-                    "Id": 7017245480046407512,
-                    "DisabledComponents": {
-                        "Component_[10232715223514738948]": {
-                            "$type": "AZ::Render::EditorMeshComponent",
-                            "Id": 10232715223514738948,
-                            "Controller": {
-                                "Configuration": {
-                                    "ModelAsset": {
-                                        "assetId": {
-                                            "guid": "{34CA9168-D5C7-5554-BE7D-8485A3D67AB6}",
-                                            "subId": 279103289
-                                        },
-                                        "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.fbx.azmodel"
-                                    }
-                                }
-                            }
-                        },
-                        "Component_[1554132197757752789]": {
-                            "$type": "EditorColliderComponent",
-                            "Id": 1554132197757752789,
-                            "ColliderConfiguration": {
-                                "MaterialSlots": {
-                                    "Slots": [
-                                        {
-                                            "Name": "MWarehouseModules"
-                                        }
-                                    ]
-                                }
-                            },
-                            "ShapeConfiguration": {
-                                "PhysicsAsset": {
-                                    "Asset": {
-                                        "assetId": {
-                                            "guid": "{34CA9168-D5C7-5554-BE7D-8485A3D67AB6}",
-                                            "subId": 3814177680
-                                        },
-                                        "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.pxmesh"
-                                    },
-                                    "Configuration": {
-                                        "PhysicsAsset": {
-                                            "assetId": {
-                                                "guid": "{34CA9168-D5C7-5554-BE7D-8485A3D67AB6}",
-                                                "subId": 3814177680
-                                            },
-                                            "loadBehavior": "QueueLoad",
-                                            "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.pxmesh"
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                "Component_[8212625672736002681]": {
-                    "$type": "EditorPendingCompositionComponent",
-                    "Id": 8212625672736002681,
-                    "PendingComponents": {
-                        "Component_[11718397946111790072]": {
-                            "$type": "EditorMaterialComponent",
-                            "Id": 11718397946111790072,
-                            "Controller": {
-                                "Configuration": {
-                                    "materials": [
-                                        {
-                                            "Key": {
-                                                "materialSlotStableId": 103484566
-                                            },
-                                            "Value": {
-                                                "MaterialAsset": {
-                                                    "assetId": {
-                                                        "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
-                                                    },
-                                                    "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
-                                                }
-                                            }
-                                        }
-                                    ]
-                                }
-                            }
-                        }
-                    }
-                },
-                "Component_[9253383058600544919]": {
-                    "$type": "EditorInspectorComponent",
-                    "Id": 9253383058600544919
-                },
-                "Component_[9529209697264184359]": {
-                    "$type": "EditorOnlyEntityComponent",
-                    "Id": 9529209697264184359
-                }
-            }
-        },
         "Entity_[917870297767842]": {
             "Id": "Entity_[917870297767842]",
             "Name": "circle",
@@ -1574,158 +1438,6 @@
                 }
             }
         },
-        "Entity_[917887477637026]": {
-            "Id": "Entity_[917887477637026]",
-            "Name": "Gate",
-            "Components": {
-                "Component_[13600490855520413730]": {
-                    "$type": "EditorLockComponent",
-                    "Id": 13600490855520413730
-                },
-                "Component_[15167189095873685279]": {
-                    "$type": "EditorInspectorComponent",
-                    "Id": 15167189095873685279
-                },
-                "Component_[17614188821325671055]": {
-                    "$type": "EditorDisabledCompositionComponent",
-                    "Id": 17614188821325671055,
-                    "DisabledComponents": {
-                        "Component_[10387122939797774050]": {
-                            "$type": "AZ::Render::EditorMeshComponent",
-                            "Id": 10387122939797774050,
-                            "Controller": {
-                                "Configuration": {
-                                    "ModelAsset": {
-                                        "assetId": {
-                                            "guid": "{9F3790A0-9383-5BBA-BB91-2AD9F04086B3}",
-                                            "subId": 279508339
-                                        },
-                                        "assetHint": "assets/warehouse/models/warehouse_gate_closed.fbx.azmodel"
-                                    }
-                                }
-                            }
-                        },
-                        "Component_[16809483465388003559]": {
-                            "$type": "EditorColliderComponent",
-                            "Id": 16809483465388003559,
-                            "ColliderConfiguration": {
-                                "MaterialSlots": {
-                                    "Slots": [
-                                        {
-                                            "Name": "MWarehouseGate"
-                                        },
-                                        {
-                                            "Name": "MWarehouseModules"
-                                        }
-                                    ]
-                                }
-                            },
-                            "ShapeConfiguration": {
-                                "PhysicsAsset": {
-                                    "Asset": {
-                                        "assetId": {
-                                            "guid": "{9F3790A0-9383-5BBA-BB91-2AD9F04086B3}",
-                                            "subId": 675098786
-                                        },
-                                        "assetHint": "assets/warehouse/models/warehouse_gate_closed.pxmesh"
-                                    },
-                                    "Configuration": {
-                                        "PhysicsAsset": {
-                                            "assetId": {
-                                                "guid": "{9F3790A0-9383-5BBA-BB91-2AD9F04086B3}",
-                                                "subId": 675098786
-                                            },
-                                            "loadBehavior": "QueueLoad",
-                                            "assetHint": "assets/warehouse/models/warehouse_gate_closed.pxmesh"
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                "Component_[17714278481541526192]": {
-                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
-                    "Id": 17714278481541526192,
-                    "Parent Entity": "Entity_[918432938483618]",
-                    "Transform Data": {
-                        "Translate": [
-                            39.78621292114258,
-                            1.0,
-                            0.0
-                        ],
-                        "Rotate": [
-                            0.0,
-                            0.0,
-                            -179.99989318847656
-                        ]
-                    }
-                },
-                "Component_[17751943132203388929]": {
-                    "$type": "EditorVisibilityComponent",
-                    "Id": 17751943132203388929,
-                    "VisibilityFlag": false
-                },
-                "Component_[18437099534701703658]": {
-                    "$type": "EditorOnlyEntityComponent",
-                    "Id": 18437099534701703658
-                },
-                "Component_[5781546573867269447]": {
-                    "$type": "EditorEntitySortComponent",
-                    "Id": 5781546573867269447
-                },
-                "Component_[7578485257791727565]": {
-                    "$type": "EditorEntityIconComponent",
-                    "Id": 7578485257791727565
-                },
-                "Component_[8806906810237163444]": {
-                    "$type": "EditorPendingCompositionComponent",
-                    "Id": 8806906810237163444,
-                    "PendingComponents": {
-                        "Component_[12188643545659218893]": {
-                            "$type": "EditorMaterialComponent",
-                            "Id": 12188643545659218893,
-                            "Controller": {
-                                "Configuration": {
-                                    "materials": [
-                                        {
-                                            "Key": {
-                                                "materialSlotStableId": 103484566
-                                            },
-                                            "Value": {
-                                                "MaterialAsset": {
-                                                    "assetId": {
-                                                        "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
-                                                    },
-                                                    "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
-                                                }
-                                            }
-                                        },
-                                        {
-                                            "Key": {
-                                                "materialSlotStableId": 745211904
-                                            },
-                                            "Value": {
-                                                "MaterialAsset": {
-                                                    "assetId": {
-                                                        "guid": "{06298918-E750-5053-B55B-10D158B1ED8C}"
-                                                    },
-                                                    "assetHint": "assets/warehouse/materials/mwarehousegate.azmaterial"
-                                                }
-                                            }
-                                        }
-                                    ]
-                                }
-                            }
-                        }
-                    }
-                },
-                "Component_[9994022325695796853]": {
-                    "$type": "EditorStaticRigidBodyComponent",
-                    "Id": 9994022325695796853
-                }
-            }
-        },
         "Entity_[917891772604322]": {
             "Id": "Entity_[917891772604322]",
             "Name": "circle",
@@ -3273,19 +2985,23 @@
                 },
                 "EditorMaterialComponent": {
                     "$type": "EditorMaterialComponent",
-                    "Id": 17349375791338578383,
+                    "Id": 8609877608279723647,
                     "Controller": {
                         "Configuration": {
-                            "materials": {
-                                "{}": {
-                                    "MaterialAsset": {
-                                        "assetId": {
-                                            "guid": "{4D881031-88E9-5300-B525-6F6E35182D97}"
-                                        },
-                                        "assetHint": "assets/warehouse/materials/mwarehousemodules_roof.azmaterial"
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 3367833104
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
+                                            }
+                                        }
                                     }
                                 }
-                            }
+                            ]
                         }
                     }
                 }
@@ -4902,9 +4618,9 @@
             "Id": "Entity_[918080751165346]",
             "Name": "Gate",
             "Components": {
-                "Component_[10387122939797774050]": {
+                "AZ::Render::EditorMeshComponent": {
                     "$type": "AZ::Render::EditorMeshComponent",
-                    "Id": 10387122939797774050,
+                    "Id": 2741706271260557178,
                     "Controller": {
                         "Configuration": {
                             "ModelAsset": {
@@ -4917,68 +4633,6 @@
                         }
                     }
                 },
-                "Component_[12188643545659218893]": {
-                    "$type": "EditorMaterialComponent",
-                    "Id": 12188643545659218893,
-                    "Controller": {
-                        "Configuration": {
-                            "materials": [
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 103484566
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
-                                        }
-                                    }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 745211904
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{06298918-E750-5053-B55B-10D158B1ED8C}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehousegate.azmaterial"
-                                        }
-                                    }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 3367833104
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
-                                        }
-                                    }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 3906332078
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{06298918-E750-5053-B55B-10D158B1ED8C}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehousegate.azmaterial"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                },
                 "Component_[13600490855520413730]": {
                     "$type": "EditorLockComponent",
                     "Id": 13600490855520413730
@@ -5063,6 +4717,41 @@
                 "Component_[9994022325695796853]": {
                     "$type": "EditorStaticRigidBodyComponent",
                     "Id": 9994022325695796853
+                },
+                "EditorMaterialComponent": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 8111949087953792883,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 3367833104
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
+                                            }
+                                        }
+                                    }
+                                },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 3906332078
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{06298918-E750-5053-B55B-10D158B1ED8C}"
+                                            },
+                                            "assetHint": "assets/warehouse/materials/mwarehousegate.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
                 }
             }
         },
@@ -10876,8 +10565,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 4977736227609570658,
                     "Child Entity Order": [
-                        "Entity_[917887477637026]",
-                        "Entity_[917866002800546]",
                         "Entity_[918226780053410]"
                     ]
                 },
@@ -13334,4 +13021,4 @@
             ]
         }
     }
-}
+}

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox1.prefab

@@ -98,19 +98,6 @@
                     "Controller": {
                         "Configuration": {
                             "materials": [
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 2919702015
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
-                                        }
-                                    }
-                                },
                                 {
                                     "Key": {
                                         "materialSlotStableId": 4100903441

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox2.prefab

@@ -110,19 +110,6 @@
                                             "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
                                         }
                                     }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 2919702015
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
-                                        }
-                                    }
                                 }
                             ]
                         }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox3.prefab

@@ -110,19 +110,6 @@
                                             "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
                                         }
                                     }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 2919702015
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
-                                        }
-                                    }
                                 }
                             ]
                         }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox4.prefab

@@ -122,19 +122,6 @@
                                             "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
                                         }
                                     }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 2919702015
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
-                                        }
-                                    }
                                 }
                             ]
                         }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_on_wheels.prefab

@@ -88,19 +88,6 @@
                                             "assetHint": "assets/warehouse/materials/mwarehousestorageonwheels.azmaterial"
                                         }
                                     }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 3528137216
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{B59DB34C-8CCC-5B6A-8F32-749689632151}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehousestorageonwheels.azmaterial"
-                                        }
-                                    }
                                 }
                             ]
                         }

Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Walls.prefab

@@ -170,32 +170,6 @@
                     "Controller": {
                         "Configuration": {
                             "materials": [
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 103484566
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
-                                        }
-                                    }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 745211904
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{06298918-E750-5053-B55B-10D158B1ED8C}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehousegate.azmaterial"
-                                        }
-                                    }
-                                },
                                 {
                                     "Key": {
                                         "materialSlotStableId": 3367833104

Gems/WarehouseAssets/gem.json

@@ -1,6 +1,6 @@
 {
     "gem_name": "WarehouseAssets",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "display_name": "WarehouseAssets",
     "license": "Apache-2.0 or MIT",
     "license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -25,7 +25,8 @@
         "o3de-sdk>=2.3.0",
         "o3de>=2.3.0"
     ],
+    "engine_api_dependencies": [],
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
     "restricted": "",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/warehouseassets-2.0.0-gem.zip"
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/warehouseassets-2.0.1-gem.zip"
 }

repo.json

@@ -4,7 +4,7 @@
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
     "summary": "A repository to hold various gems, projects, and templates for the O3DE engine.",
     "additional_info": "Extras gems, projects, and templates for O3DE. See the README.md at the root of this repository for more information",
-    "last_updated": "2025-02-20",
+    "last_updated": "2025-06-30",
     "$schemaVersion": "1.0.0",
     "gems_data": [
         {
@@ -432,7 +432,7 @@
                         "o3de>=2.3.0"
                     ],
                     "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/warehouseassets-2.0.0-gem.zip",
-                    "sha256": "2f983dbf19be64c9de9217cfa88c91b3dc1a59e08d57eb07b348cfbc2fb00f5e"
+                    "sha256": "b91c685ea476523322b2864d17aafc5c6236092f950a4159fe59051d9c9449ce"
                 }
             ]
         },
@@ -7333,7 +7333,7 @@
                         }
                     ],
                     "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2projecttemplate-2.0.1-template.zip",
-                    "sha256": "dd56a62e5fa1cd7d412962382845885170edcc1373c1af4b388331f073404c9d"
+                    "sha256": "c7367b98bd6ee5305eb63e0a256899aa57ee299cb553f4ab2555b8e9fef2100b"
                 },
                 {
                     "version": "2.0.2",