Merge commit '1228738bb2da5ccf7e3d7a1219a90afab5189d6b' into mbalfour/gitflow_211102_o3de

2021-11-02 09:38:09 -05:00
parent 9589bc050d 1228738bb2
commit 122a28c4b4
3 changed files with 2 additions and 11 deletions
@@ -87,6 +87,8 @@ void ScriptSystemComponent::Activate()

    AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddExtension, "lua");
    AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddExtension, "luac");
+    AZ::Data::AssetCatalogRequestBus::Broadcast(
+        &AZ::Data::AssetCatalogRequests::EnableCatalogForAsset, AZ::AzTypeInfo<AZ::ScriptAsset>::Uuid());

    if (Data::AssetManager::Instance().IsReady())
    {