Merge branch 'development' into ExposeLodControls

2021-08-20 12:14:59 -07:00
parent e410eecd93 45ebf57d3f
commit b53a085700
654 changed files with 13546 additions and 16002 deletions
@@ -302,6 +302,25 @@ namespace AZ
                m_meshFeatureProcessor->SetTransform(m_meshHandle, m_transformInterface->GetWorldTM(), m_cachedNonUniformScale);
            }
        }
+        
+        RPI::ModelMaterialSlotMap MeshComponentController::GetModelMaterialSlots() const
+        {
+            Data::Asset<const RPI::ModelAsset> modelAsset = GetModelAsset();
+            if (modelAsset.IsReady())
+            {
+                return modelAsset->GetMaterialSlots();
+            }
+            else
+            {
+                return {};
+            }
+        }
+
+        MaterialAssignmentId MeshComponentController::FindMaterialAssignmentId(
+            const MaterialAssignmentLodIndex lod, const AZStd::string& label) const
+        {
+            return FindMaterialAssignmentIdInModel(GetModel(), lod, label);
+        }

        MaterialAssignmentMap MeshComponentController::GetMaterialAssignments() const
        {