From 15e889a2f6ca010ab2b72ed69313f0e38fe3842d Mon Sep 17 00:00:00 2001 From: hershey5045 <43485729+hershey5045@users.noreply.github.com> Date: Fri, 3 Sep 2021 13:51:15 -0700 Subject: [PATCH] Reintroduce materialtype dependency on fbx files. (#3934) Signed-off-by: Robin Co-authored-by: Robin --- .../RPI.Builders/Model/MaterialAssetBuilderComponent.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp index 4c2876dc0c..0ac5b61662 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp @@ -80,7 +80,8 @@ namespace AZ bool includeMaterialPropertyNames = true; RPI::MaterialConverterBus::BroadcastResult(includeMaterialPropertyNames, &RPI::MaterialConverterBus::Events::ShouldIncludeMaterialPropertyNames); - if (conversionEnabled && !materialTypePath.empty() && !includeMaterialPropertyNames) + // TODO: Use includeMaterialPropertyNames to break materialtype dependency on fbx files. Materialasset's dependency on materialtypeasset will need to be decoupled first + if (conversionEnabled && !materialTypePath.empty() /*&& !includeMaterialPropertyNames*/) { AssetBuilderSDK::SourceFileDependency materialTypeSource; materialTypeSource.m_sourceFileDependencyPath = materialTypePath;