From d151e16fc54dc0a043d53fec3ef83b973e4e03ed Mon Sep 17 00:00:00 2001 From: Guthrie Adams Date: Fri, 24 Sep 2021 13:23:15 -0500 Subject: [PATCH] RebuildInstance only checks Asset::IsReady Signed-off-by: Guthrie Adams --- .../Code/Source/Material/MaterialAssignment.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignment.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignment.cpp index 56ad6b8b52..656d990307 100644 --- a/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignment.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignment.cpp @@ -93,21 +93,14 @@ namespace AZ return; } - if (m_materialAsset.GetId().IsValid()) + if (m_materialAsset.IsReady()) { - if (m_materialAsset.IsReady()) - { - m_materialInstance = - m_propertyOverrides.empty() ? RPI::Material::FindOrCreate(m_materialAsset) : RPI::Material::Create(m_materialAsset); - AZ_Error("MaterialAssignment", m_materialInstance, "Material instance not initialized"); - } - return; + m_materialInstance = m_propertyOverrides.empty() ? RPI::Material::FindOrCreate(m_materialAsset) : RPI::Material::Create(m_materialAsset); + AZ_Error("MaterialAssignment", m_materialInstance, "Material instance not initialized"); } - - if (m_defaultMaterialAsset.IsReady()) + else if (m_defaultMaterialAsset.IsReady()) { - m_materialInstance = - m_propertyOverrides.empty() ? RPI::Material::FindOrCreate(m_defaultMaterialAsset) : RPI::Material::Create(m_defaultMaterialAsset); + m_materialInstance = m_propertyOverrides.empty() ? RPI::Material::FindOrCreate(m_defaultMaterialAsset) : RPI::Material::Create(m_defaultMaterialAsset); AZ_Error("MaterialAssignment", m_materialInstance, "Material instance not initialized"); } }