Merge branch 'development' into Atom/santorac/OptionalSceneApiMaterialConversion

2021-07-30 14:54:14 -07:00
parent 13679a7cc3 acdad52032
commit b407e501e3
14 changed files with 247 additions and 17 deletions
@@ -321,6 +321,17 @@ namespace AZ
            }
        }

+        MaterialAssignmentId AtomActorInstance::FindMaterialAssignmentId(
+            const MaterialAssignmentLodIndex lod, const AZStd::string& label) const
+        {
+            if (m_skinnedMeshInstance && m_skinnedMeshInstance->m_model)
+            {
+                return FindMaterialAssignmentIdInModel(m_skinnedMeshInstance->m_model, lod, label);
+            }
+
+            return MaterialAssignmentId();
+        }
+
        MaterialAssignmentMap AtomActorInstance::GetMaterialAssignments() const
        {
            if (m_skinnedMeshInstance && m_skinnedMeshInstance->m_model)