Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
@@ -117,7 +117,7 @@ namespace ScriptEvents
}
m_assetHandler = AZStd::make_unique<ScriptEventAssetRuntimeHandler>(ScriptEvents::ScriptEventsAsset::GetDisplayName(),
ScriptEvents::ScriptEventsAsset::GetGroup(), ScriptEvents::ScriptEventsAsset::GetFileExtension(),
ScriptEvents::ScriptEventsAsset::GetGroup(), ScriptEvents::ScriptEventsAsset::GetFileFilter(),
AZ::AzTypeInfo<ScriptEvents::ScriptEventsSystemComponent>::Uuid());
AZ::Data::AssetManager::Instance().RegisterHandler(m_assetHandler.get(), assetType);
@@ -126,7 +126,7 @@ namespace ScriptEvents
AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddAssetType, assetType);
AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::EnableCatalogForAsset, assetType);
AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddExtension,
ScriptEvents::ScriptEventsAsset::GetFileExtension());
ScriptEvents::ScriptEventsAsset::GetFileFilter());
}
void ScriptEventsSystemComponentRuntimeImpl::UnregisterAssetHandler()