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

# Conflicts: # Source/Editor/Windows/Profiler/Memory.cs
2025-03-25 13:37:15 +01:00
parent 9cf7046a5b 9459eff58c
commit 7e145c56fd
94 changed files with 901 additions and 352 deletions
--- a/Source/Editor/Modules/UIModule.cs
+++ b/Source/Editor/Modules/UIModule.cs
@@ -160,7 +160,7 @@ namespace FlaxEditor.Modules
        internal UIModule(Editor editor)
        : base(editor)
        {
-            InitOrder = -90;
+            InitOrder = -70;
            VisjectSurfaceBackground = FlaxEngine.Content.LoadAsyncInternal<Texture>("Editor/VisjectSurface");
            ColorValueBox.ShowPickColorDialog += ShowPickColorDialog;
        }