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

2025-02-24 23:27:56 +01:00
parent ce335a0fe4 bf21b0a267
commit 2ab9adab24
89 changed files with 6155 additions and 1832 deletions
--- a/Source/Editor/Windows/Assets/CollisionDataWindow.cs
+++ b/Source/Editor/Windows/Assets/CollisionDataWindow.cs
@@ -200,7 +200,7 @@ namespace FlaxEditor.Windows.Assets
                ViewportCamera = new FPSCamera(),
                Parent = _split.Panel1
            };
-            _preview.Task.ViewFlags &= ~ViewFlags.Sky & ~ViewFlags.Bloom;
+            _preview.Task.ViewFlags &= ~ViewFlags.Sky & ~ViewFlags.Bloom & ~ViewFlags.EyeAdaptation;

            // Asset properties
            _propertiesPresenter = new CustomEditorPresenter(null);