Merge commit 'bc82afa87ac5da739d2b7938242cbdbe4b55dd31' into amzn-tommy/gitflow_211116_o3de2

This commit is contained in:
Tommy Walton
2021-11-16 12:54:42 -08:00
@@ -46,14 +46,6 @@ namespace AZ
{
m_hairAssetBuilder.RegisterBuilder();
m_hairAssetHandler.Register();
// Add asset types and extensions to AssetCatalog.
auto assetCatalog = AZ::Data::AssetCatalogRequestBus::FindFirstHandler();
if (assetCatalog)
{
assetCatalog->EnableCatalogForAsset(azrtti_typeid<HairAsset>());
assetCatalog->AddExtension(AMD::TFXCombinedFileExtension);
}
}
void HairBuilderComponent::Deactivate()