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
@@ -265,6 +265,12 @@ namespace AZ
            }
        }

+        MaterialAssignmentId MeshComponentController::FindMaterialAssignmentId(
+            const MaterialAssignmentLodIndex lod, const AZStd::string& label) const
+        {
+            return FindMaterialAssignmentIdInModel(GetModel(), lod, label);
+        }
+
        MaterialAssignmentMap MeshComponentController::GetMaterialAssignments() const
        {
            return GetMaterialAssignmentsFromModel(GetModel());