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

# Conflicts: # Source/Engine/Level/Actors/SplineModel.cpp # Source/Engine/Level/Actors/SplineModel.h
2023-07-14 14:10:21 +02:00
parent b1056e160a 84c99ea1c3
commit 3141b4fb04
16 changed files with 83 additions and 8 deletions
--- a/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
+++ b/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
@@ -185,8 +185,8 @@ namespace FlaxEditor.Viewport.Previews
            {
                UseTimeScale = false,
                UpdateWhenOffscreen = true,
-                //_previewModel.BoundsScale = 1000.0f;
-                UpdateMode = AnimatedModel.AnimationUpdateMode.Manual
+                BoundsScale = 100.0f,
+                UpdateMode = AnimatedModel.AnimationUpdateMode.Manual,
            };
            Task.AddCustomActor(_previewModel);