birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18

Browse Source
This commit is contained in:
nvsickle
2021-06-18 13:25:53 -07:00
parent 34e64ca5b0 7486488b60
commit e55580af57
578 changed files with 19526 additions and 20039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Source/RPI.Builders/BuilderComponent.cpp
-14
View File
@@ -99,20 +99,6 @@ namespace AZ
m_assetHandlers.emplace_back(MakeAssetHandler<ShaderVariantTreeAssetHandler>());
m_assetHandlers.emplace_back(MakeAssetHandler<SkinMetaAssetHandler>());
m_assetHandlers.emplace_back(MakeAssetHandler<MorphTargetMetaAssetHandler>());
RPI::MaterialFunctorSourceDataRegistration* materialFunctorRegistration = RPI::MaterialFunctorSourceDataRegistration::Get();
AZ_Assert(materialFunctorRegistration,
"MaterialFunctorSourceDataRegistration must be added to a component of the current module, "
"and initialize it in the component's Init() call.");
materialFunctorRegistration->RegisterMaterialFunctor("Lua", azrtti_typeid<LuaMaterialFunctorSourceData>());
// Add asset types and extensions to AssetCatalog. Uses "AssetCatalogService".
auto assetCatalog = AZ::Data::AssetCatalogRequestBus::FindFirstHandler();
if (assetCatalog)
{
assetCatalog->EnableCatalogForAsset(AZ::AzTypeInfo<AZ::ScriptAsset>::Uuid());
}
}
void BuilderComponent::Deactivate()