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

# Conflicts: # Source/Engine/Level/Actors/AnimatedModel.cpp
2023-10-05 10:44:03 +02:00
parent dd21020297 86d1d29820
commit e6c45fccb3
83 changed files with 1809 additions and 519 deletions
--- a/Source/Engine/Graphics/Models/SkeletonMapping.h
+++ b/Source/Engine/Graphics/Models/SkeletonMapping.h
@@ -66,7 +66,7 @@ public:
            const auto parentModelIndex = node.ParentIndex;

            // Find matching node in skeleton (or map to best parent)
-            const std::function<bool(const T&)> f = [node](const T& x) -> bool
+            const Function<bool(const T&)> f = [node](const T& x) -> bool
            {
                return x.Name == node.Name;
            };