Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -173,7 +173,12 @@ namespace AZ

        MaterialAssignmentMap AtomActorInstance::GetMaterialAssignments() const
        {
-            return GetMaterialAssignmentsFromModel(m_skinnedMeshInstance->m_model);
+            if (m_skinnedMeshInstance && m_skinnedMeshInstance->m_model)
+            {
+                return GetMaterialAssignmentsFromModel(m_skinnedMeshInstance->m_model);
+            }
+
+            return MaterialAssignmentMap{};
        }

        AZStd::unordered_set<AZ::Name> AtomActorInstance::GetModelUvNames() const