Merge remote-tracking branch 'origin/master' into 1.7

2023-07-18 11:47:39 +02:00
parent 07ef07e979 60c0995bc3
commit e39a56fc4e
19 changed files with 340 additions and 47 deletions
--- a/Source/Engine/Level/Actors/AnimatedModel.cpp
+++ b/Source/Engine/Level/Actors/AnimatedModel.cpp
@@ -1066,6 +1066,14 @@ void AnimatedModel::Deserialize(DeserializeStream& stream, ISerializeModifier* m
        DrawModes |= DrawPass::GlobalSurfaceAtlas;
 }

+const Span<MaterialSlot> AnimatedModel::GetMaterialSlots() const
+{
+    const auto model = SkinnedModel.Get();
+    if (model && !model->WaitForLoaded())
+        return ToSpan(model->MaterialSlots);
+    return Span<MaterialSlot>();
+}
+
 MaterialBase* AnimatedModel::GetMaterial(int32 entryIndex)
 {
    if (SkinnedModel)