From d2dba124df294a3e221ba2775fea2f11c2a24d87 Mon Sep 17 00:00:00 2001
From: xxSeys1 <kaktusreiniger@gmail.com>
Date: Wed, 9 Oct 2024 13:12:48 +0200
Subject: [PATCH 001/203] add model import option to only create material slots

but not import actual materials
---
 Source/Engine/Tools/ModelTool/ModelTool.cpp |  6 +++++-
 Source/Engine/Tools/ModelTool/ModelTool.h   | 11 +++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Source/Engine/Tools/ModelTool/ModelTool.cpp b/Source/Engine/Tools/ModelTool/ModelTool.cpp
index 408fcb887..212ccdd4f 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp
@@ -1430,7 +1430,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
         auto& texture = data.Textures[i];
 
         // Auto-import textures
-        if (autoImportOutput.IsEmpty() || EnumHasNoneFlags(options.ImportTypes, ImportDataTypes::Textures) || texture.FilePath.IsEmpty())
+        if (autoImportOutput.IsEmpty() || EnumHasNoneFlags(options.ImportTypes, ImportDataTypes::Textures) || texture.FilePath.IsEmpty() || options.CreateEmptyMaterialSlots)
             continue;
         String assetPath = GetAdditionalImportPath(autoImportOutput, importedFileNames, StringUtils::GetFileNameWithoutExtension(texture.FilePath));
 #if COMPILE_WITH_ASSETS_IMPORTER
@@ -1486,6 +1486,10 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
             }
         }
 
+        // The rest of the steps this function performs become irrelevant when we're only creating slots.
+        if (options.CreateEmptyMaterialSlots)
+            continue;
+
         if (options.ImportMaterialsAsInstances)
         {
             // Create material instance
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.h b/Source/Engine/Tools/ModelTool/ModelTool.h
index 708b94342..2ea76383c 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.h
+++ b/Source/Engine/Tools/ModelTool/ModelTool.h
@@ -273,16 +273,19 @@ public:
     public: // Materials
 
         // If checked, the importer will create materials for model meshes as specified in the file.
-        API_FIELD(Attributes="EditorOrder(400), EditorDisplay(\"Materials\"), VisibleIf(nameof(ShowGeometry))")
+        API_FIELD(Attributes="EditorOrder(399), EditorDisplay(\"Materials\"), VisibleIf(nameof(ShowGeometry))")
         bool ImportMaterials = true;
+        // If checked, the importer will create empty material slots for every material.
+        API_FIELD(Attributes = "EditorOrder(400), EditorDisplay(\"Materials\"), VisibleIf(nameof(ShowGeometry))")
+        bool CreateEmptyMaterialSlots;
         // If checked, the importer will create the model's materials as instances of a base material.
-        API_FIELD(Attributes = "EditorOrder(401), EditorDisplay(\"Materials\"), VisibleIf(nameof(ImportMaterials)), VisibleIf(nameof(ShowGeometry))")
+        API_FIELD(Attributes = "EditorOrder(401), EditorDisplay(\"Materials\"), VisibleIf(nameof(ImportMaterials)), VisibleIf(nameof(ShowGeometry)), VisibleIf(nameof(CreateEmptyMaterialSlots), true)")
         bool ImportMaterialsAsInstances = false;
         // The material used as the base material that will be instanced as the imported model's material.
-        API_FIELD(Attributes = "EditorOrder(402), EditorDisplay(\"Materials\"), VisibleIf(nameof(ImportMaterialsAsInstances)), VisibleIf(nameof(ShowGeometry))")
+        API_FIELD(Attributes = "EditorOrder(402), EditorDisplay(\"Materials\"), VisibleIf(nameof(ImportMaterialsAsInstances)), VisibleIf(nameof(ShowGeometry)), VisibleIf(nameof(CreateEmptyMaterialSlots), true)")
         AssetReference<MaterialBase> InstanceToImportAs;
         // If checked, the importer will import texture files used by the model and any embedded texture resources.
-        API_FIELD(Attributes="EditorOrder(410), EditorDisplay(\"Materials\"), VisibleIf(nameof(ShowGeometry))")
+        API_FIELD(Attributes="EditorOrder(410), EditorDisplay(\"Materials\"), VisibleIf(nameof(ShowGeometry)), VisibleIf(nameof(CreateEmptyMaterialSlots), true)")
         bool ImportTextures = true;
         // If checked, the importer will try to keep the model's current overridden material slots, instead of importing materials from the source file.
         API_FIELD(Attributes="EditorOrder(420), EditorDisplay(\"Materials\", \"Keep Overridden Materials\"), VisibleIf(nameof(ShowGeometry))")

From fccd43502bb3153632cdf3fbc6d0ad331074c952 Mon Sep 17 00:00:00 2001
From: xxSeys1 <kaktusreiniger@gmail.com>
Date: Sun, 4 May 2025 21:14:10 +0200
Subject: [PATCH 002/203] add create file Content Panel toolstrip button

---
 .../Windows/ContentWindow.ContextMenu.cs      | 86 +++++++++++++------
 Source/Editor/Windows/ContentWindow.cs        | 26 +++++-
 2 files changed, 81 insertions(+), 31 deletions(-)

diff --git a/Source/Editor/Windows/ContentWindow.ContextMenu.cs b/Source/Editor/Windows/ContentWindow.ContextMenu.cs
index 1ad225997..40dd9131b 100644
--- a/Source/Editor/Windows/ContentWindow.ContextMenu.cs
+++ b/Source/Editor/Windows/ContentWindow.ContextMenu.cs
@@ -39,8 +39,7 @@ namespace FlaxEditor.Windows
                 folder = CurrentViewFolder;
             }
             Assert.IsNotNull(folder);
-            bool isRootFolder = CurrentViewFolder == _root.Folder;
-
+            
             // Create context menu
             ContextMenuButton b;
             ContextMenu cm = new ContextMenu
@@ -78,7 +77,7 @@ namespace FlaxEditor.Windows
                 cm.AddButton(Utilities.Constants.ShowInExplorer, () => FileSystem.ShowFileExplorer(System.IO.Path.GetDirectoryName(item.Path)));
                 
                 if (!String.IsNullOrEmpty(Editor.Instance.Windows.ContentWin._itemsSearchBox.Text))
-                {
+                { 
                     cm.AddButton("Show in Content Panel", () =>
                     {
                         Editor.Instance.Windows.ContentWin.ClearItemsSearch();
@@ -178,19 +177,61 @@ namespace FlaxEditor.Windows
 
             cm.AddSeparator();
 
+            CreateNewModuleMenu(cm, folder);
+            CreateNewFolderMenu(cm, folder, false, item);
+            CreateNewContentItemMenu(cm, folder);
+
+            if (folder.CanHaveAssets)
+            {
+                cm.AddButton("Import file", () =>
+                {
+                    _view.ClearSelection();
+                    Editor.ContentImporting.ShowImportFileDialog(CurrentViewFolder);
+                });
+            }
+
+            // Remove any leftover separator
+            if (cm.ItemsContainer.Children.LastOrDefault() is ContextMenuSeparator)
+                cm.ItemsContainer.Children.Last().Dispose();
+
+            // Show it
+            cm.Show(this, location);
+        }
+
+        private void CreateNewModuleMenu(ContextMenu menu, ContentFolder folder, bool disableUncreatable = false)
+        {
             // Check if is source folder to add new module
             if (folder?.ParentFolder?.Node is ProjectTreeNode parentFolderNode && folder.Node == parentFolderNode.Source)
             {
-                var button = cm.AddButton("New module");
+                var button = menu.AddButton("New module");
                 button.CloseMenuOnClick = false;
                 button.Clicked += () => NewModule(button, parentFolderNode.Source.Path);
             }
-
-            if (!isRootFolder && !(item is ContentFolder projectFolder && projectFolder.Node is ProjectTreeNode))
+            else if (disableUncreatable)
             {
-                cm.AddButton("New folder", NewFolder);
+                var button = menu.AddButton("New module");
+                button.Enabled = false;
             }
+        }
 
+        private bool CanCreateFolder(ContentItem item = null)
+        {
+            bool canCreateFolder = CurrentViewFolder != _root.Folder && !(item is ContentFolder projectFolder && projectFolder.Node is ProjectTreeNode);
+            return canCreateFolder;
+        }
+
+        private void CreateNewFolderMenu(ContextMenu menu, ContentFolder folder, bool disableUncreatable = false, ContentItem item = null)
+        {
+            bool canCreateFolder = CanCreateFolder(item);
+            if (canCreateFolder || disableUncreatable)
+            {
+                var b = menu.AddButton("New folder", NewFolder);
+                b.Enabled = canCreateFolder;
+            }
+        }
+
+        private void CreateNewContentItemMenu(ContextMenu menu, ContentFolder folder, bool showNew = true, bool disableUncreatable = false)
+        {
             // Loop through each proxy and user defined json type and add them to the context menu
             var actorType = new ScriptType(typeof(Actor));
             var scriptType = new ScriptType(typeof(Script));
@@ -230,7 +271,8 @@ namespace FlaxEditor.Windows
                 if (p == null)
                     continue;
 
-                if (p.CanCreate(folder))
+                bool canCreate = p.CanCreate(folder);
+                if (canCreate || disableUncreatable)
                 {
                     var parts = attribute.Path.Split('/');
                     ContextMenuChildMenu childCM = null;
@@ -238,16 +280,20 @@ namespace FlaxEditor.Windows
                     for (int i = 0; i < parts?.Length; i++)
                     {
                         var part = parts[i].Trim();
+                        if (part == "New" && !showNew)
+                            continue;
                         if (i == parts.Length - 1)
                         {
                             if (mainCM)
                             {
-                                cm.AddButton(part, () => NewItem(p));
+                                var b = menu.AddButton(part, () => NewItem(p));
+                                b.Enabled = canCreate;
                                 mainCM = false;
                             }
                             else if (childCM != null)
                             {
-                                childCM.ContextMenu.AddButton(part, () => NewItem(p));
+                                var b = childCM.ContextMenu.AddButton(part, () => NewItem(p));
+                                b.Enabled = canCreate;
                                 childCM.ContextMenu.AutoSort = true;
                             }
                         }
@@ -255,35 +301,21 @@ namespace FlaxEditor.Windows
                         {
                             if (mainCM)
                             {
-                                childCM = cm.GetOrAddChildMenu(part);
+                                childCM = menu.GetOrAddChildMenu(part);
                                 childCM.ContextMenu.AutoSort = true;
+                                childCM.Enabled = canCreate;
                                 mainCM = false;
                             }
                             else if (childCM != null)
                             {
                                 childCM = childCM.ContextMenu.GetOrAddChildMenu(part);
                                 childCM.ContextMenu.AutoSort = true;
+                                childCM.Enabled = canCreate;
                             }
                         }
                     }
                 }
             }
-
-            if (folder.CanHaveAssets)
-            {
-                cm.AddButton("Import file", () =>
-                {
-                    _view.ClearSelection();
-                    Editor.ContentImporting.ShowImportFileDialog(CurrentViewFolder);
-                });
-            }
-
-            // Remove any leftover separator
-            if (cm.ItemsContainer.Children.LastOrDefault() is ContextMenuSeparator)
-                cm.ItemsContainer.Children.Last().Dispose();
-
-            // Show it
-            cm.Show(this, location);
         }
 
         private void OnExpandAllClicked(ContextMenuButton button)
diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index f63db04bd..c87550b26 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -37,6 +37,7 @@ namespace FlaxEditor.Windows
 
         private readonly ToolStrip _toolStrip;
         private readonly ToolStripButton _importButton;
+        private readonly ToolStripButton _createNewButton;
         private readonly ToolStripButton _navigateBackwardButton;
         private readonly ToolStripButton _navigateForwardButton;
         private readonly ToolStripButton _navigateUpButton;
@@ -153,11 +154,12 @@ namespace FlaxEditor.Windows
             {
                 Parent = this,
             };
-            _importButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Import64, () => Editor.ContentImporting.ShowImportFileDialog(CurrentViewFolder)).LinkTooltip("Import content");
+            _importButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Import64, () => Editor.ContentImporting.ShowImportFileDialog(CurrentViewFolder)).LinkTooltip("Import content.");
+            _createNewButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Add64, OnCreateNewItemButtonClicked).LinkTooltip("Create a new asset.");
             _toolStrip.AddSeparator();
-            _navigateBackwardButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Left64, NavigateBackward).LinkTooltip("Navigate backward");
-            _navigateForwardButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Right64, NavigateForward).LinkTooltip("Navigate forward");
-            _navigateUpButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Up64, NavigateUp).LinkTooltip("Navigate up");
+            _navigateBackwardButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Left64, NavigateBackward).LinkTooltip("Navigate backward.");
+            _navigateForwardButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Right64, NavigateForward).LinkTooltip("Navigate forward.");
+            _navigateUpButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Up64, NavigateUp).LinkTooltip("Navigate up.");
             _toolStrip.AddSeparator();
 
             // Navigation bar
@@ -267,6 +269,22 @@ namespace FlaxEditor.Windows
             InputActions.Add(options => options.Search, () => _itemsSearchBox.Focus());
         }
 
+        private void OnCreateNewItemButtonClicked()
+        {
+            if (Input.GetKey(KeyboardKeys.Shift) && CanCreateFolder())
+            {
+                NewFolder();
+                return;
+            }
+
+            var menu = new ContextMenu();
+            CreateNewFolderMenu(menu, CurrentViewFolder, true);
+            CreateNewModuleMenu(menu, CurrentViewFolder, true);
+            menu.AddSeparator();
+            CreateNewContentItemMenu(menu, CurrentViewFolder, false, true);
+            menu.Show(this, new Float2(1, _createNewButton.Bottom));
+        }
+
         private ContextMenu OnViewDropdownPopupCreate(ComboBox comboBox)
         {
             var menu = new ContextMenu();

From c45cba18a6321cd0783e26299019de481386f6e0 Mon Sep 17 00:00:00 2001
From: xxSeys1 <kaktusreiniger@gmail.com>
Date: Sun, 4 May 2025 21:18:00 +0200
Subject: [PATCH 003/203] fix menu positioning

---
 Source/Editor/Windows/ContentWindow.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index c87550b26..318bf5231 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -282,7 +282,7 @@ namespace FlaxEditor.Windows
             CreateNewModuleMenu(menu, CurrentViewFolder, true);
             menu.AddSeparator();
             CreateNewContentItemMenu(menu, CurrentViewFolder, false, true);
-            menu.Show(this, new Float2(1, _createNewButton.Bottom));
+            menu.Show(this, _createNewButton.UpperLeft, ContextMenuDirection.RightUp);
         }
 
         private ContextMenu OnViewDropdownPopupCreate(ComboBox comboBox)

From 2901e3898c2878bc0e0df10c8d02f5a8b002c7cd Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Fri, 29 Aug 2025 16:03:44 -0500
Subject: [PATCH 004/203] Add `IncludeInheritedTypes` to `RequireActor`

---
 .../Editor/CustomEditors/Dedicated/ScriptsEditor.cs | 13 +++++++------
 .../Attributes/Editor/RequireActorAttribute.cs      |  9 ++++++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
index 123c7252a..685bf9dfc 100644
--- a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
@@ -102,11 +102,12 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     var actors = ScriptsEditor.ParentEditor.Values;
                     foreach (var a in actors)
                     {
-                        if (a.GetType() != requireActor.RequiredType)
-                        {
-                            item.Enabled = false;
-                            break;
-                        }
+                        if (a.GetType() == requireActor.RequiredType)
+                            continue;
+                        if (requireActor.IncludeInheritedTypes && a.GetType().IsSubclassOf(requireActor.RequiredType))
+                            continue;
+                        item.Enabled = false;
+                        break;
                     }
                 }
                 cm.AddItem(item);
@@ -827,7 +828,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     if (attribute != null)
                     {
                         var actor = script.Actor;
-                        if (actor.GetType() != attribute.RequiredType && !actor.GetType().IsSubclassOf(attribute.RequiredType))
+                        if (actor.GetType() != attribute.RequiredType && (attribute.IncludeInheritedTypes && !actor.GetType().IsSubclassOf(attribute.RequiredType)))
                         {
                             Editor.LogWarning($"`{Utilities.Utils.GetPropertyNameUI(scriptType.Name)}` on `{script.Actor}` is missing a required Actor of type `{attribute.RequiredType}`.");
                             hasAllRequirements = false;
diff --git a/Source/Engine/Scripting/Attributes/Editor/RequireActorAttribute.cs b/Source/Engine/Scripting/Attributes/Editor/RequireActorAttribute.cs
index 6e08217bf..3e5ad7f73 100644
--- a/Source/Engine/Scripting/Attributes/Editor/RequireActorAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/RequireActorAttribute.cs
@@ -13,13 +13,20 @@ public class RequireActorAttribute : Attribute
     /// The required type.
     /// </summary>
     public Type RequiredType;
+    
+    /// <summary>
+    /// Whether to include inherited types.
+    /// </summary>
+    public bool IncludeInheritedTypes;
 
     /// <summary>
     /// Initializes a new instance of the  <see cref="RequireActorAttribute"/> class.
     /// </summary>
     /// <param name="type">The required type.</param>
-    public RequireActorAttribute(Type type)
+    /// <param name="includeInheritedTypes">Whether to include inherited types.</param>
+    public RequireActorAttribute(Type type, bool includeInheritedTypes = false)
     {
         RequiredType = type;
+        IncludeInheritedTypes = includeInheritedTypes;
     }
 }

From 9a363e2882b2cca89702ea77fea477200733e575 Mon Sep 17 00:00:00 2001
From: alsed <alsina.eduardo@gmail.com>
Date: Sat, 30 Aug 2025 08:51:21 -0400
Subject: [PATCH 005/203] Implement prefab detection of skinned models

---
 .../Engine/ContentImporters/ImportModel.cpp   | 40 ++++++++++++++-----
 Source/Engine/Tools/ModelTool/ModelTool.cpp   | 23 +++++++----
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/Source/Engine/ContentImporters/ImportModel.cpp b/Source/Engine/ContentImporters/ImportModel.cpp
index be71236ab..a007a740d 100644
--- a/Source/Engine/ContentImporters/ImportModel.cpp
+++ b/Source/Engine/ContentImporters/ImportModel.cpp
@@ -19,6 +19,7 @@
 #include "Engine/Animations/AnimEvent.h"
 #include "Engine/Level/Actors/EmptyActor.h"
 #include "Engine/Level/Actors/StaticModel.h"
+#include "Engine/Level/Actors/AnimatedModel.h"
 #include "Engine/Level/Prefabs/Prefab.h"
 #include "Engine/Level/Prefabs/PrefabManager.h"
 #include "Engine/Level/Scripts/ModelPrefab.h"
@@ -84,6 +85,7 @@ struct PrefabObject
     int32 NodeIndex;
     String Name;
     String AssetPath;
+    bool IsSkinned = false;
 };
 
 void RepackMeshLightmapUVs(ModelData& data)
@@ -320,8 +322,10 @@ CreateAssetResult ImportModel::Import(CreateAssetContext& context)
 
             return AssetsImportingManager::Import(context.InputPath, outputPath, &splitOptions);
         };
+
         auto splitOptions = options;
         LOG(Info, "Splitting imported {0} meshes", meshesByName.Count());
+        
         PrefabObject prefabObject;
         for (int32 groupIndex = 0; groupIndex < meshesByName.Count(); groupIndex++)
         {
@@ -331,7 +335,17 @@ CreateAssetResult ImportModel::Import(CreateAssetContext& context)
             prefabObject.NodeIndex = group.First()->NodeIndex;
             prefabObject.Name = group.First()->Name;
 
+            // Defaul value for ModelType
             splitOptions.Type = ModelTool::ModelType::Model;
+
+            // Search for Skinned Model
+            if (group.First()->BlendShapes.HasItems())
+            {
+                LOG(Info, "Mesh {0} is Skinned", prefabObject.Name);
+                splitOptions.Type = ModelTool::ModelType::SkinnedModel;
+                prefabObject.IsSkinned = true;
+            }
+            
             splitOptions.ObjectIndex = groupIndex;
             if (!splitImport(splitOptions, group.GetKey(), prefabObject.AssetPath, group.First()))
             {
@@ -594,8 +608,8 @@ CreateAssetResult ImportModel::Create(CreateAssetContext& context)
 CreateAssetResult ImportModel::CreateModel(CreateAssetContext& context, const ModelData& modelData, const Options* options)
 {
     PROFILE_CPU();
-    IMPORT_SETUP(Model, Model::SerializedVersion);
-    static_assert(Model::SerializedVersion == 30, "Update code.");
+        IMPORT_SETUP(Model, Model::SerializedVersion);
+        static_assert(Model::SerializedVersion == 30, "Update code.");
 
     // Save model header
     MemoryWriteStream stream(4096);
@@ -722,22 +736,30 @@ CreateAssetResult ImportModel::CreatePrefab(CreateAssetContext& context, const M
         {
             if (e.NodeIndex == nodeIndex)
             {
-                auto* actor = New<StaticModel>();
-                actor->SetName(e.Name);
-                if (auto* model = Content::LoadAsync<Model>(e.AssetPath))
+                if(e.IsSkinned)
                 {
-                    actor->Model = model;
+                    LOG(Info,"Model {0} is Animated", e.Name);
+                    auto* actor = New<AnimatedModel>();    
+                    actor->SetName(e.Name);  
+                    if (auto* skinnedModel = Content::LoadAsync<SkinnedModel>(e.AssetPath))
+                        actor->SkinnedModel = skinnedModel;
+                    nodeActors.Add(actor);   
+                }
+                else
+                {
+                    auto* actor = New<StaticModel>();
+                    actor->SetName(e.Name);
+                    if (auto* model = Content::LoadAsync<Model>(e.AssetPath))
+                        actor->Model = model;
+                    nodeActors.Add(actor);
                 }
-                nodeActors.Add(actor);
             }
         }
         Actor* nodeActor = nodeActors.Count() == 1 ? nodeActors[0] : New<EmptyActor>();
         if (nodeActors.Count() > 1)
         {
             for (Actor* e : nodeActors)
-            {
                 e->SetParent(nodeActor);
-            }
         }
         if (nodeActors.Count() != 1)
         {
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.cpp b/Source/Engine/Tools/ModelTool/ModelTool.cpp
index fe268c350..cc483f333 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp
@@ -1131,7 +1131,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
             options.ImportTypes |= ImportDataTypes::Skeleton;
         break;
     case ModelType::Prefab:
-        options.ImportTypes = ImportDataTypes::Geometry | ImportDataTypes::Nodes | ImportDataTypes::Animations;
+        options.ImportTypes = ImportDataTypes::Geometry | ImportDataTypes::Nodes | ImportDataTypes::Skeleton | ImportDataTypes::Animations;
         if (options.ImportMaterials)
             options.ImportTypes |= ImportDataTypes::Materials;
         if (options.ImportTextures)
@@ -1157,6 +1157,9 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
         {
             for (auto& mesh : lod.Meshes)
             {
+                if (mesh->BlendShapes.IsEmpty())
+                    continue;
+                
                 for (int32 blendShapeIndex = mesh->BlendShapes.Count() - 1; blendShapeIndex >= 0; blendShapeIndex--)
                 {
                     auto& blendShape = mesh->BlendShapes[blendShapeIndex];
@@ -2111,12 +2114,13 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
 #undef REMAP_VERTEX_BUFFER
 
                 // Remap blend shapes
-                dstMesh->BlendShapes.Resize(srcMesh->BlendShapes.Count());
+                dstMesh->BlendShapes.Clear();
+                dstMesh->BlendShapes.EnsureCapacity(srcMesh->BlendShapes.Count(), false);
                 for (int32 blendShapeIndex = 0; blendShapeIndex < srcMesh->BlendShapes.Count(); blendShapeIndex++)
                 {
                     const auto& srcBlendShape = srcMesh->BlendShapes[blendShapeIndex];
-                    auto& dstBlendShape = dstMesh->BlendShapes[blendShapeIndex];
-
+                    //auto& dstBlendShape = dstMesh->BlendShapes[blendShapeIndex];
+                    BlendShape dstBlendShape;
                     dstBlendShape.Name = srcBlendShape.Name;
                     dstBlendShape.Weight = srcBlendShape.Weight;
                     dstBlendShape.Vertices.EnsureCapacity(srcBlendShape.Vertices.Count());
@@ -2125,19 +2129,21 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
                         auto v = srcBlendShape.Vertices[i];
                         v.VertexIndex = remap[v.VertexIndex];
                         if (v.VertexIndex != ~0u)
-                        {
                             dstBlendShape.Vertices.Add(v);
-                        }
                     }
+
+                    if (dstBlendShape.Vertices.HasItems())
+                        dstMesh->BlendShapes.Add(dstBlendShape);
                 }
 
+                /*
                 // Remove empty blend shapes
                 for (int32 blendShapeIndex = dstMesh->BlendShapes.Count() - 1; blendShapeIndex >= 0; blendShapeIndex--)
                 {
                     if (dstMesh->BlendShapes[blendShapeIndex].Vertices.IsEmpty())
                         dstMesh->BlendShapes.RemoveAt(blendShapeIndex);
                 }
-
+                */
                 // Optimize generated LOD
                 meshopt_optimizeVertexCache(dstMesh->Indices.Get(), dstMesh->Indices.Get(), dstMeshIndexCount, dstMeshVertexCount);
                 meshopt_optimizeOverdraw(dstMesh->Indices.Get(), dstMesh->Indices.Get(), dstMeshIndexCount, (const float*)dstMesh->Positions.Get(), dstMeshVertexCount, sizeof(Float3), 1.05f);
@@ -2182,6 +2188,9 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
     {
         for (auto& mesh : lod.Meshes)
         {
+            if (mesh->BlendShapes.IsEmpty())
+                continue;
+
             for (auto& blendShape : mesh->BlendShapes)
             {
                 // Compute min/max for used vertex indices

From f588d6da51c218a70e2f3c8d9b11cca6b74242f6 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Tue, 2 Sep 2025 20:33:41 -0500
Subject: [PATCH 006/203] Add ability to loop root node in behavior trees.

---
 Source/Engine/AI/Behavior.cpp        | 14 +++++++++++++-
 Source/Engine/AI/BehaviorTreeNodes.h |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Source/Engine/AI/Behavior.cpp b/Source/Engine/AI/Behavior.cpp
index e70ca50a4..f0c4acee3 100644
--- a/Source/Engine/AI/Behavior.cpp
+++ b/Source/Engine/AI/Behavior.cpp
@@ -106,7 +106,19 @@ void Behavior::UpdateAsync()
     const BehaviorUpdateResult result = tree->Graph.Root->InvokeUpdate(context);
     if (result != BehaviorUpdateResult::Running)
         _result = result;
-    if (_result != BehaviorUpdateResult::Running)
+    if (_result != BehaviorUpdateResult::Running && tree->Graph.Root->Loop)
+    {
+        // Ensure to have tree loaded on play
+        CHECK(Tree && !Tree->WaitForLoaded());
+        BehaviorTree* tree = Tree.Get();
+        CHECK(tree->Graph.Root);
+
+        // Setup state
+        _result = BehaviorUpdateResult::Running;
+        _accumulatedTime = 0.0f;
+        _totalTime = 0;
+    }
+    else if (_result != BehaviorUpdateResult::Running)
     {
         Finished();
     }
diff --git a/Source/Engine/AI/BehaviorTreeNodes.h b/Source/Engine/AI/BehaviorTreeNodes.h
index 7aaab5f3c..05a472da7 100644
--- a/Source/Engine/AI/BehaviorTreeNodes.h
+++ b/Source/Engine/AI/BehaviorTreeNodes.h
@@ -96,6 +96,10 @@ API_CLASS(Sealed) class FLAXENGINE_API BehaviorTreeRootNode : public BehaviorTre
     // The target amount of the behavior logic updates per second.
     API_FIELD(Attributes="EditorOrder(100)")
     float UpdateFPS = 10.0f;
+
+    // Whether to loop the root node.
+    API_FIELD(Attributes="EditorOrder(200)")
+    bool Loop = true;
 };
 
 /// <summary>

From cd0878f81064791f4f94c9faee8c47c6e1af4ead Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Tue, 2 Sep 2025 20:47:04 -0500
Subject: [PATCH 007/203] Simplify code

---
 Source/Engine/AI/Behavior.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Source/Engine/AI/Behavior.cpp b/Source/Engine/AI/Behavior.cpp
index f0c4acee3..d727bdef1 100644
--- a/Source/Engine/AI/Behavior.cpp
+++ b/Source/Engine/AI/Behavior.cpp
@@ -108,12 +108,7 @@ void Behavior::UpdateAsync()
         _result = result;
     if (_result != BehaviorUpdateResult::Running && tree->Graph.Root->Loop)
     {
-        // Ensure to have tree loaded on play
-        CHECK(Tree && !Tree->WaitForLoaded());
-        BehaviorTree* tree = Tree.Get();
-        CHECK(tree->Graph.Root);
-
-        // Setup state
+        // Reset State
         _result = BehaviorUpdateResult::Running;
         _accumulatedTime = 0.0f;
         _totalTime = 0;

From a8768f918eb28c0d4e2d3a6da1fe0b57861c2490 Mon Sep 17 00:00:00 2001
From: alsed <alsina.eduardo@gmail.com>
Date: Sun, 7 Sep 2025 13:45:21 -0300
Subject: [PATCH 008/203] Add more conditions for skeleton import and add
 blendshapes for prefab recognition

---
 Source/Engine/ContentImporters/ImportModel.cpp      | 2 +-
 Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp  | 2 +-
 Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp | 2 +-
 Source/Engine/Tools/ModelTool/ModelTool.cpp         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/Engine/ContentImporters/ImportModel.cpp b/Source/Engine/ContentImporters/ImportModel.cpp
index a007a740d..f1d83daa7 100644
--- a/Source/Engine/ContentImporters/ImportModel.cpp
+++ b/Source/Engine/ContentImporters/ImportModel.cpp
@@ -339,7 +339,7 @@ CreateAssetResult ImportModel::Import(CreateAssetContext& context)
             splitOptions.Type = ModelTool::ModelType::Model;
 
             // Search for Skinned Model
-            if (group.First()->BlendShapes.HasItems())
+            if (group.First()->BlendWeights.HasItems() || group.First()->BlendShapes.HasItems() )
             {
                 LOG(Info, "Mesh {0} is Skinned", prefabObject.Name);
                 splitOptions.Type = ModelTool::ModelType::SkinnedModel;
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp b/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
index f5b043994..a61f19668 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
@@ -765,7 +765,7 @@ bool ModelTool::ImportDataAssimp(const String& path, ModelData& data, Options& o
     }
 
     // Import skeleton
-    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton))
+    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton) && context.Bones.HasItems())
     {
         data.Skeleton.Nodes.Resize(context.Nodes.Count(), false);
         for (int32 i = 0; i < context.Nodes.Count(); i++)
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp b/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
index 81ce46d6c..e530e7b7c 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
@@ -1404,7 +1404,7 @@ bool ModelTool::ImportDataOpenFBX(const String& path, ModelData& data, Options&
     }
 
     // Import skeleton
-    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton))
+    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton) && context.Bones.HasItems())
     {
         data.Skeleton.Nodes.Resize(context.Nodes.Count(), false);
         for (int32 i = 0; i < context.Nodes.Count(); i++)
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.cpp b/Source/Engine/Tools/ModelTool/ModelTool.cpp
index cc483f333..103797781 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp
@@ -1184,7 +1184,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
             }
         }
     }
-    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton))
+    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton) && data.Skeleton.Bones.HasItems())
     {
         LOG(Info, "Imported skeleton has {0} bones and {1} nodes", data.Skeleton.Bones.Count(), data.Nodes.Count());
 
@@ -1324,7 +1324,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
         for (int32 i = 0; i < meshesCount; i++)
         {
             const auto mesh = data.LODs[0].Meshes[i];
-            if (mesh->BlendIndices.IsEmpty() || mesh->BlendWeights.IsEmpty())
+            if ((mesh->BlendIndices.IsEmpty() || mesh->BlendWeights.IsEmpty()) && data.Skeleton.Bones.HasItems())
             {
                 auto indices = Int4::Zero;
                 auto weights = Float4::UnitX;

From 52ee8b395328cf6094ca0566f7d97dc0176dc780 Mon Sep 17 00:00:00 2001
From: alsed <alsina.eduardo@gmail.com>
Date: Sun, 7 Sep 2025 20:40:28 -0300
Subject: [PATCH 009/203] better comment for animated prefab and remove unused
 code in remap blendshapes

---
 Source/Engine/ContentImporters/ImportModel.cpp |  6 +++---
 Source/Engine/Tools/ModelTool/ModelTool.cpp    | 11 +----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Source/Engine/ContentImporters/ImportModel.cpp b/Source/Engine/ContentImporters/ImportModel.cpp
index f1d83daa7..5a3a34735 100644
--- a/Source/Engine/ContentImporters/ImportModel.cpp
+++ b/Source/Engine/ContentImporters/ImportModel.cpp
@@ -608,8 +608,8 @@ CreateAssetResult ImportModel::Create(CreateAssetContext& context)
 CreateAssetResult ImportModel::CreateModel(CreateAssetContext& context, const ModelData& modelData, const Options* options)
 {
     PROFILE_CPU();
-        IMPORT_SETUP(Model, Model::SerializedVersion);
-        static_assert(Model::SerializedVersion == 30, "Update code.");
+    IMPORT_SETUP(Model, Model::SerializedVersion);
+    static_assert(Model::SerializedVersion == 30, "Update code.");
 
     // Save model header
     MemoryWriteStream stream(4096);
@@ -738,7 +738,7 @@ CreateAssetResult ImportModel::CreatePrefab(CreateAssetContext& context, const M
             {
                 if(e.IsSkinned)
                 {
-                    LOG(Info,"Model {0} is Animated", e.Name);
+                    LOG(Info,"Creating animated model prefab {0}.", e.Name);
                     auto* actor = New<AnimatedModel>();    
                     actor->SetName(e.Name);  
                     if (auto* skinnedModel = Content::LoadAsync<SkinnedModel>(e.AssetPath))
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.cpp b/Source/Engine/Tools/ModelTool/ModelTool.cpp
index 103797781..ebd19e169 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp
@@ -2114,12 +2114,10 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
 #undef REMAP_VERTEX_BUFFER
 
                 // Remap blend shapes
-                dstMesh->BlendShapes.Clear();
                 dstMesh->BlendShapes.EnsureCapacity(srcMesh->BlendShapes.Count(), false);
                 for (int32 blendShapeIndex = 0; blendShapeIndex < srcMesh->BlendShapes.Count(); blendShapeIndex++)
                 {
                     const auto& srcBlendShape = srcMesh->BlendShapes[blendShapeIndex];
-                    //auto& dstBlendShape = dstMesh->BlendShapes[blendShapeIndex];
                     BlendShape dstBlendShape;
                     dstBlendShape.Name = srcBlendShape.Name;
                     dstBlendShape.Weight = srcBlendShape.Weight;
@@ -2132,18 +2130,11 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
                             dstBlendShape.Vertices.Add(v);
                     }
 
+                    // Add only valid blend shapes 
                     if (dstBlendShape.Vertices.HasItems())
                         dstMesh->BlendShapes.Add(dstBlendShape);
                 }
 
-                /*
-                // Remove empty blend shapes
-                for (int32 blendShapeIndex = dstMesh->BlendShapes.Count() - 1; blendShapeIndex >= 0; blendShapeIndex--)
-                {
-                    if (dstMesh->BlendShapes[blendShapeIndex].Vertices.IsEmpty())
-                        dstMesh->BlendShapes.RemoveAt(blendShapeIndex);
-                }
-                */
                 // Optimize generated LOD
                 meshopt_optimizeVertexCache(dstMesh->Indices.Get(), dstMesh->Indices.Get(), dstMeshIndexCount, dstMeshVertexCount);
                 meshopt_optimizeOverdraw(dstMesh->Indices.Get(), dstMesh->Indices.Get(), dstMeshIndexCount, (const float*)dstMesh->Positions.Get(), dstMeshVertexCount, sizeof(Float3), 1.05f);

From 05f08db66eacad3b28bc4d0764ecbb29e0e424b3 Mon Sep 17 00:00:00 2001
From: alsed <alsina.eduardo@gmail.com>
Date: Mon, 8 Sep 2025 01:28:49 -0300
Subject: [PATCH 010/203] Fixed a crash when model with no Bones was imported
 as Skinned Model

---
 Source/Engine/Tools/ModelTool/ModelTool.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Source/Engine/Tools/ModelTool/ModelTool.cpp b/Source/Engine/Tools/ModelTool/ModelTool.cpp
index ebd19e169..6820532bb 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp
@@ -1119,6 +1119,12 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
             options.ImportTypes |= ImportDataTypes::Textures;
         break;
     case ModelType::SkinnedModel:
+        if (!data.Skeleton.Bones.HasItems())
+        {
+            LOG(Warning, "Model is not Skinned, it will be imported as Static");
+            options.ImportTypes = ImportDataTypes::Geometry | ImportDataTypes::Nodes;
+            options.Type = ModelType::Model;
+        }
         options.ImportTypes = ImportDataTypes::Geometry | ImportDataTypes::Nodes | ImportDataTypes::Skeleton;
         if (options.ImportMaterials)
             options.ImportTypes |= ImportDataTypes::Materials;
@@ -1184,7 +1190,8 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
             }
         }
     }
-    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton) && data.Skeleton.Bones.HasItems())
+    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton) 
+        && (data.Skeleton.Bones.HasItems() || data.LODs[0].Meshes[0]->BlendShapes.HasItems()))
     {
         LOG(Info, "Imported skeleton has {0} bones and {1} nodes", data.Skeleton.Bones.Count(), data.Nodes.Count());
 

From fb5cedc575bc9a6b1fbb80cbe5421a5024cbd863 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 19 Sep 2025 16:32:59 +0200
Subject: [PATCH 011/203] make particle age/ lifetime nodes more clear

---
 Source/Editor/Surface/Archetypes/Particles.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Source/Editor/Surface/Archetypes/Particles.cs b/Source/Editor/Surface/Archetypes/Particles.cs
index 5b8c05381..3747e2a60 100644
--- a/Source/Editor/Surface/Archetypes/Particles.cs
+++ b/Source/Editor/Surface/Archetypes/Particles.cs
@@ -436,10 +436,11 @@ namespace FlaxEditor.Surface.Archetypes
             new NodeArchetype
             {
                 TypeID = 102,
-                Title = "Particle Lifetime",
-                Description = "Particle lifetime (in seconds).",
+                Title = "Total Lifetime",
+                Description = "Total particle lifetime (in seconds), assigned when the particle is created. Always the same, no matter the particles age.",
+                AlternativeTitles = new[] { "Age" },
                 Flags = NodeFlags.MaterialGraph | NodeFlags.ParticleEmitterGraph,
-                Size = new Float2(200, 30),
+                Size = new Float2(180, 30),
                 Elements = new[]
                 {
                     NodeElementArchetype.Factory.Output(0, string.Empty, typeof(float), 0),
@@ -449,9 +450,10 @@ namespace FlaxEditor.Surface.Archetypes
             {
                 TypeID = 103,
                 Title = "Particle Age",
-                Description = "Particle age (in seconds).",
+                Description = "Particle age (in seconds). How long the particle has been alive since it was created.",
+                AlternativeTitles = new[] { "Lifetime" },
                 Flags = NodeFlags.MaterialGraph | NodeFlags.ParticleEmitterGraph,
-                Size = new Float2(200, 30),
+                Size = new Float2(170, 30),
                 Elements = new[]
                 {
                     NodeElementArchetype.Factory.Output(0, string.Empty, typeof(float), 0),
@@ -533,9 +535,10 @@ namespace FlaxEditor.Surface.Archetypes
             {
                 TypeID = 110,
                 Title = "Particle Normalized Age",
-                Description = "Particle normalized age to range 0-1 (age divided by lifetime).",
+                Description = "Particle normalized age represented as from 0 (max lifetime) - 1 (max age) (age divided by lifetime).",
+                AlternativeTitles = new[] { "Lifetime" },
                 Flags = NodeFlags.MaterialGraph | NodeFlags.ParticleEmitterGraph,
-                Size = new Float2(230, 30),
+                Size = new Float2(250, 30),
                 Elements = new[]
                 {
                     NodeElementArchetype.Factory.Output(0, string.Empty, typeof(float), 0),

From 07c1dfc61329a92fe8a52420da539bdcf9b20d5b Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 19 Sep 2025 20:23:47 +0200
Subject: [PATCH 012/203] add focus selected visject controls functionality

---
 Source/Editor/Options/InputOptions.cs         |  4 +++
 Source/Editor/Surface/VisjectSurface.Input.cs |  4 ++-
 Source/Editor/Surface/VisjectSurface.cs       | 30 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/Source/Editor/Options/InputOptions.cs b/Source/Editor/Options/InputOptions.cs
index af919c1f3..624daf890 100644
--- a/Source/Editor/Options/InputOptions.cs
+++ b/Source/Editor/Options/InputOptions.cs
@@ -694,6 +694,10 @@ namespace FlaxEditor.Options
         [EditorDisplay("Node Editors"), EditorOrder(4580)]
         public InputBinding NodesDistributeVertical = new InputBinding(KeyboardKeys.A, KeyboardKeys.Alt);
 
+        [DefaultValue(typeof(InputBinding), "Shift+F")]
+        [EditorDisplay("Node Editors"), EditorOrder(4590)]
+        public InputBinding FocusSelectedNodes = new InputBinding(KeyboardKeys.F, KeyboardKeys.Shift);
+
         #endregion
     }
 }
diff --git a/Source/Editor/Surface/VisjectSurface.Input.cs b/Source/Editor/Surface/VisjectSurface.Input.cs
index 09df195eb..72594eb5f 100644
--- a/Source/Editor/Surface/VisjectSurface.Input.cs
+++ b/Source/Editor/Surface/VisjectSurface.Input.cs
@@ -29,6 +29,7 @@ namespace FlaxEditor.Surface
         private HashSet<SurfaceNode> _movingNodes;
         private HashSet<SurfaceNode> _temporarySelectedNodes;
         private readonly Stack<InputBracket> _inputBrackets = new Stack<InputBracket>();
+        private InputBinding _focusSelectedNodeBinding;
 
         private class InputBracket
         {
@@ -844,7 +845,8 @@ namespace FlaxEditor.Surface
 
         private void CurrentInputTextChanged(string currentInputText)
         {
-            if (string.IsNullOrEmpty(currentInputText))
+            // Check if focus selected nodes binding is being pressed to prevent it triggering primary menu 
+            if (string.IsNullOrEmpty(currentInputText) || _focusSelectedNodeBinding.Process(RootWindow))
                 return;
             if (IsPrimaryMenuOpened || !CanEdit)
             {
diff --git a/Source/Editor/Surface/VisjectSurface.cs b/Source/Editor/Surface/VisjectSurface.cs
index 8cbcb4a21..fb0d1f576 100644
--- a/Source/Editor/Surface/VisjectSurface.cs
+++ b/Source/Editor/Surface/VisjectSurface.cs
@@ -425,6 +425,7 @@ namespace FlaxEditor.Surface
                 new InputActionsContainer.Binding(options => options.NodesAlignRight, () => { AlignNodes(SelectedNodes, NodeAlignmentType.Right); }),
                 new InputActionsContainer.Binding(options => options.NodesDistributeHorizontal, () => {  DistributeNodes(SelectedNodes, false); }),
                 new InputActionsContainer.Binding(options => options.NodesDistributeVertical, () => {  DistributeNodes(SelectedNodes, true); }),
+                new InputActionsContainer.Binding(options => options.FocusSelectedNodes, () => {  ShowSelection(); }),
             });
 
             Context.ControlSpawned += OnSurfaceControlSpawned;
@@ -436,7 +437,10 @@ namespace FlaxEditor.Surface
             DragHandlers.Add(_dragAssets = new DragAssets<DragDropEventArgs>(ValidateDragItem));
             DragHandlers.Add(_dragParameters = new DragNames<DragDropEventArgs>(SurfaceParameter.DragPrefix, ValidateDragParameter));
 
+            OnEditorOptionsChanged(Editor.Instance.Options.Options);
+
             ScriptsBuilder.ScriptsReloadBegin += OnScriptsReloadBegin;
+            Editor.Instance.Options.OptionsChanged += OnEditorOptionsChanged;
         }
 
         private void OnScriptsReloadBegin()
@@ -446,6 +450,11 @@ namespace FlaxEditor.Surface
             _cmPrimaryMenu = null;
         }
 
+        private void OnEditorOptionsChanged(EditorOptions options)
+        {
+            _focusSelectedNodeBinding = options.Input.FocusSelectedNodes;
+        }
+
         /// <summary>
         /// Gets the display name of the connection type used in the surface.
         /// </summary>
@@ -643,6 +652,26 @@ namespace FlaxEditor.Surface
             ViewCenterPosition = areaRect.Center;
         }
 
+        /// <summary>
+        /// Shows the selected controls by changing the view scale and the position.
+        /// </summary>
+        public void ShowSelection()
+        {
+            var selection = SelectedControls;
+            if (selection.Count == 0)
+                return;
+
+            // Calculate the bounds of all selected controls
+            Rectangle bounds = selection[0].Bounds;
+            for (int i = 1; i < selection.Count; i++)
+                bounds = Rectangle.Union(bounds, selection[i].Bounds);
+
+            // Add margin
+            bounds = bounds.MakeExpanded(250.0f);
+
+            ShowArea(bounds);
+        }
+
         /// <summary>
         /// Shows the given surface node by changing the view scale and the position and focuses the node.
         /// </summary>
@@ -1066,6 +1095,7 @@ namespace FlaxEditor.Surface
             _cmPrimaryMenu?.Dispose();
 
             ScriptsBuilder.ScriptsReloadBegin -= OnScriptsReloadBegin;
+            Editor.Instance.Options.OptionsChanged += OnEditorOptionsChanged;
 
             base.OnDestroy();
         }

From 1dd96ae9cbc219749f445ab551414150fbed25a7 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 19 Sep 2025 23:04:43 +0200
Subject: [PATCH 013/203] add undo to MoveSelectedNodes (do TODO)

---
 Source/Editor/Surface/SurfaceUtils.cs             | 10 +++++-----
 Source/Editor/Surface/VisjectSurface.Input.cs     | 10 +++++++++-
 Source/Editor/Windows/Assets/AssetEditorWindow.cs |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Source/Editor/Surface/SurfaceUtils.cs b/Source/Editor/Surface/SurfaceUtils.cs
index d75efb5a0..bf70ca2e9 100644
--- a/Source/Editor/Surface/SurfaceUtils.cs
+++ b/Source/Editor/Surface/SurfaceUtils.cs
@@ -573,13 +573,13 @@ namespace FlaxEditor.Surface
             var showSearch = () => editor.ContentFinding.ShowSearch(window);
 
             // Toolstrip
-            saveButton = toolStrip.AddButton(editor.Icons.Save64, window.Save).LinkTooltip("Save", ref inputOptions.Save);
+            saveButton = toolStrip.AddButton(editor.Icons.Save64, window.Save).LinkTooltip("Save.", ref inputOptions.Save);
             toolStrip.AddSeparator();
-            undoButton = toolStrip.AddButton(editor.Icons.Undo64, undo.PerformUndo).LinkTooltip("Undo", ref inputOptions.Undo);
-            redoButton = toolStrip.AddButton(editor.Icons.Redo64, undo.PerformRedo).LinkTooltip("Redo", ref inputOptions.Redo);
+            undoButton = toolStrip.AddButton(editor.Icons.Undo64, undo.PerformUndo).LinkTooltip("Undo.", ref inputOptions.Undo);
+            redoButton = toolStrip.AddButton(editor.Icons.Redo64, undo.PerformRedo).LinkTooltip("Redo.", ref inputOptions.Redo);
             toolStrip.AddSeparator();
-            toolStrip.AddButton(editor.Icons.Search64, showSearch).LinkTooltip("Open content search tool",  ref inputOptions.Search);
-            toolStrip.AddButton(editor.Icons.CenterView64, surface.ShowWholeGraph).LinkTooltip("Show whole graph");
+            toolStrip.AddButton(editor.Icons.Search64, showSearch).LinkTooltip("Open content search tool.",  ref inputOptions.Search);
+            toolStrip.AddButton(editor.Icons.CenterView64, surface.ShowWholeGraph).LinkTooltip("Show whole graph.");
             var gridSnapButton = toolStrip.AddButton(editor.Icons.Grid32, surface.ToggleGridSnapping);
             gridSnapButton.LinkTooltip("Toggle grid snapping for nodes.");
             gridSnapButton.AutoCheck = true;
diff --git a/Source/Editor/Surface/VisjectSurface.Input.cs b/Source/Editor/Surface/VisjectSurface.Input.cs
index 72594eb5f..1ebd4fdee 100644
--- a/Source/Editor/Surface/VisjectSurface.Input.cs
+++ b/Source/Editor/Surface/VisjectSurface.Input.cs
@@ -702,13 +702,21 @@ namespace FlaxEditor.Surface
 
         private void MoveSelectedNodes(Float2 delta)
         {
-            // TODO: undo
+            List<MoveNodesAction> undoActions = new List<MoveNodesAction>();
+
             delta /= _targetScale;
             OnGetNodesToMove();
             foreach (var node in _movingNodes)
+            {
                 node.Location += delta;
+                if (Undo != null)
+                    undoActions.Add(new MoveNodesAction(Context, new[] { node.ID }, delta));
+            }
             _isMovingSelection = false;
             MarkAsEdited(false);
+
+            if (undoActions.Count > 0)
+                Undo?.AddAction(new MultiUndoAction(undoActions, "Moved "));
         }
 
         /// <inheritdoc />
diff --git a/Source/Editor/Windows/Assets/AssetEditorWindow.cs b/Source/Editor/Windows/Assets/AssetEditorWindow.cs
index 646112441..eeac84b60 100644
--- a/Source/Editor/Windows/Assets/AssetEditorWindow.cs
+++ b/Source/Editor/Windows/Assets/AssetEditorWindow.cs
@@ -53,7 +53,7 @@ namespace FlaxEditor.Windows.Assets
             {
                 Parent = this
             };
-            _toolstrip.AddButton(editor.Icons.Search64, () => Editor.Windows.ContentWin.Select(_item)).LinkTooltip("Show and select in Content Window");
+            _toolstrip.AddButton(editor.Icons.Search64, () => Editor.Windows.ContentWin.Select(_item)).LinkTooltip("Show and select in Content Window.");
 
             InputActions.Add(options => options.Save, Save);
 

From 0917a743cd8d91ca56eadf710f538dc81b146f34 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sun, 21 Sep 2025 17:07:13 +0200
Subject: [PATCH 014/203] Re- add particle prefix and improve some descriptions

---
 Source/Editor/Surface/Archetypes/Particles.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Editor/Surface/Archetypes/Particles.cs b/Source/Editor/Surface/Archetypes/Particles.cs
index 3747e2a60..59af7af5e 100644
--- a/Source/Editor/Surface/Archetypes/Particles.cs
+++ b/Source/Editor/Surface/Archetypes/Particles.cs
@@ -436,11 +436,11 @@ namespace FlaxEditor.Surface.Archetypes
             new NodeArchetype
             {
                 TypeID = 102,
-                Title = "Total Lifetime",
-                Description = "Total particle lifetime (in seconds), assigned when the particle is created. Always the same, no matter the particles age.",
+                Title = "Particle Total Lifetime",
+                Description = "Total particle lifetime (in seconds) at the time when the particle was created. Always the same, no matter the particles age.",
                 AlternativeTitles = new[] { "Age" },
                 Flags = NodeFlags.MaterialGraph | NodeFlags.ParticleEmitterGraph,
-                Size = new Float2(180, 30),
+                Size = new Float2(250, 30),
                 Elements = new[]
                 {
                     NodeElementArchetype.Factory.Output(0, string.Empty, typeof(float), 0),
@@ -535,7 +535,7 @@ namespace FlaxEditor.Surface.Archetypes
             {
                 TypeID = 110,
                 Title = "Particle Normalized Age",
-                Description = "Particle normalized age represented as from 0 (max lifetime) - 1 (max age) (age divided by lifetime).",
+                Description = "The normalized age of the particle, represented as 0 (max lifetime) to 1 (max age). (Same as age divided by lifetime.)",
                 AlternativeTitles = new[] { "Lifetime" },
                 Flags = NodeFlags.MaterialGraph | NodeFlags.ParticleEmitterGraph,
                 Size = new Float2(250, 30),

From 2516820e4a32c6f6d06637134ad7b935145879f6 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 3 Oct 2025 18:46:18 +0200
Subject: [PATCH 015/203] fix reloading scripts expands all folders

---
 Source/Editor/Windows/ContentWindow.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index d0cf84251..390658add 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -1086,7 +1086,8 @@ namespace FlaxEditor.Windows
                     _tree.Select(folder.Node);
             }
 
-            OnFoldersSearchBoxTextChanged();
+            if (!string.IsNullOrWhiteSpace(_foldersSearchBox.Text))
+                OnFoldersSearchBoxTextChanged();
         }
 
         private void Refresh()

From 7ba01a413fc198f68334cf6c5d1449d957973507 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 3 Oct 2025 18:50:41 +0200
Subject: [PATCH 016/203] Revert "fix reloading scripts expands all folders"

This reverts commit 2516820e4a32c6f6d06637134ad7b935145879f6.
---
 Source/Editor/Windows/ContentWindow.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index 390658add..d0cf84251 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -1086,8 +1086,7 @@ namespace FlaxEditor.Windows
                     _tree.Select(folder.Node);
             }
 
-            if (!string.IsNullOrWhiteSpace(_foldersSearchBox.Text))
-                OnFoldersSearchBoxTextChanged();
+            OnFoldersSearchBoxTextChanged();
         }
 
         private void Refresh()

From 2d4843b1f41a6e5b2b2f5d5ca342e1ab8dc2a5e1 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 3 Oct 2025 20:41:52 +0200
Subject: [PATCH 017/203] fix reloading scripts expanding scene tree

#3701
---
 Source/Editor/Content/Tree/ContentTreeNode.cs | 14 ++++++--------
 Source/Editor/SceneGraph/GUI/ActorTreeNode.cs | 11 +++++------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Source/Editor/Content/Tree/ContentTreeNode.cs b/Source/Editor/Content/Tree/ContentTreeNode.cs
index 8629296fc..ca629000d 100644
--- a/Source/Editor/Content/Tree/ContentTreeNode.cs
+++ b/Source/Editor/Content/Tree/ContentTreeNode.cs
@@ -175,15 +175,13 @@ namespace FlaxEditor.Content
                 }
             }
 
-            bool isExpanded = isAnyChildVisible;
-
-            if (isExpanded)
+            if (!noFilter)
             {
-                Expand(true);
-            }
-            else
-            {
-                Collapse(true);
+                bool isExpanded = isAnyChildVisible;
+                if (isExpanded)
+                    Expand(true);
+                else
+                    Collapse(true);
             }
 
             Visible = isThisVisible | isAnyChildVisible;
diff --git a/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs b/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
index 5f56e918a..4607a4f63 100644
--- a/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
+++ b/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
@@ -324,13 +324,12 @@ namespace FlaxEditor.SceneGraph.GUI
                 isExpanded = Editor.Instance.ProjectCache.IsExpandedActor(ref id);
             }
 
-            if (isExpanded)
+            if (!noFilter)
             {
-                Expand(true);
-            }
-            else
-            {
-                Collapse(true);
+                if (isExpanded)
+                    Expand(true);
+                else
+                    Collapse(true);
             }
 
             Visible = isThisVisible | isAnyChildVisible;

From ec08a6ca7275bcc463a4a659767f960ce1b95e5d Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 3 Oct 2025 20:44:35 +0200
Subject: [PATCH 018/203] Reapply "Merge branch
 'NoClearSearchboxesWhenStuffHappens' of https://github.com/xxSeys1/FlaxEngine
 into xxSeys1-NoClearSearchboxesWhenStuffHappens"

This reverts commit 537d8b57ca2457496322754fdc3e630d16fe28a3.
---
 Source/Editor/Windows/ContentWindow.Search.cs | 1 +
 Source/Editor/Windows/ContentWindow.cs        | 2 ++
 Source/Editor/Windows/SceneTreeWindow.cs      | 7 ++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Source/Editor/Windows/ContentWindow.Search.cs b/Source/Editor/Windows/ContentWindow.Search.cs
index f28dc4834..5a0ed63aa 100644
--- a/Source/Editor/Windows/ContentWindow.Search.cs
+++ b/Source/Editor/Windows/ContentWindow.Search.cs
@@ -115,6 +115,7 @@ namespace FlaxEditor.Windows
 
             var root = _root;
             root.LockChildrenRecursive();
+            PerformLayout();
 
             // Update tree
             var query = _foldersSearchBox.Text;
diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index 3d2ec4a66..d0cf84251 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -1085,6 +1085,8 @@ namespace FlaxEditor.Windows
                 if (Editor.ContentDatabase.Find(_lastViewedFolderBeforeReload) is ContentFolder folder)
                     _tree.Select(folder.Node);
             }
+
+            OnFoldersSearchBoxTextChanged();
         }
 
         private void Refresh()
diff --git a/Source/Editor/Windows/SceneTreeWindow.cs b/Source/Editor/Windows/SceneTreeWindow.cs
index 75a3723cf..ab6d2e262 100644
--- a/Source/Editor/Windows/SceneTreeWindow.cs
+++ b/Source/Editor/Windows/SceneTreeWindow.cs
@@ -68,6 +68,7 @@ namespace FlaxEditor.Windows
                 TooltipText = "Search the scene tree.\n\nYou can prefix your search with different search operators:\ns: -> Actor with script of type\na: -> Actor type\nc: -> Control type",
             };
             _searchBox.TextChanged += OnSearchBoxTextChanged;
+            ScriptsBuilder.ScriptsReloadEnd += OnSearchBoxTextChanged;
 
             // Scene tree panel
             _sceneTreePanel = new Panel
@@ -112,7 +113,7 @@ namespace FlaxEditor.Windows
             InputActions.Add(options => options.LockFocusSelection, () => Editor.Windows.EditWin.Viewport.LockFocusSelection());
             InputActions.Add(options => options.Rename, RenameSelection);
         }
-        
+
         /// <inheritdoc />
         public override void OnPlayBeginning()
         {
@@ -125,6 +126,7 @@ namespace FlaxEditor.Windows
         {
             base.OnPlayBegin();
             _blockSceneTreeScroll = false;
+            OnSearchBoxTextChanged();
         }
 
         /// <inheritdoc />
@@ -139,6 +141,7 @@ namespace FlaxEditor.Windows
         {
             base.OnPlayEnd();
             _blockSceneTreeScroll = true;
+            OnSearchBoxTextChanged();
         }
 
         /// <summary>
@@ -174,6 +177,7 @@ namespace FlaxEditor.Windows
                 return;
 
             _tree.LockChildrenRecursive();
+            PerformLayout();
 
             // Update tree
             var query = _searchBox.Text;
@@ -599,6 +603,7 @@ namespace FlaxEditor.Windows
             _dragHandlers = null;
             _tree = null;
             _searchBox = null;
+            ScriptsBuilder.ScriptsReloadEnd -= OnSearchBoxTextChanged;
 
             base.OnDestroy();
         }

From 18a0e8d6122303dba3a75af1e6e7adf2d2327e8e Mon Sep 17 00:00:00 2001
From: frank <fibref_233@outlook.com>
Date: Sat, 4 Oct 2025 22:37:37 +0800
Subject: [PATCH 019/203] add msdfgen for windows

---
 Source/Engine/Render2D/Render2D.Build.cs      |   1 +
 Source/ThirdParty/msdfgen/LICENSE.txt         |  21 +++
 Source/ThirdParty/msdfgen/msdfgen.Build.cs    |  45 +++++
 Source/ThirdParty/msdfgen/msdfgen.h           |   4 +
 .../ThirdParty/msdfgen/msdfgen/core/Bitmap.h  |  50 ++++++
 .../msdfgen/msdfgen/core/Bitmap.hpp           | 117 ++++++++++++
 .../msdfgen/msdfgen/core/BitmapRef.hpp        |  41 +++++
 .../ThirdParty/msdfgen/msdfgen/core/Contour.h |  34 ++++
 .../msdfgen/msdfgen/core/DistanceMapping.h    |  36 ++++
 .../msdfgen/msdfgen/core/EdgeColor.h          |  20 +++
 .../msdfgen/msdfgen/core/EdgeHolder.h         |  41 +++++
 .../msdfgen/core/MSDFErrorCorrection.h        |  55 ++++++
 .../msdfgen/msdfgen/core/Projection.h         |  37 ++++
 .../ThirdParty/msdfgen/msdfgen/core/Range.hpp |  46 +++++
 .../msdfgen/msdfgen/core/SDFTransformation.h  |  24 +++
 .../msdfgen/msdfgen/core/Scanline.h           |  56 ++++++
 .../ThirdParty/msdfgen/msdfgen/core/Shape.h   |  53 ++++++
 .../msdfgen/core/ShapeDistanceFinder.h        |  37 ++++
 .../msdfgen/core/ShapeDistanceFinder.hpp      |  60 +++++++
 .../msdfgen/msdfgen/core/SignedDistance.hpp   |  38 ++++
 .../msdfgen/msdfgen/core/Vector2.hpp          | 167 ++++++++++++++++++
 .../msdfgen/msdfgen/core/arithmetics.hpp      |  63 +++++++
 Source/ThirdParty/msdfgen/msdfgen/core/base.h |  16 ++
 .../msdfgen/core/bitmap-interpolation.hpp     |  25 +++
 .../msdfgen/msdfgen/core/contour-combiners.h  |  47 +++++
 .../msdfgen/core/convergent-curve-ordering.h  |  11 ++
 .../msdfgen/msdfgen/core/edge-coloring.h      |  29 +++
 .../msdfgen/msdfgen/core/edge-segments.h      | 146 +++++++++++++++
 .../msdfgen/msdfgen/core/edge-selectors.h     | 117 ++++++++++++
 .../msdfgen/msdfgen/core/equation-solver.h    |  14 ++
 .../msdfgen/msdfgen/core/export-svg.h         |  11 ++
 .../msdfgen/msdfgen/core/generator-config.h   |  66 +++++++
 .../msdfgen/core/msdf-error-correction.h      |  40 +++++
 .../msdfgen/msdfgen/core/pixel-conversion.hpp |  16 ++
 .../msdfgen/msdfgen/core/rasterization.h      |  25 +++
 .../msdfgen/msdfgen/core/render-sdf.h         |  23 +++
 .../msdfgen/msdfgen/core/save-bmp.h           |  16 ++
 .../msdfgen/msdfgen/core/save-fl32.h          |  12 ++
 .../msdfgen/msdfgen/core/save-rgba.h          |  16 ++
 .../msdfgen/msdfgen/core/save-tiff.h          |  13 ++
 .../msdfgen/core/sdf-error-estimation.h       |  30 ++++
 .../msdfgen/msdfgen/core/shape-description.h  |  15 ++
 .../msdfgen/msdfgen/msdfgen-config.h          |  13 ++
 Source/ThirdParty/msdfgen/msdfgen/msdfgen.h   |  78 ++++++++
 .../msdfgen/msdfgen/msdfgen/msdfgen-config.h  |  13 ++
 .../Flax.Build/Deps/Dependencies/msdfgen.cs   | 126 +++++++++++++
 46 files changed, 1964 insertions(+)
 create mode 100644 Source/ThirdParty/msdfgen/LICENSE.txt
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen.Build.cs
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.hpp
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/BitmapRef.hpp
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/Contour.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/DistanceMapping.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/EdgeColor.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/EdgeHolder.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/MSDFErrorCorrection.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/Projection.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/Range.hpp
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/SDFTransformation.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/Scanline.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/Shape.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/ShapeDistanceFinder.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/ShapeDistanceFinder.hpp
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/SignedDistance.hpp
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/Vector2.hpp
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/arithmetics.hpp
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/base.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/bitmap-interpolation.hpp
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/contour-combiners.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/convergent-curve-ordering.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/edge-coloring.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/edge-segments.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/edge-selectors.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/equation-solver.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/export-svg.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/generator-config.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/msdf-error-correction.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/pixel-conversion.hpp
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/rasterization.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/render-sdf.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/save-bmp.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/save-fl32.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/save-rgba.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/save-tiff.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/sdf-error-estimation.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/shape-description.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/msdfgen-config.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/msdfgen.h
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/msdfgen/msdfgen-config.h
 create mode 100644 Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs

diff --git a/Source/Engine/Render2D/Render2D.Build.cs b/Source/Engine/Render2D/Render2D.Build.cs
index f0be43983..a8f09270c 100644
--- a/Source/Engine/Render2D/Render2D.Build.cs
+++ b/Source/Engine/Render2D/Render2D.Build.cs
@@ -14,6 +14,7 @@ public class Render2D : EngineModule
         base.Setup(options);
 
         options.PrivateDependencies.Add("freetype");
+        options.PrivateDependencies.Add("msdfgen");
 
         options.PrivateDefinitions.Add("RENDER2D_USE_LINE_AA");
     }
diff --git a/Source/ThirdParty/msdfgen/LICENSE.txt b/Source/ThirdParty/msdfgen/LICENSE.txt
new file mode 100644
index 000000000..fbea359b2
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/LICENSE.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2014 - 2025 Viktor Chlumsky
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Source/ThirdParty/msdfgen/msdfgen.Build.cs b/Source/ThirdParty/msdfgen/msdfgen.Build.cs
new file mode 100644
index 000000000..4d4262960
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen.Build.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Wojciech Figat. All rights reserved.
+
+using System.IO;
+using Flax.Build;
+using Flax.Build.NativeCpp;
+
+/// <summary>
+/// https://github.com/Chlumsky/msdfgen
+/// </summary>
+public class msdfgen : DepsModule
+{
+    /// <inheritdoc />
+    public override void Init()
+    {
+        base.Init();
+
+        LicenseType = LicenseTypes.MIT;
+        LicenseFilePath = "LICENSE.TXT";
+
+        // Merge third-party modules into engine binary
+        BinaryModuleName = "FlaxEngine";
+    }
+
+    /// <inheritdoc />
+    public override void Setup(BuildOptions options)
+    {
+        base.Setup(options);
+
+        var depsRoot = options.DepsFolder;
+        switch (options.Platform.Target)
+        {
+        case TargetPlatform.Windows:
+            options.OutputFiles.Add(Path.Combine(depsRoot, "msdfgen-core.lib"));
+            break;
+        case TargetPlatform.Linux:
+        case TargetPlatform.Mac:
+            // todo
+            //options.OutputFiles.Add(Path.Combine(depsRoot, "msdfgen-core.a"));
+            break;
+        default: throw new InvalidPlatformException(options.Platform.Target);
+        }
+
+        options.PublicIncludePaths.Add(Path.Combine(Globals.EngineRoot, @"Source\ThirdParty\msdfgen"));
+    }
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen.h b/Source/ThirdParty/msdfgen/msdfgen.h
new file mode 100644
index 000000000..a0d69e2a5
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen.h
@@ -0,0 +1,4 @@
+
+#pragma once
+
+#include "msdfgen/msdfgen.h"
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.h b/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.h
new file mode 100644
index 000000000..9a08749f4
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.h
@@ -0,0 +1,50 @@
+
+#pragma once
+
+#include "BitmapRef.hpp"
+
+namespace msdfgen {
+
+/// A 2D image bitmap with N channels of type T. Pixel memory is managed by the class.
+template <typename T, int N = 1>
+class Bitmap {
+
+public:
+    Bitmap();
+    Bitmap(int width, int height);
+    Bitmap(const BitmapConstRef<T, N> &orig);
+    Bitmap(const Bitmap<T, N> &orig);
+#ifdef MSDFGEN_USE_CPP11
+    Bitmap(Bitmap<T, N> &&orig);
+#endif
+    ~Bitmap();
+    Bitmap<T, N> &operator=(const BitmapConstRef<T, N> &orig);
+    Bitmap<T, N> &operator=(const Bitmap<T, N> &orig);
+#ifdef MSDFGEN_USE_CPP11
+    Bitmap<T, N> &operator=(Bitmap<T, N> &&orig);
+#endif
+    /// Bitmap width in pixels.
+    int width() const;
+    /// Bitmap height in pixels.
+    int height() const;
+    T *operator()(int x, int y);
+    const T *operator()(int x, int y) const;
+#ifdef MSDFGEN_USE_CPP11
+    explicit operator T *();
+    explicit operator const T *() const;
+#else
+    operator T *();
+    operator const T *() const;
+#endif
+    operator BitmapRef<T, N>();
+    operator BitmapConstRef<T, N>() const;
+
+private:
+    T *pixels;
+    int w, h;
+
+};
+
+}
+
+#include "Bitmap.hpp"
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.hpp b/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.hpp
new file mode 100644
index 000000000..940435778
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.hpp
@@ -0,0 +1,117 @@
+
+#include "Bitmap.h"
+
+#include <cstdlib>
+#include <cstring>
+
+namespace msdfgen {
+
+template <typename T, int N>
+Bitmap<T, N>::Bitmap() : pixels(NULL), w(0), h(0) { }
+
+template <typename T, int N>
+Bitmap<T, N>::Bitmap(int width, int height) : w(width), h(height) {
+    pixels = new T[N*w*h];
+}
+
+template <typename T, int N>
+Bitmap<T, N>::Bitmap(const BitmapConstRef<T, N> &orig) : w(orig.width), h(orig.height) {
+    pixels = new T[N*w*h];
+    memcpy(pixels, orig.pixels, sizeof(T)*N*w*h);
+}
+
+template <typename T, int N>
+Bitmap<T, N>::Bitmap(const Bitmap<T, N> &orig) : w(orig.w), h(orig.h) {
+    pixels = new T[N*w*h];
+    memcpy(pixels, orig.pixels, sizeof(T)*N*w*h);
+}
+
+#ifdef MSDFGEN_USE_CPP11
+template <typename T, int N>
+Bitmap<T, N>::Bitmap(Bitmap<T, N> &&orig) : pixels(orig.pixels), w(orig.w), h(orig.h) {
+    orig.pixels = NULL;
+    orig.w = 0, orig.h = 0;
+}
+#endif
+
+template <typename T, int N>
+Bitmap<T, N>::~Bitmap() {
+    delete [] pixels;
+}
+
+template <typename T, int N>
+Bitmap<T, N> &Bitmap<T, N>::operator=(const BitmapConstRef<T, N> &orig) {
+    if (pixels != orig.pixels) {
+        delete [] pixels;
+        w = orig.width, h = orig.height;
+        pixels = new T[N*w*h];
+        memcpy(pixels, orig.pixels, sizeof(T)*N*w*h);
+    }
+    return *this;
+}
+
+template <typename T, int N>
+Bitmap<T, N> &Bitmap<T, N>::operator=(const Bitmap<T, N> &orig) {
+    if (this != &orig) {
+        delete [] pixels;
+        w = orig.w, h = orig.h;
+        pixels = new T[N*w*h];
+        memcpy(pixels, orig.pixels, sizeof(T)*N*w*h);
+    }
+    return *this;
+}
+
+#ifdef MSDFGEN_USE_CPP11
+template <typename T, int N>
+Bitmap<T, N> &Bitmap<T, N>::operator=(Bitmap<T, N> &&orig) {
+    if (this != &orig) {
+        delete [] pixels;
+        pixels = orig.pixels;
+        w = orig.w, h = orig.h;
+        orig.pixels = NULL;
+    }
+    return *this;
+}
+#endif
+
+template <typename T, int N>
+int Bitmap<T, N>::width() const {
+    return w;
+}
+
+template <typename T, int N>
+int Bitmap<T, N>::height() const {
+    return h;
+}
+
+template <typename T, int N>
+T *Bitmap<T, N>::operator()(int x, int y) {
+    return pixels+N*(w*y+x);
+}
+
+template <typename T, int N>
+const T *Bitmap<T, N>::operator()(int x, int y) const {
+    return pixels+N*(w*y+x);
+}
+
+template <typename T, int N>
+Bitmap<T, N>::operator T *() {
+    return pixels;
+}
+
+template <typename T, int N>
+Bitmap<T, N>::operator const T *() const {
+    return pixels;
+}
+
+template <typename T, int N>
+Bitmap<T, N>::operator BitmapRef<T, N>() {
+    return BitmapRef<T, N>(pixels, w, h);
+}
+
+template <typename T, int N>
+Bitmap<T, N>::operator BitmapConstRef<T, N>() const {
+    return BitmapConstRef<T, N>(pixels, w, h);
+}
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/BitmapRef.hpp b/Source/ThirdParty/msdfgen/msdfgen/core/BitmapRef.hpp
new file mode 100644
index 000000000..cb17f95dc
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/BitmapRef.hpp
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "base.h"
+
+namespace msdfgen {
+
+/// Reference to a 2D image bitmap or a buffer acting as one. Pixel storage not owned or managed by the object.
+template <typename T, int N = 1>
+struct BitmapRef {
+
+    T *pixels;
+    int width, height;
+
+    inline BitmapRef() : pixels(NULL), width(0), height(0) { }
+    inline BitmapRef(T *pixels, int width, int height) : pixels(pixels), width(width), height(height) { }
+
+    inline T *operator()(int x, int y) const {
+        return pixels+N*(width*y+x);
+    }
+
+};
+
+/// Constant reference to a 2D image bitmap or a buffer acting as one. Pixel storage not owned or managed by the object.
+template <typename T, int N = 1>
+struct BitmapConstRef {
+
+    const T *pixels;
+    int width, height;
+
+    inline BitmapConstRef() : pixels(NULL), width(0), height(0) { }
+    inline BitmapConstRef(const T *pixels, int width, int height) : pixels(pixels), width(width), height(height) { }
+    inline BitmapConstRef(const BitmapRef<T, N> &orig) : pixels(orig.pixels), width(orig.width), height(orig.height) { }
+
+    inline const T *operator()(int x, int y) const {
+        return pixels+N*(width*y+x);
+    }
+
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/Contour.h b/Source/ThirdParty/msdfgen/msdfgen/core/Contour.h
new file mode 100644
index 000000000..4cae48fad
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/Contour.h
@@ -0,0 +1,34 @@
+
+#pragma once
+
+#include <vector>
+#include "EdgeHolder.h"
+
+namespace msdfgen {
+
+/// A single closed contour of a shape.
+class Contour {
+
+public:
+    /// The sequence of edges that make up the contour.
+    std::vector<EdgeHolder> edges;
+
+    /// Adds an edge to the contour.
+    void addEdge(const EdgeHolder &edge);
+#ifdef MSDFGEN_USE_CPP11
+    void addEdge(EdgeHolder &&edge);
+#endif
+    /// Creates a new edge in the contour and returns its reference.
+    EdgeHolder &addEdge();
+    /// Adjusts the bounding box to fit the contour.
+    void bound(double &l, double &b, double &r, double &t) const;
+    /// Adjusts the bounding box to fit the contour border's mitered corners.
+    void boundMiters(double &l, double &b, double &r, double &t, double border, double miterLimit, int polarity) const;
+    /// Computes the winding of the contour. Returns 1 if positive, -1 if negative.
+    int winding() const;
+    /// Reverses the sequence of edges on the contour.
+    void reverse();
+
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/DistanceMapping.h b/Source/ThirdParty/msdfgen/msdfgen/core/DistanceMapping.h
new file mode 100644
index 000000000..fadbefa54
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/DistanceMapping.h
@@ -0,0 +1,36 @@
+
+#pragma once
+
+#include "Range.hpp"
+
+namespace msdfgen {
+
+/// Linear transformation of signed distance values.
+class DistanceMapping {
+
+public:
+    /// Explicitly designates value as distance delta rather than an absolute distance.
+    class Delta {
+    public:
+        double value;
+        inline explicit Delta(double distanceDelta) : value(distanceDelta) { }
+        inline operator double() const { return value; }
+    };
+
+    static DistanceMapping inverse(Range range);
+
+    DistanceMapping();
+    DistanceMapping(Range range);
+    double operator()(double d) const;
+    double operator()(Delta d) const;
+    DistanceMapping inverse() const;
+
+private:
+    double scale;
+    double translate;
+
+    inline DistanceMapping(double scale, double translate) : scale(scale), translate(translate) { }
+
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/EdgeColor.h b/Source/ThirdParty/msdfgen/msdfgen/core/EdgeColor.h
new file mode 100644
index 000000000..5d3730c9a
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/EdgeColor.h
@@ -0,0 +1,20 @@
+
+#pragma once
+
+#include "base.h"
+
+namespace msdfgen {
+
+/// Edge color specifies which color channels an edge belongs to.
+enum EdgeColor {
+    BLACK = 0,
+    RED = 1,
+    GREEN = 2,
+    YELLOW = 3,
+    BLUE = 4,
+    MAGENTA = 5,
+    CYAN = 6,
+    WHITE = 7
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/EdgeHolder.h b/Source/ThirdParty/msdfgen/msdfgen/core/EdgeHolder.h
new file mode 100644
index 000000000..5ae2dc231
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/EdgeHolder.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "edge-segments.h"
+
+namespace msdfgen {
+
+/// Container for a single edge of dynamic type.
+class EdgeHolder {
+
+public:
+    /// Swaps the edges held by a and b.
+    static void swap(EdgeHolder &a, EdgeHolder &b);
+
+    inline EdgeHolder() : edgeSegment() { }
+    inline EdgeHolder(EdgeSegment *segment) : edgeSegment(segment) { }
+    inline EdgeHolder(Point2 p0, Point2 p1, EdgeColor edgeColor = WHITE) : edgeSegment(EdgeSegment::create(p0, p1, edgeColor)) { }
+    inline EdgeHolder(Point2 p0, Point2 p1, Point2 p2, EdgeColor edgeColor = WHITE) : edgeSegment(EdgeSegment::create(p0, p1, p2, edgeColor)) { }
+    inline EdgeHolder(Point2 p0, Point2 p1, Point2 p2, Point2 p3, EdgeColor edgeColor = WHITE) : edgeSegment(EdgeSegment::create(p0, p1, p2, p3, edgeColor)) { }
+    EdgeHolder(const EdgeHolder &orig);
+#ifdef MSDFGEN_USE_CPP11
+    EdgeHolder(EdgeHolder &&orig);
+#endif
+    ~EdgeHolder();
+    EdgeHolder &operator=(const EdgeHolder &orig);
+#ifdef MSDFGEN_USE_CPP11
+    EdgeHolder &operator=(EdgeHolder &&orig);
+#endif
+    EdgeSegment &operator*();
+    const EdgeSegment &operator*() const;
+    EdgeSegment *operator->();
+    const EdgeSegment *operator->() const;
+    operator EdgeSegment *();
+    operator const EdgeSegment *() const;
+
+private:
+    EdgeSegment *edgeSegment;
+
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/MSDFErrorCorrection.h b/Source/ThirdParty/msdfgen/msdfgen/core/MSDFErrorCorrection.h
new file mode 100644
index 000000000..9cd14eccf
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/MSDFErrorCorrection.h
@@ -0,0 +1,55 @@
+
+#pragma once
+
+#include "SDFTransformation.h"
+#include "Shape.h"
+#include "BitmapRef.hpp"
+
+namespace msdfgen {
+
+/// Performs error correction on a computed MSDF to eliminate interpolation artifacts. This is a low-level class, you may want to use the API in msdf-error-correction.h instead.
+class MSDFErrorCorrection {
+
+public:
+    /// Stencil flags.
+    enum Flags {
+        /// Texel marked as potentially causing interpolation errors.
+        ERROR = 1,
+        /// Texel marked as protected. Protected texels are only given the error flag if they cause inversion artifacts.
+        PROTECTED = 2
+    };
+
+    MSDFErrorCorrection();
+    explicit MSDFErrorCorrection(const BitmapRef<byte, 1> &stencil, const SDFTransformation &transformation);
+    /// Sets the minimum ratio between the actual and maximum expected distance delta to be considered an error.
+    void setMinDeviationRatio(double minDeviationRatio);
+    /// Sets the minimum ratio between the pre-correction distance error and the post-correction distance error.
+    void setMinImproveRatio(double minImproveRatio);
+    /// Flags all texels that are interpolated at corners as protected.
+    void protectCorners(const Shape &shape);
+    /// Flags all texels that contribute to edges as protected.
+    template <int N>
+    void protectEdges(const BitmapConstRef<float, N> &sdf);
+    /// Flags all texels as protected.
+    void protectAll();
+    /// Flags texels that are expected to cause interpolation artifacts based on analysis of the SDF only.
+    template <int N>
+    void findErrors(const BitmapConstRef<float, N> &sdf);
+    /// Flags texels that are expected to cause interpolation artifacts based on analysis of the SDF and comparison with the exact shape distance.
+    template <template <typename> class ContourCombiner, int N>
+    void findErrors(const BitmapConstRef<float, N> &sdf, const Shape &shape);
+    /// Modifies the MSDF so that all texels with the error flag are converted to single-channel.
+    template <int N>
+    void apply(const BitmapRef<float, N> &sdf) const;
+    /// Returns the stencil in its current state (see Flags).
+    BitmapConstRef<byte, 1> getStencil() const;
+
+private:
+    BitmapRef<byte, 1> stencil;
+    SDFTransformation transformation;
+    double minDeviationRatio;
+    double minImproveRatio;
+
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/Projection.h b/Source/ThirdParty/msdfgen/msdfgen/core/Projection.h
new file mode 100644
index 000000000..3c457776a
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/Projection.h
@@ -0,0 +1,37 @@
+
+#pragma once
+
+#include "Vector2.hpp"
+
+namespace msdfgen {
+
+/// A transformation from shape coordinates to pixel coordinates.
+class Projection {
+
+public:
+    Projection();
+    Projection(const Vector2 &scale, const Vector2 &translate);
+    /// Converts the shape coordinate to pixel coordinate.
+    Point2 project(const Point2 &coord) const;
+    /// Converts the pixel coordinate to shape coordinate.
+    Point2 unproject(const Point2 &coord) const;
+    /// Converts the vector to pixel coordinate space.
+    Vector2 projectVector(const Vector2 &vector) const;
+    /// Converts the vector from pixel coordinate space.
+    Vector2 unprojectVector(const Vector2 &vector) const;
+    /// Converts the X-coordinate from shape to pixel coordinate space.
+    double projectX(double x) const;
+    /// Converts the Y-coordinate from shape to pixel coordinate space.
+    double projectY(double y) const;
+    /// Converts the X-coordinate from pixel to shape coordinate space.
+    double unprojectX(double x) const;
+    /// Converts the Y-coordinate from pixel to shape coordinate space.
+    double unprojectY(double y) const;
+
+private:
+    Vector2 scale;
+    Vector2 translate;
+
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/Range.hpp b/Source/ThirdParty/msdfgen/msdfgen/core/Range.hpp
new file mode 100644
index 000000000..e145647b1
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/Range.hpp
@@ -0,0 +1,46 @@
+
+#pragma once
+
+#include "base.h"
+
+namespace msdfgen {
+
+/**
+ * Represents the range between two real values.
+ * For example, the range of representable signed distances.
+ */
+struct Range {
+
+    double lower, upper;
+
+    inline Range(double symmetricalWidth = 0) : lower(-.5*symmetricalWidth), upper(.5*symmetricalWidth) { }
+
+    inline Range(double lowerBound, double upperBound) : lower(lowerBound), upper(upperBound) { }
+
+    inline Range &operator*=(double factor) {
+        lower *= factor;
+        upper *= factor;
+        return *this;
+    }
+
+    inline Range &operator/=(double divisor) {
+        lower /= divisor;
+        upper /= divisor;
+        return *this;
+    }
+
+    inline Range operator*(double factor) const {
+        return Range(lower*factor, upper*factor);
+    }
+
+    inline Range operator/(double divisor) const {
+        return Range(lower/divisor, upper/divisor);
+    }
+
+};
+
+inline Range operator*(double factor, const Range &range) {
+    return Range(factor*range.lower, factor*range.upper);
+}
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/SDFTransformation.h b/Source/ThirdParty/msdfgen/msdfgen/core/SDFTransformation.h
new file mode 100644
index 000000000..b056414f5
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/SDFTransformation.h
@@ -0,0 +1,24 @@
+
+#pragma once
+
+#include "Projection.h"
+#include "DistanceMapping.h"
+
+namespace msdfgen {
+
+/**
+ * Full signed distance field transformation specifies both spatial transformation (Projection)
+ * as well as distance value transformation (DistanceMapping).
+ */
+class SDFTransformation : public Projection {
+
+public:
+    DistanceMapping distanceMapping;
+
+    inline SDFTransformation() { }
+
+    inline SDFTransformation(const Projection &projection, const DistanceMapping &distanceMapping) : Projection(projection), distanceMapping(distanceMapping) { }
+
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/Scanline.h b/Source/ThirdParty/msdfgen/msdfgen/core/Scanline.h
new file mode 100644
index 000000000..c0abc6864
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/Scanline.h
@@ -0,0 +1,56 @@
+
+#pragma once
+
+#include <vector>
+#include "base.h"
+
+namespace msdfgen {
+
+/// Fill rule dictates how intersection total is interpreted during rasterization.
+enum FillRule {
+    FILL_NONZERO,
+    FILL_ODD, // "even-odd"
+    FILL_POSITIVE,
+    FILL_NEGATIVE
+};
+
+/// Resolves the number of intersection into a binary fill value based on fill rule.
+bool interpretFillRule(int intersections, FillRule fillRule);
+
+/// Represents a horizontal scanline intersecting a shape.
+class Scanline {
+
+public:
+    /// An intersection with the scanline.
+    struct Intersection {
+        /// X coordinate.
+        double x;
+        /// Normalized Y direction of the oriented edge at the point of intersection.
+        int direction;
+    };
+
+    static double overlap(const Scanline &a, const Scanline &b, double xFrom, double xTo, FillRule fillRule);
+
+    Scanline();
+    /// Populates the intersection list.
+    void setIntersections(const std::vector<Intersection> &intersections);
+#ifdef MSDFGEN_USE_CPP11
+    void setIntersections(std::vector<Intersection> &&intersections);
+#endif
+    /// Returns the number of intersections left of x.
+    int countIntersections(double x) const;
+    /// Returns the total sign of intersections left of x.
+    int sumIntersections(double x) const;
+    /// Decides whether the scanline is filled at x based on fill rule.
+    bool filled(double x, FillRule fillRule) const;
+
+private:
+    std::vector<Intersection> intersections;
+    mutable int lastIndex;
+
+    void preprocess();
+    int moveTo(double x) const;
+
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/Shape.h b/Source/ThirdParty/msdfgen/msdfgen/core/Shape.h
new file mode 100644
index 000000000..248b19225
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/Shape.h
@@ -0,0 +1,53 @@
+
+#pragma once
+
+#include <vector>
+#include "Contour.h"
+#include "Scanline.h"
+
+namespace msdfgen {
+
+// Threshold of the dot product of adjacent edge directions to be considered convergent.
+#define MSDFGEN_CORNER_DOT_EPSILON .000001
+
+/// Vector shape representation.
+class Shape {
+
+public:
+    struct Bounds {
+        double l, b, r, t;
+    };
+
+    /// The list of contours the shape consists of.
+    std::vector<Contour> contours;
+    /// Specifies whether the shape uses bottom-to-top (false) or top-to-bottom (true) Y coordinates.
+    bool inverseYAxis;
+
+    Shape();
+    /// Adds a contour.
+    void addContour(const Contour &contour);
+#ifdef MSDFGEN_USE_CPP11
+    void addContour(Contour &&contour);
+#endif
+    /// Adds a blank contour and returns its reference.
+    Contour &addContour();
+    /// Normalizes the shape geometry for distance field generation.
+    void normalize();
+    /// Performs basic checks to determine if the object represents a valid shape.
+    bool validate() const;
+    /// Adjusts the bounding box to fit the shape.
+    void bound(double &l, double &b, double &r, double &t) const;
+    /// Adjusts the bounding box to fit the shape border's mitered corners.
+    void boundMiters(double &l, double &b, double &r, double &t, double border, double miterLimit, int polarity) const;
+    /// Computes the minimum bounding box that fits the shape, optionally with a (mitered) border.
+    Bounds getBounds(double border = 0, double miterLimit = 0, int polarity = 0) const;
+    /// Outputs the scanline that intersects the shape at y.
+    void scanline(Scanline &line, double y) const;
+    /// Returns the total number of edge segments
+    int edgeCount() const;
+    /// Assumes its contours are unoriented (even-odd fill rule). Attempts to orient them to conform to the non-zero winding rule.
+    void orientContours();
+
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/ShapeDistanceFinder.h b/Source/ThirdParty/msdfgen/msdfgen/core/ShapeDistanceFinder.h
new file mode 100644
index 000000000..d8a584f64
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/ShapeDistanceFinder.h
@@ -0,0 +1,37 @@
+
+#pragma once
+
+#include <vector>
+#include "Vector2.hpp"
+#include "edge-selectors.h"
+#include "contour-combiners.h"
+
+namespace msdfgen {
+
+/// Finds the distance between a point and a Shape. ContourCombiner dictates the distance metric and its data type.
+template <class ContourCombiner>
+class ShapeDistanceFinder {
+
+public:
+    typedef typename ContourCombiner::DistanceType DistanceType;
+
+    // Passed shape object must persist until the distance finder is destroyed!
+    explicit ShapeDistanceFinder(const Shape &shape);
+    /// Finds the distance from origin. Not thread-safe! Is fastest when subsequent queries are close together.
+    DistanceType distance(const Point2 &origin);
+
+    /// Finds the distance between shape and origin. Does not allocate result cache used to optimize performance of multiple queries.
+    static DistanceType oneShotDistance(const Shape &shape, const Point2 &origin);
+
+private:
+    const Shape &shape;
+    ContourCombiner contourCombiner;
+    std::vector<typename ContourCombiner::EdgeSelectorType::EdgeCache> shapeEdgeCache;
+
+};
+
+typedef ShapeDistanceFinder<SimpleContourCombiner<TrueDistanceSelector> > SimpleTrueShapeDistanceFinder;
+
+}
+
+#include "ShapeDistanceFinder.hpp"
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/ShapeDistanceFinder.hpp b/Source/ThirdParty/msdfgen/msdfgen/core/ShapeDistanceFinder.hpp
new file mode 100644
index 000000000..07fb5cdc0
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/ShapeDistanceFinder.hpp
@@ -0,0 +1,60 @@
+
+#include "ShapeDistanceFinder.h"
+
+namespace msdfgen {
+
+template <class ContourCombiner>
+ShapeDistanceFinder<ContourCombiner>::ShapeDistanceFinder(const Shape &shape) : shape(shape), contourCombiner(shape), shapeEdgeCache(shape.edgeCount()) { }
+
+template <class ContourCombiner>
+typename ShapeDistanceFinder<ContourCombiner>::DistanceType ShapeDistanceFinder<ContourCombiner>::distance(const Point2 &origin) {
+    contourCombiner.reset(origin);
+#ifdef MSDFGEN_USE_CPP11
+    typename ContourCombiner::EdgeSelectorType::EdgeCache *edgeCache = shapeEdgeCache.data();
+#else
+    typename ContourCombiner::EdgeSelectorType::EdgeCache *edgeCache = shapeEdgeCache.empty() ? NULL : &shapeEdgeCache[0];
+#endif
+
+    for (std::vector<Contour>::const_iterator contour = shape.contours.begin(); contour != shape.contours.end(); ++contour) {
+        if (!contour->edges.empty()) {
+            typename ContourCombiner::EdgeSelectorType &edgeSelector = contourCombiner.edgeSelector(int(contour-shape.contours.begin()));
+
+            const EdgeSegment *prevEdge = contour->edges.size() >= 2 ? *(contour->edges.end()-2) : *contour->edges.begin();
+            const EdgeSegment *curEdge = contour->edges.back();
+            for (std::vector<EdgeHolder>::const_iterator edge = contour->edges.begin(); edge != contour->edges.end(); ++edge) {
+                const EdgeSegment *nextEdge = *edge;
+                edgeSelector.addEdge(*edgeCache++, prevEdge, curEdge, nextEdge);
+                prevEdge = curEdge;
+                curEdge = nextEdge;
+            }
+        }
+    }
+
+    return contourCombiner.distance();
+}
+
+template <class ContourCombiner>
+typename ShapeDistanceFinder<ContourCombiner>::DistanceType ShapeDistanceFinder<ContourCombiner>::oneShotDistance(const Shape &shape, const Point2 &origin) {
+    ContourCombiner contourCombiner(shape);
+    contourCombiner.reset(origin);
+
+    for (std::vector<Contour>::const_iterator contour = shape.contours.begin(); contour != shape.contours.end(); ++contour) {
+        if (!contour->edges.empty()) {
+            typename ContourCombiner::EdgeSelectorType &edgeSelector = contourCombiner.edgeSelector(int(contour-shape.contours.begin()));
+
+            const EdgeSegment *prevEdge = contour->edges.size() >= 2 ? *(contour->edges.end()-2) : *contour->edges.begin();
+            const EdgeSegment *curEdge = contour->edges.back();
+            for (std::vector<EdgeHolder>::const_iterator edge = contour->edges.begin(); edge != contour->edges.end(); ++edge) {
+                const EdgeSegment *nextEdge = *edge;
+                typename ContourCombiner::EdgeSelectorType::EdgeCache dummy;
+                edgeSelector.addEdge(dummy, prevEdge, curEdge, nextEdge);
+                prevEdge = curEdge;
+                curEdge = nextEdge;
+            }
+        }
+    }
+
+    return contourCombiner.distance();
+}
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/SignedDistance.hpp b/Source/ThirdParty/msdfgen/msdfgen/core/SignedDistance.hpp
new file mode 100644
index 000000000..62e73c03a
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/SignedDistance.hpp
@@ -0,0 +1,38 @@
+
+#pragma once
+
+#include <cmath>
+#include <cfloat>
+#include "base.h"
+
+namespace msdfgen {
+
+/// Represents a signed distance and alignment, which together can be compared to uniquely determine the closest edge segment.
+class SignedDistance {
+
+public:
+    double distance;
+    double dot;
+
+    inline SignedDistance() : distance(-DBL_MAX), dot(0) { }
+    inline SignedDistance(double dist, double d) : distance(dist), dot(d) { }
+
+};
+
+inline bool operator<(const SignedDistance a, const SignedDistance b) {
+    return fabs(a.distance) < fabs(b.distance) || (fabs(a.distance) == fabs(b.distance) && a.dot < b.dot);
+}
+
+inline bool operator>(const SignedDistance a, const SignedDistance b) {
+    return fabs(a.distance) > fabs(b.distance) || (fabs(a.distance) == fabs(b.distance) && a.dot > b.dot);
+}
+
+inline bool operator<=(const SignedDistance a, const SignedDistance b) {
+    return fabs(a.distance) < fabs(b.distance) || (fabs(a.distance) == fabs(b.distance) && a.dot <= b.dot);
+}
+
+inline bool operator>=(const SignedDistance a, const SignedDistance b) {
+    return fabs(a.distance) > fabs(b.distance) || (fabs(a.distance) == fabs(b.distance) && a.dot >= b.dot);
+}
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/Vector2.hpp b/Source/ThirdParty/msdfgen/msdfgen/core/Vector2.hpp
new file mode 100644
index 000000000..03759bcc1
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/Vector2.hpp
@@ -0,0 +1,167 @@
+
+#pragma once
+
+#include <cmath>
+#include "base.h"
+
+namespace msdfgen {
+
+/**
+ * A 2-dimensional euclidean floating-point vector.
+ * @author Viktor Chlumsky
+ */
+struct Vector2 {
+
+    double x, y;
+
+    inline Vector2(double val = 0) : x(val), y(val) { }
+
+    inline Vector2(double x, double y) : x(x), y(y) { }
+
+    /// Sets the vector to zero.
+    inline void reset() {
+        x = 0, y = 0;
+    }
+
+    /// Sets individual elements of the vector.
+    inline void set(double newX, double newY) {
+        x = newX, y = newY;
+    }
+
+    /// Returns the vector's squared length.
+    inline double squaredLength() const {
+        return x*x+y*y;
+    }
+
+    /// Returns the vector's length.
+    inline double length() const {
+        return sqrt(x*x+y*y);
+    }
+
+    /// Returns the normalized vector - one that has the same direction but unit length.
+    inline Vector2 normalize(bool allowZero = false) const {
+        if (double len = length())
+            return Vector2(x/len, y/len);
+        return Vector2(0, !allowZero);
+    }
+
+    /// Returns a vector with the same length that is orthogonal to this one.
+    inline Vector2 getOrthogonal(bool polarity = true) const {
+        return polarity ? Vector2(-y, x) : Vector2(y, -x);
+    }
+
+    /// Returns a vector with unit length that is orthogonal to this one.
+    inline Vector2 getOrthonormal(bool polarity = true, bool allowZero = false) const {
+        if (double len = length())
+            return polarity ? Vector2(-y/len, x/len) : Vector2(y/len, -x/len);
+        return polarity ? Vector2(0, !allowZero) : Vector2(0, -!allowZero);
+    }
+
+#ifdef MSDFGEN_USE_CPP11
+    inline explicit operator bool() const {
+        return x || y;
+    }
+#else
+    inline operator const void *() const {
+        return x || y ? this : NULL;
+    }
+#endif
+
+    inline Vector2 &operator+=(const Vector2 other) {
+        x += other.x, y += other.y;
+        return *this;
+    }
+
+    inline Vector2 &operator-=(const Vector2 other) {
+        x -= other.x, y -= other.y;
+        return *this;
+    }
+
+    inline Vector2 &operator*=(const Vector2 other) {
+        x *= other.x, y *= other.y;
+        return *this;
+    }
+
+    inline Vector2 &operator/=(const Vector2 other) {
+        x /= other.x, y /= other.y;
+        return *this;
+    }
+
+    inline Vector2 &operator*=(double value) {
+        x *= value, y *= value;
+        return *this;
+    }
+
+    inline Vector2 &operator/=(double value) {
+        x /= value, y /= value;
+        return *this;
+    }
+
+};
+
+/// A vector may also represent a point, which shall be differentiated semantically using the alias Point2.
+typedef Vector2 Point2;
+
+/// Dot product of two vectors.
+inline double dotProduct(const Vector2 a, const Vector2 b) {
+    return a.x*b.x+a.y*b.y;
+}
+
+/// A special version of the cross product for 2D vectors (returns scalar value).
+inline double crossProduct(const Vector2 a, const Vector2 b) {
+    return a.x*b.y-a.y*b.x;
+}
+
+inline bool operator==(const Vector2 a, const Vector2 b) {
+    return a.x == b.x && a.y == b.y;
+}
+
+inline bool operator!=(const Vector2 a, const Vector2 b) {
+    return a.x != b.x || a.y != b.y;
+}
+
+inline Vector2 operator+(const Vector2 v) {
+    return v;
+}
+
+inline Vector2 operator-(const Vector2 v) {
+    return Vector2(-v.x, -v.y);
+}
+
+inline bool operator!(const Vector2 v) {
+    return !v.x && !v.y;
+}
+
+inline Vector2 operator+(const Vector2 a, const Vector2 b) {
+    return Vector2(a.x+b.x, a.y+b.y);
+}
+
+inline Vector2 operator-(const Vector2 a, const Vector2 b) {
+    return Vector2(a.x-b.x, a.y-b.y);
+}
+
+inline Vector2 operator*(const Vector2 a, const Vector2 b) {
+    return Vector2(a.x*b.x, a.y*b.y);
+}
+
+inline Vector2 operator/(const Vector2 a, const Vector2 b) {
+    return Vector2(a.x/b.x, a.y/b.y);
+}
+
+inline Vector2 operator*(double a, const Vector2 b) {
+    return Vector2(a*b.x, a*b.y);
+}
+
+inline Vector2 operator/(double a, const Vector2 b) {
+    return Vector2(a/b.x, a/b.y);
+}
+
+inline Vector2 operator*(const Vector2 a, double b) {
+    return Vector2(a.x*b, a.y*b);
+}
+
+inline Vector2 operator/(const Vector2 a, double b) {
+    return Vector2(a.x/b, a.y/b);
+}
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/arithmetics.hpp b/Source/ThirdParty/msdfgen/msdfgen/core/arithmetics.hpp
new file mode 100644
index 000000000..d5158ad0d
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/arithmetics.hpp
@@ -0,0 +1,63 @@
+
+#pragma once
+
+#include <cmath>
+#include "base.h"
+
+namespace msdfgen {
+
+/// Returns the smaller of the arguments.
+template <typename T>
+inline T min(T a, T b) {
+    return b < a ? b : a;
+}
+
+/// Returns the larger of the arguments.
+template <typename T>
+inline T max(T a, T b) {
+    return a < b ? b : a;
+}
+
+/// Returns the middle out of three values
+template <typename T>
+inline T median(T a, T b, T c) {
+    return max(min(a, b), min(max(a, b), c));
+}
+
+/// Returns the weighted average of a and b.
+template <typename T, typename S>
+inline T mix(T a, T b, S weight) {
+    return T((S(1)-weight)*a+weight*b);
+}
+
+/// Clamps the number to the interval from 0 to 1.
+template <typename T>
+inline T clamp(T n) {
+    return n >= T(0) && n <= T(1) ? n : T(n > T(0));
+}
+
+/// Clamps the number to the interval from 0 to b.
+template <typename T>
+inline T clamp(T n, T b) {
+    return n >= T(0) && n <= b ? n : T(n > T(0))*b;
+}
+
+/// Clamps the number to the interval from a to b.
+template <typename T>
+inline T clamp(T n, T a, T b) {
+    return n >= a && n <= b ? n : n < a ? a : b;
+}
+
+/// Returns 1 for positive values, -1 for negative values, and 0 for zero.
+template <typename T>
+inline int sign(T n) {
+    return (T(0) < n)-(n < T(0));
+}
+
+/// Returns 1 for non-negative values and -1 for negative values.
+template <typename T>
+inline int nonZeroSign(T n) {
+    return 2*(n > T(0))-1;
+}
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/base.h b/Source/ThirdParty/msdfgen/msdfgen/core/base.h
new file mode 100644
index 000000000..ab85c136e
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/base.h
@@ -0,0 +1,16 @@
+
+#pragma once
+
+// This file needs to be included first for all MSDFgen sources
+
+#ifndef MSDFGEN_PUBLIC
+#include <msdfgen/msdfgen-config.h>
+#endif
+
+#include <cstddef>
+
+namespace msdfgen {
+
+typedef unsigned char byte;
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/bitmap-interpolation.hpp b/Source/ThirdParty/msdfgen/msdfgen/core/bitmap-interpolation.hpp
new file mode 100644
index 000000000..ca2e48c08
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/bitmap-interpolation.hpp
@@ -0,0 +1,25 @@
+
+#pragma once
+
+#include "arithmetics.hpp"
+#include "Vector2.hpp"
+#include "BitmapRef.hpp"
+
+namespace msdfgen {
+
+template <typename T, int N>
+static void interpolate(T *output, const BitmapConstRef<T, N> &bitmap, Point2 pos) {
+    pos -= .5;
+    int l = (int) floor(pos.x);
+    int b = (int) floor(pos.y);
+    int r = l+1;
+    int t = b+1;
+    double lr = pos.x-l;
+    double bt = pos.y-b;
+    l = clamp(l, bitmap.width-1), r = clamp(r, bitmap.width-1);
+    b = clamp(b, bitmap.height-1), t = clamp(t, bitmap.height-1);
+    for (int i = 0; i < N; ++i)
+        output[i] = mix(mix(bitmap(l, b)[i], bitmap(r, b)[i], lr), mix(bitmap(l, t)[i], bitmap(r, t)[i], lr), bt);
+}
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/contour-combiners.h b/Source/ThirdParty/msdfgen/msdfgen/core/contour-combiners.h
new file mode 100644
index 000000000..04dbc3423
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/contour-combiners.h
@@ -0,0 +1,47 @@
+
+#pragma once
+
+#include "Shape.h"
+#include "edge-selectors.h"
+
+namespace msdfgen {
+
+/// Simply selects the nearest contour.
+template <class EdgeSelector>
+class SimpleContourCombiner {
+
+public:
+    typedef EdgeSelector EdgeSelectorType;
+    typedef typename EdgeSelector::DistanceType DistanceType;
+
+    explicit SimpleContourCombiner(const Shape &shape);
+    void reset(const Point2 &p);
+    EdgeSelector &edgeSelector(int i);
+    DistanceType distance() const;
+
+private:
+    EdgeSelector shapeEdgeSelector;
+
+};
+
+/// Selects the nearest contour that actually forms a border between filled and unfilled area.
+template <class EdgeSelector>
+class OverlappingContourCombiner {
+
+public:
+    typedef EdgeSelector EdgeSelectorType;
+    typedef typename EdgeSelector::DistanceType DistanceType;
+
+    explicit OverlappingContourCombiner(const Shape &shape);
+    void reset(const Point2 &p);
+    EdgeSelector &edgeSelector(int i);
+    DistanceType distance() const;
+
+private:
+    Point2 p;
+    std::vector<int> windings;
+    std::vector<EdgeSelector> edgeSelectors;
+
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/convergent-curve-ordering.h b/Source/ThirdParty/msdfgen/msdfgen/core/convergent-curve-ordering.h
new file mode 100644
index 000000000..e5bbf29c8
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/convergent-curve-ordering.h
@@ -0,0 +1,11 @@
+
+#pragma once
+
+#include "edge-segments.h"
+
+namespace msdfgen {
+
+/// For curves a, b converging at P = a->point(1) = b->point(0) with the same (opposite) direction, determines the relative ordering in which they exit P (i.e. whether a is to the left or right of b at the smallest positive radius around P)
+int convergentCurveOrdering(const EdgeSegment *a, const EdgeSegment *b);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/edge-coloring.h b/Source/ThirdParty/msdfgen/msdfgen/core/edge-coloring.h
new file mode 100644
index 000000000..ffd5e6dce
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/edge-coloring.h
@@ -0,0 +1,29 @@
+
+#pragma once
+
+#include "Shape.h"
+
+#define MSDFGEN_EDGE_LENGTH_PRECISION 4
+
+namespace msdfgen {
+
+/** Assigns colors to edges of the shape in accordance to the multi-channel distance field technique.
+ *  May split some edges if necessary.
+ *  angleThreshold specifies the maximum angle (in radians) to be considered a corner, for example 3 (~172 degrees).
+ *  Values below 1/2 PI will be treated as the external angle.
+ */
+void edgeColoringSimple(Shape &shape, double angleThreshold, unsigned long long seed = 0);
+
+/** The alternative "ink trap" coloring strategy is designed for better results with typefaces
+ *  that use ink traps as a design feature. It guarantees that even if all edges that are shorter than
+ *  both their neighboring edges are removed, the coloring remains consistent with the established rules.
+ */
+void edgeColoringInkTrap(Shape &shape, double angleThreshold, unsigned long long seed = 0);
+
+/** The alternative coloring by distance tries to use different colors for edges that are close together.
+ *  This should theoretically be the best strategy on average. However, since it needs to compute the distance
+ *  between all pairs of edges, and perform a graph optimization task, it is much slower than the rest.
+ */
+void edgeColoringByDistance(Shape &shape, double angleThreshold, unsigned long long seed = 0);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/edge-segments.h b/Source/ThirdParty/msdfgen/msdfgen/core/edge-segments.h
new file mode 100644
index 000000000..815241685
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/edge-segments.h
@@ -0,0 +1,146 @@
+
+#pragma once
+
+#include "Vector2.hpp"
+#include "SignedDistance.hpp"
+#include "EdgeColor.h"
+
+namespace msdfgen {
+
+// Parameters for iterative search of closest point on a cubic Bezier curve. Increase for higher precision.
+#define MSDFGEN_CUBIC_SEARCH_STARTS 4
+#define MSDFGEN_CUBIC_SEARCH_STEPS 4
+
+/// An abstract edge segment.
+class EdgeSegment {
+
+public:
+    EdgeColor color;
+
+    static EdgeSegment *create(Point2 p0, Point2 p1, EdgeColor edgeColor = WHITE);
+    static EdgeSegment *create(Point2 p0, Point2 p1, Point2 p2, EdgeColor edgeColor = WHITE);
+    static EdgeSegment *create(Point2 p0, Point2 p1, Point2 p2, Point2 p3, EdgeColor edgeColor = WHITE);
+
+    EdgeSegment(EdgeColor edgeColor = WHITE) : color(edgeColor) { }
+    virtual ~EdgeSegment() { }
+    /// Creates a copy of the edge segment.
+    virtual EdgeSegment *clone() const = 0;
+    /// Returns the numeric code of the edge segment's type.
+    virtual int type() const = 0;
+    /// Returns the array of control points.
+    virtual const Point2 *controlPoints() const = 0;
+    /// Returns the point on the edge specified by the parameter (between 0 and 1).
+    virtual Point2 point(double param) const = 0;
+    /// Returns the direction the edge has at the point specified by the parameter.
+    virtual Vector2 direction(double param) const = 0;
+    /// Returns the change of direction (second derivative) at the point specified by the parameter.
+    virtual Vector2 directionChange(double param) const = 0;
+    /// Returns the minimum signed distance between origin and the edge.
+    virtual SignedDistance signedDistance(Point2 origin, double &param) const = 0;
+    /// Converts a previously retrieved signed distance from origin to perpendicular distance.
+    virtual void distanceToPerpendicularDistance(SignedDistance &distance, Point2 origin, double param) const;
+    /// Outputs a list of (at most three) intersections (their X coordinates) with an infinite horizontal scanline at y and returns how many there are.
+    virtual int scanlineIntersections(double x[3], int dy[3], double y) const = 0;
+    /// Adjusts the bounding box to fit the edge segment.
+    virtual void bound(double &l, double &b, double &r, double &t) const = 0;
+
+    /// Reverses the edge (swaps its start point and end point).
+    virtual void reverse() = 0;
+    /// Moves the start point of the edge segment.
+    virtual void moveStartPoint(Point2 to) = 0;
+    /// Moves the end point of the edge segment.
+    virtual void moveEndPoint(Point2 to) = 0;
+    /// Splits the edge segments into thirds which together represent the original edge.
+    virtual void splitInThirds(EdgeSegment *&part0, EdgeSegment *&part1, EdgeSegment *&part2) const = 0;
+
+};
+
+/// A line segment.
+class LinearSegment : public EdgeSegment {
+
+public:
+    enum EdgeType {
+        EDGE_TYPE = 1
+    };
+
+    Point2 p[2];
+
+    LinearSegment(Point2 p0, Point2 p1, EdgeColor edgeColor = WHITE);
+    LinearSegment *clone() const;
+    int type() const;
+    const Point2 *controlPoints() const;
+    Point2 point(double param) const;
+    Vector2 direction(double param) const;
+    Vector2 directionChange(double param) const;
+    double length() const;
+    SignedDistance signedDistance(Point2 origin, double &param) const;
+    int scanlineIntersections(double x[3], int dy[3], double y) const;
+    void bound(double &l, double &b, double &r, double &t) const;
+
+    void reverse();
+    void moveStartPoint(Point2 to);
+    void moveEndPoint(Point2 to);
+    void splitInThirds(EdgeSegment *&part0, EdgeSegment *&part1, EdgeSegment *&part2) const;
+
+};
+
+/// A quadratic Bezier curve.
+class QuadraticSegment : public EdgeSegment {
+
+public:
+    enum EdgeType {
+        EDGE_TYPE = 2
+    };
+
+    Point2 p[3];
+
+    QuadraticSegment(Point2 p0, Point2 p1, Point2 p2, EdgeColor edgeColor = WHITE);
+    QuadraticSegment *clone() const;
+    int type() const;
+    const Point2 *controlPoints() const;
+    Point2 point(double param) const;
+    Vector2 direction(double param) const;
+    Vector2 directionChange(double param) const;
+    double length() const;
+    SignedDistance signedDistance(Point2 origin, double &param) const;
+    int scanlineIntersections(double x[3], int dy[3], double y) const;
+    void bound(double &l, double &b, double &r, double &t) const;
+
+    void reverse();
+    void moveStartPoint(Point2 to);
+    void moveEndPoint(Point2 to);
+    void splitInThirds(EdgeSegment *&part0, EdgeSegment *&part1, EdgeSegment *&part2) const;
+
+    EdgeSegment *convertToCubic() const;
+
+};
+
+/// A cubic Bezier curve.
+class CubicSegment : public EdgeSegment {
+
+public:
+    enum EdgeType {
+        EDGE_TYPE = 3
+    };
+
+    Point2 p[4];
+
+    CubicSegment(Point2 p0, Point2 p1, Point2 p2, Point2 p3, EdgeColor edgeColor = WHITE);
+    CubicSegment *clone() const;
+    int type() const;
+    const Point2 *controlPoints() const;
+    Point2 point(double param) const;
+    Vector2 direction(double param) const;
+    Vector2 directionChange(double param) const;
+    SignedDistance signedDistance(Point2 origin, double &param) const;
+    int scanlineIntersections(double x[3], int dy[3], double y) const;
+    void bound(double &l, double &b, double &r, double &t) const;
+
+    void reverse();
+    void moveStartPoint(Point2 to);
+    void moveEndPoint(Point2 to);
+    void splitInThirds(EdgeSegment *&part0, EdgeSegment *&part1, EdgeSegment *&part2) const;
+
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/edge-selectors.h b/Source/ThirdParty/msdfgen/msdfgen/core/edge-selectors.h
new file mode 100644
index 000000000..59337141d
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/edge-selectors.h
@@ -0,0 +1,117 @@
+
+#pragma once
+
+#include "Vector2.hpp"
+#include "SignedDistance.hpp"
+#include "edge-segments.h"
+
+namespace msdfgen {
+
+struct MultiDistance {
+    double r, g, b;
+};
+struct MultiAndTrueDistance : MultiDistance {
+    double a;
+};
+
+/// Selects the nearest edge by its true distance.
+class TrueDistanceSelector {
+
+public:
+    typedef double DistanceType;
+
+    struct EdgeCache {
+        Point2 point;
+        double absDistance;
+
+        EdgeCache();
+    };
+
+    void reset(const Point2 &p);
+    void addEdge(EdgeCache &cache, const EdgeSegment *prevEdge, const EdgeSegment *edge, const EdgeSegment *nextEdge);
+    void merge(const TrueDistanceSelector &other);
+    DistanceType distance() const;
+
+private:
+    Point2 p;
+    SignedDistance minDistance;
+
+};
+
+class PerpendicularDistanceSelectorBase {
+
+public:
+    struct EdgeCache {
+        Point2 point;
+        double absDistance;
+        double aDomainDistance, bDomainDistance;
+        double aPerpendicularDistance, bPerpendicularDistance;
+
+        EdgeCache();
+    };
+
+    static bool getPerpendicularDistance(double &distance, const Vector2 &ep, const Vector2 &edgeDir);
+
+    PerpendicularDistanceSelectorBase();
+    void reset(double delta);
+    bool isEdgeRelevant(const EdgeCache &cache, const EdgeSegment *edge, const Point2 &p) const;
+    void addEdgeTrueDistance(const EdgeSegment *edge, const SignedDistance &distance, double param);
+    void addEdgePerpendicularDistance(double distance);
+    void merge(const PerpendicularDistanceSelectorBase &other);
+    double computeDistance(const Point2 &p) const;
+    SignedDistance trueDistance() const;
+
+private:
+    SignedDistance minTrueDistance;
+    double minNegativePerpendicularDistance;
+    double minPositivePerpendicularDistance;
+    const EdgeSegment *nearEdge;
+    double nearEdgeParam;
+
+};
+
+/// Selects the nearest edge by its perpendicular distance.
+class PerpendicularDistanceSelector : public PerpendicularDistanceSelectorBase {
+
+public:
+    typedef double DistanceType;
+
+    void reset(const Point2 &p);
+    void addEdge(EdgeCache &cache, const EdgeSegment *prevEdge, const EdgeSegment *edge, const EdgeSegment *nextEdge);
+    DistanceType distance() const;
+
+private:
+    Point2 p;
+
+};
+
+/// Selects the nearest edge for each of the three channels by its perpendicular distance.
+class MultiDistanceSelector {
+
+public:
+    typedef MultiDistance DistanceType;
+    typedef PerpendicularDistanceSelectorBase::EdgeCache EdgeCache;
+
+    void reset(const Point2 &p);
+    void addEdge(EdgeCache &cache, const EdgeSegment *prevEdge, const EdgeSegment *edge, const EdgeSegment *nextEdge);
+    void merge(const MultiDistanceSelector &other);
+    DistanceType distance() const;
+    SignedDistance trueDistance() const;
+
+private:
+    Point2 p;
+    PerpendicularDistanceSelectorBase r, g, b;
+
+};
+
+/// Selects the nearest edge for each of the three color channels by its perpendicular distance and by true distance for the alpha channel.
+class MultiAndTrueDistanceSelector : public MultiDistanceSelector {
+
+public:
+    typedef MultiAndTrueDistance DistanceType;
+
+    DistanceType distance() const;
+
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/equation-solver.h b/Source/ThirdParty/msdfgen/msdfgen/core/equation-solver.h
new file mode 100644
index 000000000..bfeeb1582
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/equation-solver.h
@@ -0,0 +1,14 @@
+
+#pragma once
+
+#include "base.h"
+
+namespace msdfgen {
+
+// ax^2 + bx + c = 0
+int solveQuadratic(double x[2], double a, double b, double c);
+
+// ax^3 + bx^2 + cx + d = 0
+int solveCubic(double x[3], double a, double b, double c, double d);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/export-svg.h b/Source/ThirdParty/msdfgen/msdfgen/core/export-svg.h
new file mode 100644
index 000000000..64b45531f
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/export-svg.h
@@ -0,0 +1,11 @@
+
+#pragma once
+
+#include "Shape.h"
+
+namespace msdfgen {
+
+bool saveSvgShape(const Shape &shape, const char *filename);
+bool saveSvgShape(const Shape &shape, const Shape::Bounds &bounds, const char *filename);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/generator-config.h b/Source/ThirdParty/msdfgen/msdfgen/core/generator-config.h
new file mode 100644
index 000000000..b7b153477
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/generator-config.h
@@ -0,0 +1,66 @@
+
+#pragma once
+
+#include "BitmapRef.hpp"
+
+#ifndef MSDFGEN_PUBLIC
+#define MSDFGEN_PUBLIC // for DLL import/export
+#endif
+
+namespace msdfgen {
+
+/// The configuration of the MSDF error correction pass.
+struct ErrorCorrectionConfig {
+    /// The default value of minDeviationRatio.
+    static MSDFGEN_PUBLIC const double defaultMinDeviationRatio;
+    /// The default value of minImproveRatio.
+    static MSDFGEN_PUBLIC const double defaultMinImproveRatio;
+
+    /// Mode of operation.
+    enum Mode {
+        /// Skips error correction pass.
+        DISABLED,
+        /// Corrects all discontinuities of the distance field regardless if edges are adversely affected.
+        INDISCRIMINATE,
+        /// Corrects artifacts at edges and other discontinuous distances only if it does not affect edges or corners.
+        EDGE_PRIORITY,
+        /// Only corrects artifacts at edges.
+        EDGE_ONLY
+    } mode;
+    /// Configuration of whether to use an algorithm that computes the exact shape distance at the positions of suspected artifacts. This algorithm can be much slower.
+    enum DistanceCheckMode {
+        /// Never computes exact shape distance.
+        DO_NOT_CHECK_DISTANCE,
+        /// Only computes exact shape distance at edges. Provides a good balance between speed and precision.
+        CHECK_DISTANCE_AT_EDGE,
+        /// Computes and compares the exact shape distance for each suspected artifact.
+        ALWAYS_CHECK_DISTANCE
+    } distanceCheckMode;
+    /// The minimum ratio between the actual and maximum expected distance delta to be considered an error.
+    double minDeviationRatio;
+    /// The minimum ratio between the pre-correction distance error and the post-correction distance error. Has no effect for DO_NOT_CHECK_DISTANCE.
+    double minImproveRatio;
+    /// An optional buffer to avoid dynamic allocation. Must have at least as many bytes as the MSDF has pixels.
+    byte *buffer;
+
+    inline explicit ErrorCorrectionConfig(Mode mode = EDGE_PRIORITY, DistanceCheckMode distanceCheckMode = CHECK_DISTANCE_AT_EDGE, double minDeviationRatio = defaultMinDeviationRatio, double minImproveRatio = defaultMinImproveRatio, byte *buffer = NULL) : mode(mode), distanceCheckMode(distanceCheckMode), minDeviationRatio(minDeviationRatio), minImproveRatio(minImproveRatio), buffer(buffer) { }
+};
+
+/// The configuration of the distance field generator algorithm.
+struct GeneratorConfig {
+    /// Specifies whether to use the version of the algorithm that supports overlapping contours with the same winding. May be set to false to improve performance when no such contours are present.
+    bool overlapSupport;
+
+    inline explicit GeneratorConfig(bool overlapSupport = true) : overlapSupport(overlapSupport) { }
+};
+
+/// The configuration of the multi-channel distance field generator algorithm.
+struct MSDFGeneratorConfig : GeneratorConfig {
+    /// Configuration of the error correction pass.
+    ErrorCorrectionConfig errorCorrection;
+
+    inline MSDFGeneratorConfig() { }
+    inline explicit MSDFGeneratorConfig(bool overlapSupport, const ErrorCorrectionConfig &errorCorrection = ErrorCorrectionConfig()) : GeneratorConfig(overlapSupport), errorCorrection(errorCorrection) { }
+};
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/msdf-error-correction.h b/Source/ThirdParty/msdfgen/msdfgen/core/msdf-error-correction.h
new file mode 100644
index 000000000..c92cbe17a
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/msdf-error-correction.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "Vector2.hpp"
+#include "Range.hpp"
+#include "Projection.h"
+#include "SDFTransformation.h"
+#include "Shape.h"
+#include "BitmapRef.hpp"
+#include "generator-config.h"
+
+namespace msdfgen {
+
+/// Predicts potential artifacts caused by the interpolation of the MSDF and corrects them by converting nearby texels to single-channel.
+void msdfErrorCorrection(const BitmapRef<float, 3> &sdf, const Shape &shape, const SDFTransformation &transformation, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+void msdfErrorCorrection(const BitmapRef<float, 4> &sdf, const Shape &shape, const SDFTransformation &transformation, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+void msdfErrorCorrection(const BitmapRef<float, 3> &sdf, const Shape &shape, const Projection &projection, Range range, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+void msdfErrorCorrection(const BitmapRef<float, 4> &sdf, const Shape &shape, const Projection &projection, Range range, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+
+/// Applies the simplified error correction to all discontiunous distances (INDISCRIMINATE mode). Does not need shape or translation.
+void msdfFastDistanceErrorCorrection(const BitmapRef<float, 3> &sdf, const SDFTransformation &transformation, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastDistanceErrorCorrection(const BitmapRef<float, 4> &sdf, const SDFTransformation &transformation, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastDistanceErrorCorrection(const BitmapRef<float, 3> &sdf, const Projection &projection, Range range, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastDistanceErrorCorrection(const BitmapRef<float, 4> &sdf, const Projection &projection, Range range, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastDistanceErrorCorrection(const BitmapRef<float, 3> &sdf, Range pxRange, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastDistanceErrorCorrection(const BitmapRef<float, 4> &sdf, Range pxRange, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+
+/// Applies the simplified error correction to edges only (EDGE_ONLY mode). Does not need shape or translation.
+void msdfFastEdgeErrorCorrection(const BitmapRef<float, 3> &sdf, const SDFTransformation &transformation, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastEdgeErrorCorrection(const BitmapRef<float, 4> &sdf, const SDFTransformation &transformation, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastEdgeErrorCorrection(const BitmapRef<float, 3> &sdf, const Projection &projection, Range range, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastEdgeErrorCorrection(const BitmapRef<float, 4> &sdf, const Projection &projection, Range range, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastEdgeErrorCorrection(const BitmapRef<float, 3> &sdf, Range pxRange, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastEdgeErrorCorrection(const BitmapRef<float, 4> &sdf, Range pxRange, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+
+/// The original version of the error correction algorithm.
+void msdfErrorCorrection_legacy(const BitmapRef<float, 3> &output, const Vector2 &threshold);
+void msdfErrorCorrection_legacy(const BitmapRef<float, 4> &output, const Vector2 &threshold);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/pixel-conversion.hpp b/Source/ThirdParty/msdfgen/msdfgen/core/pixel-conversion.hpp
new file mode 100644
index 000000000..1ab636f0d
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/pixel-conversion.hpp
@@ -0,0 +1,16 @@
+
+#pragma once
+
+#include "arithmetics.hpp"
+
+namespace msdfgen {
+
+inline byte pixelFloatToByte(float x) {
+    return byte(~int(255.5f-255.f*clamp(x)));
+}
+
+inline float pixelByteToFloat(byte x) {
+    return 1.f/255.f*float(x);
+}
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/rasterization.h b/Source/ThirdParty/msdfgen/msdfgen/core/rasterization.h
new file mode 100644
index 000000000..8ba41cd64
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/rasterization.h
@@ -0,0 +1,25 @@
+
+#pragma once
+
+#include "Vector2.hpp"
+#include "Shape.h"
+#include "Projection.h"
+#include "Scanline.h"
+#include "BitmapRef.hpp"
+
+namespace msdfgen {
+
+/// Rasterizes the shape into a monochrome bitmap.
+void rasterize(const BitmapRef<float, 1> &output, const Shape &shape, const Projection &projection, FillRule fillRule = FILL_NONZERO);
+/// Fixes the sign of the input signed distance field, so that it matches the shape's rasterized fill.
+void distanceSignCorrection(const BitmapRef<float, 1> &sdf, const Shape &shape, const Projection &projection, FillRule fillRule = FILL_NONZERO);
+void distanceSignCorrection(const BitmapRef<float, 3> &sdf, const Shape &shape, const Projection &projection, FillRule fillRule = FILL_NONZERO);
+void distanceSignCorrection(const BitmapRef<float, 4> &sdf, const Shape &shape, const Projection &projection, FillRule fillRule = FILL_NONZERO);
+
+// Old version of the function API's kept for backwards compatibility
+void rasterize(const BitmapRef<float, 1> &output, const Shape &shape, const Vector2 &scale, const Vector2 &translate, FillRule fillRule = FILL_NONZERO);
+void distanceSignCorrection(const BitmapRef<float, 1> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, FillRule fillRule = FILL_NONZERO);
+void distanceSignCorrection(const BitmapRef<float, 3> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, FillRule fillRule = FILL_NONZERO);
+void distanceSignCorrection(const BitmapRef<float, 4> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, FillRule fillRule = FILL_NONZERO);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/render-sdf.h b/Source/ThirdParty/msdfgen/msdfgen/core/render-sdf.h
new file mode 100644
index 000000000..e8ee46c55
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/render-sdf.h
@@ -0,0 +1,23 @@
+
+#pragma once
+
+#include "Vector2.hpp"
+#include "Range.hpp"
+#include "BitmapRef.hpp"
+
+namespace msdfgen {
+
+/// Reconstructs the shape's appearance into output from the distance field sdf.
+void renderSDF(const BitmapRef<float, 1> &output, const BitmapConstRef<float, 1> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
+void renderSDF(const BitmapRef<float, 3> &output, const BitmapConstRef<float, 1> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
+void renderSDF(const BitmapRef<float, 1> &output, const BitmapConstRef<float, 3> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
+void renderSDF(const BitmapRef<float, 3> &output, const BitmapConstRef<float, 3> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
+void renderSDF(const BitmapRef<float, 1> &output, const BitmapConstRef<float, 4> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
+void renderSDF(const BitmapRef<float, 4> &output, const BitmapConstRef<float, 4> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
+
+/// Snaps the values of the floating-point bitmaps into one of the 256 values representable in a standard 8-bit bitmap.
+void simulate8bit(const BitmapRef<float, 1> &bitmap);
+void simulate8bit(const BitmapRef<float, 3> &bitmap);
+void simulate8bit(const BitmapRef<float, 4> &bitmap);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/save-bmp.h b/Source/ThirdParty/msdfgen/msdfgen/core/save-bmp.h
new file mode 100644
index 000000000..98f852921
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/save-bmp.h
@@ -0,0 +1,16 @@
+
+#pragma once
+
+#include "BitmapRef.hpp"
+
+namespace msdfgen {
+
+/// Saves the bitmap as a BMP file.
+bool saveBmp(const BitmapConstRef<byte, 1> &bitmap, const char *filename);
+bool saveBmp(const BitmapConstRef<byte, 3> &bitmap, const char *filename);
+bool saveBmp(const BitmapConstRef<byte, 4> &bitmap, const char *filename);
+bool saveBmp(const BitmapConstRef<float, 1> &bitmap, const char *filename);
+bool saveBmp(const BitmapConstRef<float, 3> &bitmap, const char *filename);
+bool saveBmp(const BitmapConstRef<float, 4> &bitmap, const char *filename);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/save-fl32.h b/Source/ThirdParty/msdfgen/msdfgen/core/save-fl32.h
new file mode 100644
index 000000000..eded7f336
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/save-fl32.h
@@ -0,0 +1,12 @@
+
+#pragma once
+
+#include "BitmapRef.hpp"
+
+namespace msdfgen {
+
+/// Saves the bitmap as an uncompressed floating-point FL32 file, which can be decoded trivially.
+template <int N>
+bool saveFl32(const BitmapConstRef<float, N> &bitmap, const char *filename);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/save-rgba.h b/Source/ThirdParty/msdfgen/msdfgen/core/save-rgba.h
new file mode 100644
index 000000000..50e839645
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/save-rgba.h
@@ -0,0 +1,16 @@
+
+#pragma once
+
+#include "BitmapRef.hpp"
+
+namespace msdfgen {
+
+/// Saves the bitmap as a simple RGBA file, which can be decoded trivially.
+bool saveRgba(const BitmapConstRef<byte, 1> &bitmap, const char *filename);
+bool saveRgba(const BitmapConstRef<byte, 3> &bitmap, const char *filename);
+bool saveRgba(const BitmapConstRef<byte, 4> &bitmap, const char *filename);
+bool saveRgba(const BitmapConstRef<float, 1> &bitmap, const char *filename);
+bool saveRgba(const BitmapConstRef<float, 3> &bitmap, const char *filename);
+bool saveRgba(const BitmapConstRef<float, 4> &bitmap, const char *filename);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/save-tiff.h b/Source/ThirdParty/msdfgen/msdfgen/core/save-tiff.h
new file mode 100644
index 000000000..072cd71d5
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/save-tiff.h
@@ -0,0 +1,13 @@
+
+#pragma once
+
+#include "BitmapRef.hpp"
+
+namespace msdfgen {
+
+/// Saves the bitmap as an uncompressed floating-point TIFF file.
+bool saveTiff(const BitmapConstRef<float, 1> &bitmap, const char *filename);
+bool saveTiff(const BitmapConstRef<float, 3> &bitmap, const char *filename);
+bool saveTiff(const BitmapConstRef<float, 4> &bitmap, const char *filename);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/sdf-error-estimation.h b/Source/ThirdParty/msdfgen/msdfgen/core/sdf-error-estimation.h
new file mode 100644
index 000000000..f9008222a
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/sdf-error-estimation.h
@@ -0,0 +1,30 @@
+
+#pragma once
+
+#include "Vector2.hpp"
+#include "Shape.h"
+#include "Projection.h"
+#include "Scanline.h"
+#include "BitmapRef.hpp"
+
+namespace msdfgen {
+
+/// Analytically constructs a scanline at y evaluating fill by linear interpolation of the SDF.
+void scanlineSDF(Scanline &line, const BitmapConstRef<float, 1> &sdf, const Projection &projection, double y, bool inverseYAxis = false);
+void scanlineSDF(Scanline &line, const BitmapConstRef<float, 3> &sdf, const Projection &projection, double y, bool inverseYAxis = false);
+void scanlineSDF(Scanline &line, const BitmapConstRef<float, 4> &sdf, const Projection &projection, double y, bool inverseYAxis = false);
+
+/// Estimates the portion of the area that will be filled incorrectly when rendering using the SDF.
+double estimateSDFError(const BitmapConstRef<float, 1> &sdf, const Shape &shape, const Projection &projection, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
+double estimateSDFError(const BitmapConstRef<float, 3> &sdf, const Shape &shape, const Projection &projection, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
+double estimateSDFError(const BitmapConstRef<float, 4> &sdf, const Shape &shape, const Projection &projection, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
+
+// Old version of the function API's kept for backwards compatibility
+void scanlineSDF(Scanline &line, const BitmapConstRef<float, 1> &sdf, const Vector2 &scale, const Vector2 &translate, bool inverseYAxis, double y);
+void scanlineSDF(Scanline &line, const BitmapConstRef<float, 3> &sdf, const Vector2 &scale, const Vector2 &translate, bool inverseYAxis, double y);
+void scanlineSDF(Scanline &line, const BitmapConstRef<float, 4> &sdf, const Vector2 &scale, const Vector2 &translate, bool inverseYAxis, double y);
+double estimateSDFError(const BitmapConstRef<float, 1> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
+double estimateSDFError(const BitmapConstRef<float, 3> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
+double estimateSDFError(const BitmapConstRef<float, 4> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/shape-description.h b/Source/ThirdParty/msdfgen/msdfgen/core/shape-description.h
new file mode 100644
index 000000000..6e2e22367
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/shape-description.h
@@ -0,0 +1,15 @@
+
+#pragma once
+
+#include <cstdio>
+#include "Shape.h"
+
+namespace msdfgen {
+
+/// Deserializes a text description of a vector shape into output.
+bool readShapeDescription(FILE *input, Shape &output, bool *colorsSpecified = NULL);
+bool readShapeDescription(const char *input, Shape &output, bool *colorsSpecified = NULL);
+/// Serializes a shape object into a text description.
+bool writeShapeDescription(FILE *output, const Shape &shape);
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/msdfgen-config.h b/Source/ThirdParty/msdfgen/msdfgen/msdfgen-config.h
new file mode 100644
index 000000000..ebcd5942f
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/msdfgen-config.h
@@ -0,0 +1,13 @@
+
+#pragma once
+
+#define MSDFGEN_PUBLIC
+#define MSDFGEN_EXT_PUBLIC
+
+#define MSDFGEN_VERSION 1.12.1
+#define MSDFGEN_VERSION_MAJOR 1
+#define MSDFGEN_VERSION_MINOR 12
+#define MSDFGEN_VERSION_REVISION 1
+#define MSDFGEN_COPYRIGHT_YEAR 2025
+
+#define MSDFGEN_USE_CPP11
diff --git a/Source/ThirdParty/msdfgen/msdfgen/msdfgen.h b/Source/ThirdParty/msdfgen/msdfgen/msdfgen.h
new file mode 100644
index 000000000..e5dd67260
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/msdfgen.h
@@ -0,0 +1,78 @@
+
+#pragma once
+
+/*
+ * MULTI-CHANNEL SIGNED DISTANCE FIELD GENERATOR
+ * ---------------------------------------------
+ * A utility by Viktor Chlumsky, (c) 2014 - 2025
+ *
+ * The technique used to generate multi-channel distance fields in this code
+ * has been developed by Viktor Chlumsky in 2014 for his master's thesis,
+ * "Shape Decomposition for Multi-Channel Distance Fields". It provides improved
+ * quality of sharp corners in glyphs and other 2D shapes compared to monochrome
+ * distance fields. To reconstruct an image of the shape, apply the median of three
+ * operation on the triplet of sampled signed distance values.
+ *
+ */
+
+#include "core/base.h"
+#include "core/arithmetics.hpp"
+#include "core/Vector2.hpp"
+#include "core/Range.hpp"
+#include "core/Projection.h"
+#include "core/DistanceMapping.h"
+#include "core/SDFTransformation.h"
+#include "core/Scanline.h"
+#include "core/Shape.h"
+#include "core/BitmapRef.hpp"
+#include "core/Bitmap.h"
+#include "core/bitmap-interpolation.hpp"
+#include "core/pixel-conversion.hpp"
+#include "core/edge-coloring.h"
+#include "core/generator-config.h"
+#include "core/msdf-error-correction.h"
+#include "core/render-sdf.h"
+#include "core/rasterization.h"
+#include "core/sdf-error-estimation.h"
+#include "core/save-bmp.h"
+#include "core/save-tiff.h"
+#include "core/save-rgba.h"
+#include "core/save-fl32.h"
+#include "core/shape-description.h"
+#include "core/export-svg.h"
+
+namespace msdfgen {
+
+/// Generates a conventional single-channel signed distance field.
+void generateSDF(const BitmapRef<float, 1> &output, const Shape &shape, const SDFTransformation &transformation, const GeneratorConfig &config = GeneratorConfig());
+
+/// Generates a single-channel signed perpendicular distance field.
+void generatePSDF(const BitmapRef<float, 1> &output, const Shape &shape, const SDFTransformation &transformation, const GeneratorConfig &config = GeneratorConfig());
+
+/// Generates a multi-channel signed distance field. Edge colors must be assigned first! (See edgeColoringSimple)
+void generateMSDF(const BitmapRef<float, 3> &output, const Shape &shape, const SDFTransformation &transformation, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+
+/// Generates a multi-channel signed distance field with true distance in the alpha channel. Edge colors must be assigned first.
+void generateMTSDF(const BitmapRef<float, 4> &output, const Shape &shape, const SDFTransformation &transformation, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+
+// Old version of the function API's kept for backwards compatibility
+void generateSDF(const BitmapRef<float, 1> &output, const Shape &shape, const Projection &projection, Range range, const GeneratorConfig &config = GeneratorConfig());
+void generatePSDF(const BitmapRef<float, 1> &output, const Shape &shape, const Projection &projection, Range range, const GeneratorConfig &config = GeneratorConfig());
+void generatePseudoSDF(const BitmapRef<float, 1> &output, const Shape &shape, const Projection &projection, Range range, const GeneratorConfig &config = GeneratorConfig());
+void generateMSDF(const BitmapRef<float, 3> &output, const Shape &shape, const Projection &projection, Range range, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+void generateMTSDF(const BitmapRef<float, 4> &output, const Shape &shape, const Projection &projection, Range range, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+
+void generateSDF(const BitmapRef<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, bool overlapSupport = true);
+void generatePSDF(const BitmapRef<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, bool overlapSupport = true);
+void generatePseudoSDF(const BitmapRef<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, bool overlapSupport = true);
+void generateMSDF(const BitmapRef<float, 3> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, const ErrorCorrectionConfig &errorCorrectionConfig = ErrorCorrectionConfig(), bool overlapSupport = true);
+void generateMTSDF(const BitmapRef<float, 4> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, const ErrorCorrectionConfig &errorCorrectionConfig = ErrorCorrectionConfig(), bool overlapSupport = true);
+
+// Original simpler versions of the previous functions, which work well under normal circumstances, but cannot deal with overlapping contours.
+void generateSDF_legacy(const BitmapRef<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate);
+void generatePSDF_legacy(const BitmapRef<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate);
+void generatePseudoSDF_legacy(const BitmapRef<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate);
+void generateMSDF_legacy(const BitmapRef<float, 3> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, ErrorCorrectionConfig errorCorrectionConfig = ErrorCorrectionConfig());
+void generateMTSDF_legacy(const BitmapRef<float, 4> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, ErrorCorrectionConfig errorCorrectionConfig = ErrorCorrectionConfig());
+
+}
diff --git a/Source/ThirdParty/msdfgen/msdfgen/msdfgen/msdfgen-config.h b/Source/ThirdParty/msdfgen/msdfgen/msdfgen/msdfgen-config.h
new file mode 100644
index 000000000..ebcd5942f
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/msdfgen/msdfgen-config.h
@@ -0,0 +1,13 @@
+
+#pragma once
+
+#define MSDFGEN_PUBLIC
+#define MSDFGEN_EXT_PUBLIC
+
+#define MSDFGEN_VERSION 1.12.1
+#define MSDFGEN_VERSION_MAJOR 1
+#define MSDFGEN_VERSION_MINOR 12
+#define MSDFGEN_VERSION_REVISION 1
+#define MSDFGEN_COPYRIGHT_YEAR 2025
+
+#define MSDFGEN_USE_CPP11
diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs b/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
new file mode 100644
index 000000000..7cff41a71
--- /dev/null
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Wojciech Figat. All rights reserved.
+
+using System.Collections.Generic;
+using System.IO;
+using Flax.Build;
+
+namespace Flax.Deps.Dependencies
+{
+    /// <summary>
+    /// Official Open Asset Import Library Repository. Loads 40+ 3D file formats into one unified and clean data structure. http://www.assimp.org
+    /// </summary>
+    /// <seealso cref="Flax.Deps.Dependency" />
+    class msdfgen : Dependency
+    {
+        /// <inheritdoc />
+        public override TargetPlatform[] Platforms
+        {
+            get
+            {
+                switch (BuildPlatform)
+                {
+                case TargetPlatform.Windows:
+                    return new[]
+                    {
+                        TargetPlatform.Windows,
+                    };
+                case TargetPlatform.Linux:
+                    return new[]
+                    {
+                        TargetPlatform.Linux,
+                    };
+                case TargetPlatform.Mac:
+                    return new[]
+                    {
+                        TargetPlatform.Mac,
+                    };
+                default: return new TargetPlatform[0];
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public override void Build(BuildOptions options)
+        {
+            var root = options.IntermediateFolder;
+            string includeDir = null;
+            var filesToKeep = new[]
+            {
+                "msdfgen.Build.cs",
+            };
+            var args = new string[]
+            {
+                "-DMSDFGEN_USE_VCPKG=OFF",
+                "-DMSDFGEN_CORE_ONLY=ON",
+                "-DMSDFGEN_DYNAMIC_RUNTIME=ON",
+                "-DMSDFGEN_USE_SKIA=OFF",
+                "-DBUILD_SHARED_LIBS=OFF",
+                "-DMSDFGEN_INSTALL=ON"
+            };
+            var cmakeArgs = string.Join(" ", args);
+
+            // Get the source
+            CloneGitRepoSingleBranch(root, "https://github.com/Chlumsky/msdfgen.git", "master", "a4dafbac1c29021613fbc89768963f3a7e2105aa");
+
+            foreach (var platform in options.Platforms)
+            {
+                BuildStarted(platform);
+                switch (platform)
+                {
+                case TargetPlatform.Windows:
+                {
+                    var configuration = "Release";
+
+                    // Build for Windows
+                    File.Delete(Path.Combine(root, "CMakeCache.txt"));
+                    foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 })
+                    {
+                        var buildDir = Path.Combine(root, "build-" + architecture);
+                        var installDir = Path.Combine(root, "install-" + architecture);
+                        SetupDirectory(buildDir, true);
+                        RunCmake(root, platform, architecture, $"-B\"{buildDir}\" " + cmakeArgs);
+                        BuildCmake(buildDir);
+                        Utilities.Run("cmake", $"--install {buildDir} --prefix {installDir} --config {configuration}", null, root, Utilities.RunOptions.DefaultTool);
+                        var depsFolder = GetThirdPartyFolder(options, platform, architecture);
+                        Utilities.FileCopy(Path.Combine(installDir, "lib", "msdfgen-core.lib"), Path.Combine(depsFolder, "msdfgen-core.lib"));
+                        // This will be set multiple times, but the headers are the same anyway.
+                        includeDir = Path.Combine(installDir, "include");
+                    }
+
+                    break;
+                }
+                case TargetPlatform.Linux:
+                {
+                    // todo
+                    break;
+                }
+                case TargetPlatform.Mac:
+                {
+                    // todo
+                    break;
+                }
+                }
+            }
+
+            // Backup files
+            var dstIncludePath = Path.Combine(options.ThirdPartyFolder, "msdfgen");
+            foreach (var filename in filesToKeep)
+            {
+                var src = Path.Combine(dstIncludePath, filename);
+                var dst = Path.Combine(options.IntermediateFolder, filename + ".tmp");
+                Utilities.FileCopy(src, dst);
+            }
+
+            // Deploy header files and license
+            SetupDirectory(dstIncludePath, true);
+            Utilities.FileCopy(Path.Combine(root, "LICENSE.txt"), Path.Combine(dstIncludePath, "LICENSE.txt"));
+            Utilities.DirectoryCopy(includeDir, dstIncludePath, true, true);
+            foreach (var filename in filesToKeep)
+            {
+                var src = Path.Combine(options.IntermediateFolder, filename + ".tmp");
+                var dst = Path.Combine(dstIncludePath, filename);
+                Utilities.FileCopy(src, dst);
+            }
+        }
+    }
+}

From b43ed886b9a6e71585bb774b4f360649f1f0f992 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sun, 12 Oct 2025 19:52:18 +0200
Subject: [PATCH 020/203] add option for what happens with unavailable entries
 and fix menu positioning

---
 Source/Editor/Options/InterfaceOptions.cs | 25 +++++++++++++++++++-
 Source/Editor/Windows/ContentWindow.cs    | 28 +++++++++++++++++++----
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/Source/Editor/Options/InterfaceOptions.cs b/Source/Editor/Options/InterfaceOptions.cs
index 617c1c3de..897ad91b8 100644
--- a/Source/Editor/Options/InterfaceOptions.cs
+++ b/Source/Editor/Options/InterfaceOptions.cs
@@ -140,7 +140,7 @@ namespace FlaxEditor.Options
         }
 
         /// <summary>
-        /// Options focus Game Window behaviour when play mode is entered.
+        /// Options for focus Game Window behaviour when play mode is entered.
         /// </summary>
         public enum PlayModeFocus
         {
@@ -160,6 +160,22 @@ namespace FlaxEditor.Options
             GameWindowThenRestore,
         }
 
+        /// <summary>
+        /// Generic options for a disabled or hidden state. Used for example in create content button.
+        /// </summary>
+        public enum DisabledHidden
+        {
+            /// <summary>
+            /// Disabled state.
+            /// </summary>
+            Disabled,
+
+            /// <summary>
+            /// Hidden state.
+            /// </summary>
+            Hidden,
+        }
+
         /// <summary>
         /// Gets or sets the Editor User Interface scale. Applied to all UI elements, windows and text. Can be used to scale the interface up on a bigger display. Editor restart required.
         /// </summary>
@@ -456,6 +472,13 @@ namespace FlaxEditor.Options
         [EditorDisplay("Visject", "Warn when deleting used parameter"), EditorOrder(552)]
         public bool WarnOnDeletingUsedVisjectParameter { get; set; } = true;
 
+        /// <summary>
+        /// Gets or sets a value indicating what should happen to unavaliable options in the content create menu.
+        /// </summary>
+        [DefaultValue(true)]
+        [EditorDisplay("Content"), EditorOrder(600)]
+        public DisabledHidden UnavaliableContentCreateOptions { get; set; } = DisabledHidden.Hidden;
+
         private static FontAsset DefaultFont => FlaxEngine.Content.LoadAsyncInternal<FontAsset>(EditorAssets.PrimaryFont);
         private static FontAsset ConsoleFont => FlaxEngine.Content.LoadAsyncInternal<FontAsset>(EditorAssets.InconsolataRegularFont);
 
diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index 318bf5231..a53de0900 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -278,11 +278,31 @@ namespace FlaxEditor.Windows
             }
 
             var menu = new ContextMenu();
-            CreateNewFolderMenu(menu, CurrentViewFolder, true);
-            CreateNewModuleMenu(menu, CurrentViewFolder, true);
+            
+            InterfaceOptions interfaceOptions = Editor.Instance.Options.Options.Interface;
+            bool disableUnavaliable = interfaceOptions.UnavaliableContentCreateOptions == InterfaceOptions.DisabledHidden.Disabled;
+
+            CreateNewFolderMenu(menu, CurrentViewFolder, disableUnavaliable);
+            CreateNewModuleMenu(menu, CurrentViewFolder, disableUnavaliable);
             menu.AddSeparator();
-            CreateNewContentItemMenu(menu, CurrentViewFolder, false, true);
-            menu.Show(this, _createNewButton.UpperLeft, ContextMenuDirection.RightUp);
+            CreateNewContentItemMenu(menu, CurrentViewFolder, false, disableUnavaliable);
+            // Hack: Show the menu once to get the direction, then show it above or below the button depending on the direction.
+            menu.Show(this, _createNewButton.UpperLeft);
+            var direction = menu.Direction;
+            menu.Hide();
+            bool below = false;
+            switch (direction)
+            {
+                case ContextMenuDirection.RightDown:
+                case ContextMenuDirection.LeftDown:
+                    below = true;
+                    break;
+                case ContextMenuDirection.RightUp:
+                case ContextMenuDirection.LeftUp:
+                    below = false;
+                    break;
+            }
+            menu.Show(this, below ? _createNewButton.BottomLeft : _createNewButton.UpperLeft, direction);
         }
 
         private ContextMenu OnViewDropdownPopupCreate(ComboBox comboBox)

From 69a7e1f25cfb2f50440a5b4982f3c6c43fcf7e90 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sun, 12 Oct 2025 19:57:05 +0200
Subject: [PATCH 021/203] expand tooltip to hint at being able to create a new
 folder on shift + left click

---
 Source/Editor/Windows/ContentWindow.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index a53de0900..892d6184d 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -155,7 +155,7 @@ namespace FlaxEditor.Windows
                 Parent = this,
             };
             _importButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Import64, () => Editor.ContentImporting.ShowImportFileDialog(CurrentViewFolder)).LinkTooltip("Import content.");
-            _createNewButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Add64, OnCreateNewItemButtonClicked).LinkTooltip("Create a new asset.");
+            _createNewButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Add64, OnCreateNewItemButtonClicked).LinkTooltip("Create a new asset. Shift + left click to create a new folder.");
             _toolStrip.AddSeparator();
             _navigateBackwardButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Left64, NavigateBackward).LinkTooltip("Navigate backward.");
             _navigateForwardButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Right64, NavigateForward).LinkTooltip("Navigate forward.");

From d1972a56e273602f444dd7d3572fc451421df230 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Mon, 13 Oct 2025 18:27:30 +0200
Subject: [PATCH 022/203] improve spline editor

- Move "Selected Point" section above keyframes so it is always accessible, even when keyframe array editor is expanded
- Improve icon scaling when editor becomes thin
---
 .../CustomEditors/Dedicated/SplineEditor.cs   | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/Source/Editor/CustomEditors/Dedicated/SplineEditor.cs b/Source/Editor/CustomEditors/Dedicated/SplineEditor.cs
index 3e0332b09..3566ff4d0 100644
--- a/Source/Editor/CustomEditors/Dedicated/SplineEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/SplineEditor.cs
@@ -18,7 +18,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
     public class SplineEditor : ActorEditor
     {
         /// <summary>
-        /// Storage undo spline data
+        /// Stores undo spline data.
         /// </summary>
         private struct UndoData
         {
@@ -83,7 +83,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
         }
 
         /// <summary>
-        /// Edit curve options manipulate the curve as free mode
+        /// Edit curve options manipulate the curve as free mode.
         /// </summary>
         private sealed class FreeTangentMode : EditTangentOptionBase
         {
@@ -98,7 +98,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
         }
 
         /// <summary>
-        /// Edit curve options to set tangents to linear
+        /// Edit curve options to set tangents to linear.
         /// </summary>
         private sealed class LinearTangentMode : EditTangentOptionBase
         {
@@ -107,13 +107,13 @@ namespace FlaxEditor.CustomEditors.Dedicated
             {
                 SetKeyframeLinear(spline, index);
 
-                // change the selection to tangent parent (a spline point / keyframe)
+                // Change the selection to tangent parent (a spline point / keyframe)
                 Editor.SetSelectSplinePointNode(spline, index);
             }
         }
 
         /// <summary>
-        /// Edit curve options to align tangents of selected spline
+        /// Edit curve options to align tangents of selected spline.
         /// </summary>
         private sealed class AlignedTangentMode : EditTangentOptionBase
         {
@@ -168,8 +168,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
         }
 
         /// <summary>
-        /// Edit curve options manipulate the curve setting selected point 
-        /// tangent in as smoothed but tangent out as linear
+        /// Edit curve options manipulate the curve setting selected point tangent in as smoothed but tangent out as linear.
         /// </summary>
         private sealed class SmoothInTangentMode : EditTangentOptionBase
         {
@@ -182,8 +181,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
         }
 
         /// <summary>
-        /// Edit curve options manipulate the curve setting selected point 
-        /// tangent in as linear but tangent out as smoothed
+        /// Edit curve options manipulate the curve setting selected point tangent in as linear but tangent out as smoothed.
         /// </summary>
         private sealed class SmoothOutTangentMode : EditTangentOptionBase
         {
@@ -219,8 +217,9 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     var enabled = EnabledInHierarchy && tab.EnabledInHierarchy;
                     var style = FlaxEngine.GUI.Style.Current;
                     var size = Size;
-                    var textHeight = 16.0f;
-                    var iconSize = size.Y - textHeight;
+                    var textHeight = 30.0f;
+                    // Make icons smaller when tabs get thinner
+                    var iconSize = Mathf.Clamp(Mathf.Min(size.Y - textHeight, size.X), 15.0f, float.MaxValue);
                     var iconRect = new Rectangle((Width - iconSize) / 2, 0, iconSize, iconSize);
                     if (tab._mirrorIcon)
                     {
@@ -230,8 +229,11 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     var color = style.Foreground;
                     if (!enabled)
                         color *= 0.6f;
+                    var textRect = new Rectangle(0, size.Y - textHeight, size.X, textHeight);
+                    Render2D.PushClip(new Rectangle(Float2.Zero, Size));
                     Render2D.DrawSprite(tab._customIcon, iconRect, color);
-                    Render2D.DrawText(style.FontMedium, tab._customText, new Rectangle(0, iconSize, size.X, textHeight), color, TextAlignment.Center, TextAlignment.Center);
+                    Render2D.DrawText(style.FontMedium, tab._customText, textRect, color, TextAlignment.Center, TextAlignment.Center, TextWrapping.WrapWords);
+                    Render2D.PopClip();
                 }
             }
 
@@ -291,18 +293,21 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 return;
             _selectedSpline = spline;
 
-            layout.Space(10);
-            var tabSize = 46;
+            //var tabSize = 46;
+            var tabSize = 60;
             var icons = Editor.Instance.Icons;
 
-            layout.Header("Selected spline point");
+            var group = layout.Group("Selected Point");
             _selectedPointsTabs = new Tabs
             {
                 Height = tabSize,
                 TabsSize = new Float2(tabSize),
                 AutoTabsSize = true,
-                Parent = layout.ContainerControl,
+                Parent = group.ContainerControl,
             };
+            // Move the group above the group containing spline points
+            group.Control.IndexInParent = 3;
+
             _linearTangentTab = _selectedPointsTabs.AddTab(new IconTab(OnSetSelectedLinear, "Linear", icons.SplineLinear64));
             _freeTangentTab = _selectedPointsTabs.AddTab(new IconTab(OnSetSelectedFree, "Free", icons.SplineFree64));
             _alignedTangentTab = _selectedPointsTabs.AddTab(new IconTab(OnSetSelectedAligned, "Aligned", icons.SplineAligned64));
@@ -310,13 +315,13 @@ namespace FlaxEditor.CustomEditors.Dedicated
             _smoothOutTangentTab = _selectedPointsTabs.AddTab(new IconTab(OnSetSelectedSmoothOut, "Smooth Out", icons.SplineSmoothIn64, true));
             _selectedPointsTabs.SelectedTabIndex = -1;
 
-            layout.Header("All spline points");
+            group = layout.Group("All Points");
             _allPointsTabs = new Tabs
             {
                 Height = tabSize,
                 TabsSize = new Float2(tabSize),
                 AutoTabsSize = true,
-                Parent = layout.ContainerControl,
+                Parent = group.ContainerControl,
             };
             _setLinearAllTangentsTab = _allPointsTabs.AddTab(new IconTab(OnSetTangentsLinear, "Set Linear Tangents", icons.SplineLinear64));
             _setSmoothAllTangentsTab = _allPointsTabs.AddTab(new IconTab(OnSetTangentsSmooth, "Set Smooth Tangents", icons.SplineAligned64));

From e5bd90f58b832903a008f12d19b475bcf6956ffe Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 15 Oct 2025 19:51:24 +0200
Subject: [PATCH 023/203] revert icon scaling

---
 Source/Editor/CustomEditors/Dedicated/SplineEditor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Editor/CustomEditors/Dedicated/SplineEditor.cs b/Source/Editor/CustomEditors/Dedicated/SplineEditor.cs
index 3566ff4d0..a8bfe4f5f 100644
--- a/Source/Editor/CustomEditors/Dedicated/SplineEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/SplineEditor.cs
@@ -219,7 +219,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     var size = Size;
                     var textHeight = 30.0f;
                     // Make icons smaller when tabs get thinner
-                    var iconSize = Mathf.Clamp(Mathf.Min(size.Y - textHeight, size.X), 15.0f, float.MaxValue);
+                    var iconSize = size.Y - textHeight;
                     var iconRect = new Rectangle((Width - iconSize) / 2, 0, iconSize, iconSize);
                     if (tab._mirrorIcon)
                     {
@@ -232,7 +232,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     var textRect = new Rectangle(0, size.Y - textHeight, size.X, textHeight);
                     Render2D.PushClip(new Rectangle(Float2.Zero, Size));
                     Render2D.DrawSprite(tab._customIcon, iconRect, color);
-                    Render2D.DrawText(style.FontMedium, tab._customText, textRect, color, TextAlignment.Center, TextAlignment.Center, TextWrapping.WrapWords);
+                    Render2D.DrawText(style.FontMedium, tab._customText, textRect, color, TextAlignment.Center, TextAlignment.Center, TextWrapping.WrapWords, 0.65f);
                     Render2D.PopClip();
                 }
             }

From d6b1478bf12bf83159e9ea63db986ed52a2435e9 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Thu, 16 Oct 2025 20:04:05 +0200
Subject: [PATCH 024/203] make double clicking properties splitter bar auto
 resize split

---
 .../CustomEditors/GUI/PropertiesList.cs       | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/CustomEditors/GUI/PropertiesList.cs b/Source/Editor/CustomEditors/GUI/PropertiesList.cs
index 3847a8f36..f430bae06 100644
--- a/Source/Editor/CustomEditors/GUI/PropertiesList.cs
+++ b/Source/Editor/CustomEditors/GUI/PropertiesList.cs
@@ -70,9 +70,9 @@ namespace FlaxEditor.CustomEditors.GUI
             UpdateSplitRect();
         }
 
-        private void AutoSizeSplitter()
+        private void AutoSizeSplitter(bool ignoreCustomSplitterValue = false)
         {
-            if (_hasCustomSplitterValue || !Editor.Instance.Options.Options.Interface.AutoSizePropertiesPanelSplitter)
+            if (_hasCustomSplitterValue && !ignoreCustomSplitterValue)
                 return;
 
             Font font = Style.Current.FontMedium;
@@ -178,6 +178,21 @@ namespace FlaxEditor.CustomEditors.GUI
             return base.OnMouseDown(location, button);
         }
 
+        /// <inheritdoc />
+        public override bool OnMouseDoubleClick(Float2 location, MouseButton button)
+        {
+            if (button == MouseButton.Left && _splitterRect.Contains(location))
+            {
+                if (_splitterClicked)
+                    EndTracking();
+
+                AutoSizeSplitter(true);
+                return true;
+            }
+
+            return base.OnMouseDoubleClick(location, button);
+        }
+
         /// <inheritdoc />
         public override bool OnMouseUp(Float2 location, MouseButton button)
         {
@@ -220,7 +235,8 @@ namespace FlaxEditor.CustomEditors.GUI
             // Refresh
             UpdateSplitRect();
             PerformLayout(true);
-            AutoSizeSplitter();
+            if (Editor.Instance.Options.Options.Interface.AutoSizePropertiesPanelSplitter)
+                AutoSizeSplitter();
         }
 
         /// <inheritdoc />

From 5dd9171316d7999441a67f887ae4f05e781c39a5 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 17 Oct 2025 21:58:55 +0200
Subject: [PATCH 025/203] fix default value

---
 Source/Editor/Options/InterfaceOptions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Editor/Options/InterfaceOptions.cs b/Source/Editor/Options/InterfaceOptions.cs
index 897ad91b8..2a466b8ad 100644
--- a/Source/Editor/Options/InterfaceOptions.cs
+++ b/Source/Editor/Options/InterfaceOptions.cs
@@ -475,7 +475,7 @@ namespace FlaxEditor.Options
         /// <summary>
         /// Gets or sets a value indicating what should happen to unavaliable options in the content create menu.
         /// </summary>
-        [DefaultValue(true)]
+        [DefaultValue(DisabledHidden.Hidden)]
         [EditorDisplay("Content"), EditorOrder(600)]
         public DisabledHidden UnavaliableContentCreateOptions { get; set; } = DisabledHidden.Hidden;
 

From 58cd3e82f69977aa0d10ecb5f4b23fd742fb7b7f Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Fri, 24 Oct 2025 14:55:38 -0500
Subject: [PATCH 026/203] Better rotation on UI handles which handles total
 parent rotation.

---
 Source/Editor/Gizmo/UIEditorGizmo.cs | 54 +++++++++++++++++++---------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/Source/Editor/Gizmo/UIEditorGizmo.cs b/Source/Editor/Gizmo/UIEditorGizmo.cs
index 765893bed..e6af16a46 100644
--- a/Source/Editor/Gizmo/UIEditorGizmo.cs
+++ b/Source/Editor/Gizmo/UIEditorGizmo.cs
@@ -635,22 +635,28 @@ namespace FlaxEditor
                 if (_widgets == null)
                     _widgets = new List<Widget>();
                 var widgetSize = 10.0f;
+                var sideWidgetSize = new Float2(5.0f, 20.0f);
+                var topWidgetSize = new Float2(20.0f, 5.0f);
                 var viewScale = ViewScale;
                 if (viewScale < 0.7f)
+                {
                     widgetSize *= viewScale;
-                var widgetHandleSize = new Float2(widgetSize);
-                DrawControlWidget(uiControl, ref ul, ref mousePos, ref widgetHandleSize, viewScale, new Float2(-1, -1), CursorType.SizeNWSE);
-                DrawControlWidget(uiControl, ref ur, ref mousePos, ref widgetHandleSize, viewScale, new Float2(1, -1), CursorType.SizeNESW);
-                DrawControlWidget(uiControl, ref bl, ref mousePos, ref widgetHandleSize, viewScale, new Float2(-1, 1), CursorType.SizeNESW);
-                DrawControlWidget(uiControl, ref br, ref mousePos, ref widgetHandleSize, viewScale, new Float2(1, 1), CursorType.SizeNWSE);
+                    sideWidgetSize *= viewScale;
+                    topWidgetSize *= viewScale;
+                }
+                var cornerWidgetHandleSize = new Float2(widgetSize);
+                DrawControlWidget(uiControl, ref ul, ref mousePos, ref cornerWidgetHandleSize, viewScale, new Float2(-1, -1), CursorType.SizeNWSE);
+                DrawControlWidget(uiControl, ref ur, ref mousePos, ref cornerWidgetHandleSize, viewScale, new Float2(1, -1), CursorType.SizeNESW);
+                DrawControlWidget(uiControl, ref bl, ref mousePos, ref cornerWidgetHandleSize, viewScale, new Float2(-1, 1), CursorType.SizeNESW);
+                DrawControlWidget(uiControl, ref br, ref mousePos, ref cornerWidgetHandleSize, viewScale, new Float2(1, 1), CursorType.SizeNWSE);
                 Float2.Lerp(ref ul, ref bl, 0.5f, out var el);
                 Float2.Lerp(ref ur, ref br, 0.5f, out var er);
                 Float2.Lerp(ref ul, ref ur, 0.5f, out var eu);
                 Float2.Lerp(ref bl, ref br, 0.5f, out var eb);
-                DrawControlWidget(uiControl, ref el, ref mousePos, ref widgetHandleSize, viewScale, new Float2(-1, 0), CursorType.SizeWE);
-                DrawControlWidget(uiControl, ref er, ref mousePos, ref widgetHandleSize, viewScale, new Float2(1, 0), CursorType.SizeWE);
-                DrawControlWidget(uiControl, ref eu, ref mousePos, ref widgetHandleSize, viewScale, new Float2(0, -1), CursorType.SizeNS);
-                DrawControlWidget(uiControl, ref eb, ref mousePos, ref widgetHandleSize, viewScale, new Float2(0, 1), CursorType.SizeNS);
+                DrawControlWidget(uiControl, ref el, ref mousePos, ref sideWidgetSize, viewScale, new Float2(-1, 0), CursorType.SizeWE);
+                DrawControlWidget(uiControl, ref er, ref mousePos, ref sideWidgetSize, viewScale, new Float2(1, 0), CursorType.SizeWE);
+                DrawControlWidget(uiControl, ref eu, ref mousePos, ref topWidgetSize, viewScale, new Float2(0, -1), CursorType.SizeNS);
+                DrawControlWidget(uiControl, ref eb, ref mousePos, ref topWidgetSize, viewScale, new Float2(0, 1), CursorType.SizeNS);
 
                 // Draw pivot
                 var pivotSize = 8.0f;
@@ -685,7 +691,7 @@ namespace FlaxEditor
                         anchorRectSize *= viewScale;
 
                     // Make anchor rects and rotate if parent is rotated.
-                    var parentRotation = controlParent.Rotation * Mathf.DegreesToRadians;
+                    var parentRotation = GetTotalRotation(controlParent) * Mathf.DegreesToRadians;
 
                     var rect1Axis = new Float2(-1, -1);
                     var rect1 = new Rectangle(anchorUpperLeft + 
@@ -717,17 +723,24 @@ namespace FlaxEditor
             }
         }
 
+        private float GetTotalRotation(Control control)
+        {
+            if (control.Parent != null)
+                return control.Rotation + GetTotalRotation(control.Parent);
+            return control.Rotation;
+        }
+
         private void DrawControlWidget(UIControl uiControl, ref Float2 pos, ref Float2 mousePos, ref Float2 size, float scale, Float2 resizeAxis, CursorType cursor)
         {
             var style = Style.Current;
             var control = uiControl.Control;
-            var rotation = control.Rotation;
+            var rotation = GetTotalRotation(control);
             var rotationInRadians = rotation * Mathf.DegreesToRadians;
-            var rect = new Rectangle((pos + 
-                                      new Float2(resizeAxis.X * Mathf.Cos(rotationInRadians) - resizeAxis.Y * Mathf.Sin(rotationInRadians), 
-                                                 resizeAxis.Y * Mathf.Cos(rotationInRadians) + resizeAxis.X * Mathf.Sin(rotationInRadians)) * 10 * scale) - size * 0.5f,
-                                     size);
-            
+            var position = (pos);
+            var halfSize = size * 0.5f;
+            // Keep at 0, 0 rect position until later to correctly render rotation.
+            var rect = new Rectangle(0, 0, size);
+
             // Find more correct cursor at different angles
             var unwindRotation = Mathf.UnwindDegrees(rotation);
             if (unwindRotation is (>= 45 and < 135) or (> -135 and <= -45) )
@@ -749,6 +762,10 @@ namespace FlaxEditor
                 default: break;
                 }
             }
+
+            Render2D.PushTransform(Matrix3x3.Translation2D(position));
+            Render2D.PushTransform(Matrix3x3.RotationZ(rotationInRadians));
+            Render2D.PushTransform(Matrix3x3.Translation2D(-1 * halfSize));
             if (rect.Contains(ref mousePos))
             {
                 Render2D.FillRectangle(rect, style.Foreground);
@@ -759,9 +776,14 @@ namespace FlaxEditor
                 Render2D.FillRectangle(rect, style.ForegroundGrey);
                 Render2D.DrawRectangle(rect, style.Foreground);
             }
+            Render2D.PopTransform();
+            Render2D.PopTransform();
+            Render2D.PopTransform();
+
             if (!_mouseMovesWidget && uiControl != null)
             {
                 // Collect widget
+                rect.Location = position - halfSize;
                 _widgets.Add(new Widget
                 {
                     UIControl = uiControl,

From dd8e6bf694fba1cef4501b429fab50921ed44387 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Fri, 24 Oct 2025 15:40:45 -0500
Subject: [PATCH 027/203] Change handles back to outside of control.

---
 Source/Editor/Gizmo/UIEditorGizmo.cs | 29 ++++++++++++----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/Source/Editor/Gizmo/UIEditorGizmo.cs b/Source/Editor/Gizmo/UIEditorGizmo.cs
index e6af16a46..a22d9f7ee 100644
--- a/Source/Editor/Gizmo/UIEditorGizmo.cs
+++ b/Source/Editor/Gizmo/UIEditorGizmo.cs
@@ -634,29 +634,23 @@ namespace FlaxEditor
                 // Draw sizing widgets
                 if (_widgets == null)
                     _widgets = new List<Widget>();
-                var widgetSize = 10.0f;
-                var sideWidgetSize = new Float2(5.0f, 20.0f);
-                var topWidgetSize = new Float2(20.0f, 5.0f);
+                var widgetSize = 8.0f;
                 var viewScale = ViewScale;
                 if (viewScale < 0.7f)
-                {
                     widgetSize *= viewScale;
-                    sideWidgetSize *= viewScale;
-                    topWidgetSize *= viewScale;
-                }
-                var cornerWidgetHandleSize = new Float2(widgetSize);
-                DrawControlWidget(uiControl, ref ul, ref mousePos, ref cornerWidgetHandleSize, viewScale, new Float2(-1, -1), CursorType.SizeNWSE);
-                DrawControlWidget(uiControl, ref ur, ref mousePos, ref cornerWidgetHandleSize, viewScale, new Float2(1, -1), CursorType.SizeNESW);
-                DrawControlWidget(uiControl, ref bl, ref mousePos, ref cornerWidgetHandleSize, viewScale, new Float2(-1, 1), CursorType.SizeNESW);
-                DrawControlWidget(uiControl, ref br, ref mousePos, ref cornerWidgetHandleSize, viewScale, new Float2(1, 1), CursorType.SizeNWSE);
+                var widgetHandleSize = new Float2(widgetSize);
+                DrawControlWidget(uiControl, ref ul, ref mousePos, ref widgetHandleSize, viewScale, new Float2(-1, -1), CursorType.SizeNWSE);
+                DrawControlWidget(uiControl, ref ur, ref mousePos, ref widgetHandleSize, viewScale, new Float2(1, -1), CursorType.SizeNESW);
+                DrawControlWidget(uiControl, ref bl, ref mousePos, ref widgetHandleSize, viewScale, new Float2(-1, 1), CursorType.SizeNESW);
+                DrawControlWidget(uiControl, ref br, ref mousePos, ref widgetHandleSize, viewScale, new Float2(1, 1), CursorType.SizeNWSE);
                 Float2.Lerp(ref ul, ref bl, 0.5f, out var el);
                 Float2.Lerp(ref ur, ref br, 0.5f, out var er);
                 Float2.Lerp(ref ul, ref ur, 0.5f, out var eu);
                 Float2.Lerp(ref bl, ref br, 0.5f, out var eb);
-                DrawControlWidget(uiControl, ref el, ref mousePos, ref sideWidgetSize, viewScale, new Float2(-1, 0), CursorType.SizeWE);
-                DrawControlWidget(uiControl, ref er, ref mousePos, ref sideWidgetSize, viewScale, new Float2(1, 0), CursorType.SizeWE);
-                DrawControlWidget(uiControl, ref eu, ref mousePos, ref topWidgetSize, viewScale, new Float2(0, -1), CursorType.SizeNS);
-                DrawControlWidget(uiControl, ref eb, ref mousePos, ref topWidgetSize, viewScale, new Float2(0, 1), CursorType.SizeNS);
+                DrawControlWidget(uiControl, ref el, ref mousePos, ref widgetHandleSize, viewScale, new Float2(-1, 0), CursorType.SizeWE);
+                DrawControlWidget(uiControl, ref er, ref mousePos, ref widgetHandleSize, viewScale, new Float2(1, 0), CursorType.SizeWE);
+                DrawControlWidget(uiControl, ref eu, ref mousePos, ref widgetHandleSize, viewScale, new Float2(0, -1), CursorType.SizeNS);
+                DrawControlWidget(uiControl, ref eb, ref mousePos, ref widgetHandleSize, viewScale, new Float2(0, 1), CursorType.SizeNS);
 
                 // Draw pivot
                 var pivotSize = 8.0f;
@@ -736,7 +730,8 @@ namespace FlaxEditor
             var control = uiControl.Control;
             var rotation = GetTotalRotation(control);
             var rotationInRadians = rotation * Mathf.DegreesToRadians;
-            var position = (pos);
+            var position = (pos + new Float2(resizeAxis.X * Mathf.Cos(rotationInRadians) - resizeAxis.Y * Mathf.Sin(rotationInRadians), 
+                                             resizeAxis.Y * Mathf.Cos(rotationInRadians) + resizeAxis.X * Mathf.Sin(rotationInRadians)) * 4 * (scale < 0.7f ? scale : 1));
             var halfSize = size * 0.5f;
             // Keep at 0, 0 rect position until later to correctly render rotation.
             var rect = new Rectangle(0, 0, size);

From 09964df198f43e4bea3ece4d4ea16a5f4488edfe Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Fri, 24 Oct 2025 16:19:33 -0500
Subject: [PATCH 028/203] Removing moving the control when trying to resize it.

---
 Source/Editor/Gizmo/UIEditorGizmo.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Source/Editor/Gizmo/UIEditorGizmo.cs b/Source/Editor/Gizmo/UIEditorGizmo.cs
index 765893bed..66bcd7634 100644
--- a/Source/Editor/Gizmo/UIEditorGizmo.cs
+++ b/Source/Editor/Gizmo/UIEditorGizmo.cs
@@ -398,7 +398,6 @@ namespace FlaxEditor
                 var moveLocation = _mouseMovesPos + delta;
                 var control = _activeWidget.UIControl.Control;
                 var uiControlDelta = GetControlDelta(control, ref _mouseMovesPos, ref moveLocation);
-                control.LocalLocation += uiControlDelta * resizeAxisNeg;
                 control.Size += uiControlDelta * resizeAxisPos - uiControlDelta * resizeAxisNeg;
 
                 // Don't move if layout doesn't allow it

From 7b3e41efae5f024e18295bbf8f31b2faf7e10063 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 31 Oct 2025 18:02:22 +0100
Subject: [PATCH 029/203] change how to the actor transform editor looks

---
 .../Editors/ActorTransformEditor.cs           | 43 ++++++++++---------
 Source/Editor/GUI/Input/ValueBox.cs           | 11 +++++
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs
index 02f5ca7ec..7dfea232c 100644
--- a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs
@@ -26,11 +26,6 @@ namespace FlaxEditor.CustomEditors.Editors
         /// </summary>
         public static Color AxisColorZ = new Color(0.0f, 0.0235294f, 1.0f, 1.0f);
 
-        /// <summary>
-        /// The axes colors grey out scale when input field is not focused.
-        /// </summary>
-        public static float AxisGreyOutFactor = 0.6f;
-
         /// <summary>
         /// Custom editor for actor position property.
         /// </summary>
@@ -43,18 +38,20 @@ namespace FlaxEditor.CustomEditors.Editors
                 base.Initialize(layout);
 
                 if (XElement.ValueBox.Parent is UniformGridPanel ug)
+                {
+                    ug.SlotPadding = new Margin(3.0f, 0.0f, 0.0f, 0.0f);
                     CheckLayout(ug);
+                }
 
                 // Override colors
-                var back = FlaxEngine.GUI.Style.Current.TextBoxBackground;
-                XElement.ValueBox.BorderColor = Color.Lerp(AxisColorX, back, AxisGreyOutFactor);
                 XElement.ValueBox.BorderSelectedColor = AxisColorX;
-                XElement.ValueBox.Category = Utils.ValueCategory.Distance;
-                YElement.ValueBox.BorderColor = Color.Lerp(AxisColorY, back, AxisGreyOutFactor);
                 YElement.ValueBox.BorderSelectedColor = AxisColorY;
-                YElement.ValueBox.Category = Utils.ValueCategory.Distance;
-                ZElement.ValueBox.BorderColor = Color.Lerp(AxisColorZ, back, AxisGreyOutFactor);
                 ZElement.ValueBox.BorderSelectedColor = AxisColorZ;
+                XElement.ValueBox.HighlightColor = AxisColorX;
+                XElement.ValueBox.Category = Utils.ValueCategory.Distance;
+                YElement.ValueBox.HighlightColor = AxisColorY;
+                YElement.ValueBox.Category = Utils.ValueCategory.Distance;
+                ZElement.ValueBox.HighlightColor = AxisColorZ;
                 ZElement.ValueBox.Category = Utils.ValueCategory.Distance;
             }
         }
@@ -71,18 +68,20 @@ namespace FlaxEditor.CustomEditors.Editors
                 base.Initialize(layout);
                 
                 if (XElement.ValueBox.Parent is UniformGridPanel ug)
+                {
+                    ug.SlotPadding = new Margin(3.0f, 0.0f, 0.0f, 0.0f);
                     CheckLayout(ug);
+                }
 
                 // Override colors
-                var back = FlaxEngine.GUI.Style.Current.TextBoxBackground;
-                XElement.ValueBox.BorderColor = Color.Lerp(AxisColorX, back, AxisGreyOutFactor);
                 XElement.ValueBox.BorderSelectedColor = AxisColorX;
-                XElement.ValueBox.Category = Utils.ValueCategory.Angle;
-                YElement.ValueBox.BorderColor = Color.Lerp(AxisColorY, back, AxisGreyOutFactor);
                 YElement.ValueBox.BorderSelectedColor = AxisColorY;
-                YElement.ValueBox.Category = Utils.ValueCategory.Angle;
-                ZElement.ValueBox.BorderColor = Color.Lerp(AxisColorZ, back, AxisGreyOutFactor);
                 ZElement.ValueBox.BorderSelectedColor = AxisColorZ;
+                XElement.ValueBox.HighlightColor = AxisColorX;
+                XElement.ValueBox.Category = Utils.ValueCategory.Angle;
+                YElement.ValueBox.HighlightColor = AxisColorY;
+                YElement.ValueBox.Category = Utils.ValueCategory.Angle;
+                ZElement.ValueBox.HighlightColor = AxisColorZ;
                 ZElement.ValueBox.Category = Utils.ValueCategory.Angle;
             }
         }
@@ -129,17 +128,19 @@ namespace FlaxEditor.CustomEditors.Editors
                 }
 
                 if (XElement.ValueBox.Parent is UniformGridPanel ug)
+                {
+                    ug.SlotPadding = new Margin(3.0f, 0.0f, 0.0f, 0.0f);
                     CheckLayout(ug);
+                }
 
                 // Override colors
                 var back = FlaxEngine.GUI.Style.Current.TextBoxBackground;
-                var grayOutFactor = 0.6f;
-                XElement.ValueBox.BorderColor = Color.Lerp(AxisColorX, back, grayOutFactor);
                 XElement.ValueBox.BorderSelectedColor = AxisColorX;
-                YElement.ValueBox.BorderColor = Color.Lerp(AxisColorY, back, grayOutFactor);
                 YElement.ValueBox.BorderSelectedColor = AxisColorY;
-                ZElement.ValueBox.BorderColor = Color.Lerp(AxisColorZ, back, grayOutFactor);
                 ZElement.ValueBox.BorderSelectedColor = AxisColorZ;
+                XElement.ValueBox.HighlightColor = AxisColorX;
+                YElement.ValueBox.HighlightColor = AxisColorY;
+                ZElement.ValueBox.HighlightColor = AxisColorZ;
             }
 
             /// <summary>
diff --git a/Source/Editor/GUI/Input/ValueBox.cs b/Source/Editor/GUI/Input/ValueBox.cs
index 674ee0697..e619ac2e3 100644
--- a/Source/Editor/GUI/Input/ValueBox.cs
+++ b/Source/Editor/GUI/Input/ValueBox.cs
@@ -89,6 +89,11 @@ namespace FlaxEditor.GUI.Input
         /// </summary>
         public bool IsSliding => _isSliding;
 
+        /// <summary>
+        /// The color of the highlight to the left of the value box.
+        /// </summary>
+        public Color HighlightColor;
+
         /// <summary>
         /// Occurs when sliding starts.
         /// </summary>
@@ -206,6 +211,12 @@ namespace FlaxEditor.GUI.Input
                     Render2D.DrawRectangle(bounds, style.SelectionBorder);
                 }
             }
+
+            if (HighlightColor != Color.Transparent)
+            {
+                var highlightRect = new Rectangle(-3.0f, 0.0f, 3.0f, Height);
+                Render2D.FillRectangle(highlightRect, HighlightColor);
+            }
         }
 
         /// <inheritdoc />

From c1738bcb0a4cab0e16cd4652519573bf765a509a Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 31 Oct 2025 18:02:35 +0100
Subject: [PATCH 030/203] make the ui editor look like the actor transform
 editor

---
 Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs b/Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs
index 614d2c160..90873e2b2 100644
--- a/Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs
@@ -701,8 +701,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             {
                 valueBox = floatEditorElement.ValueBox;
                 var back = FlaxEngine.GUI.Style.Current.TextBoxBackground;
-                valueBox.BorderColor = Color.Lerp(borderColor, back, ActorTransformEditor.AxisGreyOutFactor);
-                valueBox.BorderSelectedColor = borderColor;
+                valueBox.HighlightColor = borderColor;
             }
             return grid;
         }

From 316e5b2845da6b9d92305a532986be1b8811d05d Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 31 Oct 2025 18:10:00 +0100
Subject: [PATCH 031/203] also apply color to border if focused/ selected in ui
 editor

---
 Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs b/Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs
index 90873e2b2..1628f69ec 100644
--- a/Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs
@@ -690,7 +690,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             return grid;
         }
 
-        private CustomElementsContainer<UniformGridPanel> UniformPanelCapsuleForObjectWithText(LayoutElementsContainer el, string text, ValueContainer values, Color borderColor, out FloatValueBox valueBox)
+        private CustomElementsContainer<UniformGridPanel> UniformPanelCapsuleForObjectWithText(LayoutElementsContainer el, string text, ValueContainer values, Color highlightColor, out FloatValueBox valueBox)
         {
             valueBox = null;
             var grid = UniformGridTwoByOne(el);
@@ -701,7 +701,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
             {
                 valueBox = floatEditorElement.ValueBox;
                 var back = FlaxEngine.GUI.Style.Current.TextBoxBackground;
-                valueBox.HighlightColor = borderColor;
+                valueBox.HighlightColor = highlightColor;
+                valueBox.BorderSelectedColor = highlightColor;
             }
             return grid;
         }

From b6696564f56aa8c07ab04306fd660dc0c701e969 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 31 Oct 2025 18:22:30 +0100
Subject: [PATCH 032/203] tweak colors to be less bright

---
 Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs
index 7dfea232c..c1179e393 100644
--- a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs
@@ -14,17 +14,17 @@ namespace FlaxEditor.CustomEditors.Editors
         /// <summary>
         /// The X axis color.
         /// </summary>
-        public static Color AxisColorX = new Color(1.0f, 0.0f, 0.02745f, 1.0f);
+        public static Color AxisColorX = new Color(0.8f, 0.0f, 0.027f, 1.0f);
 
         /// <summary>
         /// The Y axis color.
         /// </summary>
-        public static Color AxisColorY = new Color(0.239215f, 1.0f, 0.047058f, 1.0f);
+        public static Color AxisColorY = new Color(0.239215f, 0.65f, 0.047058f, 1.0f);
 
         /// <summary>
         /// The Z axis color.
         /// </summary>
-        public static Color AxisColorZ = new Color(0.0f, 0.0235294f, 1.0f, 1.0f);
+        public static Color AxisColorZ = new Color(0.0f, 0.0235294f, 0.9f, 1.0f);
 
         /// <summary>
         /// Custom editor for actor position property.

From eb978c767e5f147907681181ead00f08ff8c4686 Mon Sep 17 00:00:00 2001
From: frank <fibref_233@outlook.com>
Date: Sat, 1 Nov 2025 20:07:28 +0800
Subject: [PATCH 033/203] extend msdfgen buildscript for Mac and Android (not
 tested)

---
 Source/ThirdParty/msdfgen/msdfgen.Build.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/ThirdParty/msdfgen/msdfgen.Build.cs b/Source/ThirdParty/msdfgen/msdfgen.Build.cs
index 4d4262960..8a01d0c77 100644
--- a/Source/ThirdParty/msdfgen/msdfgen.Build.cs
+++ b/Source/ThirdParty/msdfgen/msdfgen.Build.cs
@@ -34,8 +34,8 @@ public class msdfgen : DepsModule
             break;
         case TargetPlatform.Linux:
         case TargetPlatform.Mac:
-            // todo
-            //options.OutputFiles.Add(Path.Combine(depsRoot, "msdfgen-core.a"));
+        case TargetPlatform.Android:
+            options.OutputFiles.Add(Path.Combine(depsRoot, "msdfgen-core.a"));
             break;
         default: throw new InvalidPlatformException(options.Platform.Target);
         }

From e78191cc827bb47a878f7d2bdd258bdbde4c7e79 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sat, 1 Nov 2025 17:04:58 +0100
Subject: [PATCH 034/203] fix error when clearing vj context menu

---
 Source/Editor/Surface/ContextMenu/VisjectCM.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Editor/Surface/ContextMenu/VisjectCM.cs b/Source/Editor/Surface/ContextMenu/VisjectCM.cs
index 21d0e7470..1b14c8a9f 100644
--- a/Source/Editor/Surface/ContextMenu/VisjectCM.cs
+++ b/Source/Editor/Surface/ContextMenu/VisjectCM.cs
@@ -585,7 +585,7 @@ namespace FlaxEditor.Surface.ContextMenu
 
         private void UpdateFilters()
         {
-            if (string.IsNullOrEmpty(_searchBox.Text) && _selectedBoxes[0] == null)
+            if (string.IsNullOrEmpty(_searchBox.Text) && _selectedBoxes.Count > 0)
             {
                 ResetView();
                 Profiler.EndEvent();

From 1188150163f087daeca203848208790fdf5e7f16 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sat, 1 Nov 2025 17:24:10 +0100
Subject: [PATCH 035/203] prevent node formatting tools from moving nodes with
 NoMove flag

---
 Source/Editor/Surface/VisjectSurface.Formatting.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/Surface/VisjectSurface.Formatting.cs b/Source/Editor/Surface/VisjectSurface.Formatting.cs
index e1b9a6777..26d668f64 100644
--- a/Source/Editor/Surface/VisjectSurface.Formatting.cs
+++ b/Source/Editor/Surface/VisjectSurface.Formatting.cs
@@ -164,7 +164,9 @@ namespace FlaxEditor.Surface
         /// </summary>
         /// <param name="nodes">List of nodes.</param>
         public void StraightenGraphConnections(List<SurfaceNode> nodes)
-        {
+        { 
+            nodes = nodes.Where(n => !n.Archetype.Flags.HasFlag(NodeFlags.NoMove)).ToList();
+
             if (nodes.Count <= 1)
                 return;
 
@@ -350,8 +352,10 @@ namespace FlaxEditor.Surface
         /// <param name="nodes">List of nodes.</param>
         /// <param name="alignmentType">Alignemnt type.</param>
         public void AlignNodes(List<SurfaceNode> nodes, NodeAlignmentType alignmentType)
-        {  
-            if(nodes.Count <= 1)
+        {
+            nodes = nodes.Where(n => !n.Archetype.Flags.HasFlag(NodeFlags.NoMove)).ToList();
+
+            if (nodes.Count <= 1)
                 return;
 
             var undoActions = new List<MoveNodesAction>();
@@ -392,6 +396,8 @@ namespace FlaxEditor.Surface
         /// <param name="vertically">If false will be done horizontally, if true will be done vertically.</param>
         public void DistributeNodes(List<SurfaceNode> nodes, bool vertically)
         {
+            nodes = nodes.Where(n => !n.Archetype.Flags.HasFlag(NodeFlags.NoMove)).ToList();
+
             if(nodes.Count <= 1)
                 return;
 

From d13b98b205e5437d473fb8354d703af4c75abdcc Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sat, 1 Nov 2025 17:55:21 +0100
Subject: [PATCH 036/203] fix Auto Format Nodes to only produce one undo step

---
 .../Surface/VisjectSurface.Formatting.cs       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Source/Editor/Surface/VisjectSurface.Formatting.cs b/Source/Editor/Surface/VisjectSurface.Formatting.cs
index 26d668f64..e55a4eb8a 100644
--- a/Source/Editor/Surface/VisjectSurface.Formatting.cs
+++ b/Source/Editor/Surface/VisjectSurface.Formatting.cs
@@ -39,6 +39,8 @@ namespace FlaxEditor.Surface
             if (nodes.Count <= 1)
                 return;
 
+            List<MoveNodesAction> undoActions = new List<MoveNodesAction>();
+
             var nodesToVisit = new HashSet<SurfaceNode>(nodes);
 
             // While we haven't formatted every node
@@ -73,18 +75,23 @@ namespace FlaxEditor.Surface
                     }
                 }
 
-                FormatConnectedGraph(connectedNodes);
+                undoActions.AddRange(FormatConnectedGraph(connectedNodes));
             }
+
+            Undo?.AddAction(new MultiUndoAction(undoActions, "Format nodes"));
+            MarkAsEdited(false);
         }
 
         /// <summary>
         /// Formats a graph where all nodes are connected.
         /// </summary>
         /// <param name="nodes">List of connected nodes.</param>
-        protected void FormatConnectedGraph(List<SurfaceNode> nodes)
+        private List<MoveNodesAction> FormatConnectedGraph(List<SurfaceNode> nodes)
         {
+            List<MoveNodesAction> undoActions = new List<MoveNodesAction>();
+
             if (nodes.Count <= 1)
-                return;
+                return undoActions;
 
             var boundingBox = GetNodesBounds(nodes);
 
@@ -140,7 +147,6 @@ namespace FlaxEditor.Surface
             }
 
             // Set the node positions
-            var undoActions = new List<MoveNodesAction>();
             var topRightPosition = endNodes[0].Location;
             for (int i = 0; i < nodes.Count; i++)
             {
@@ -155,14 +161,14 @@ namespace FlaxEditor.Surface
                 }
             }
 
-            MarkAsEdited(false);
-            Undo?.AddAction(new MultiUndoAction(undoActions, "Format nodes"));
+            return undoActions;
         }
 
         /// <summary>
         /// Straightens every connection between nodes in <paramref name="nodes"/>.
         /// </summary>
         /// <param name="nodes">List of nodes.</param>
+        /// <returns>List of undo actions.</returns>
         public void StraightenGraphConnections(List<SurfaceNode> nodes)
         { 
             nodes = nodes.Where(n => !n.Archetype.Flags.HasFlag(NodeFlags.NoMove)).ToList();

From bf3403449d5c2cf9e8b001e6a6c5c9236c5388ba Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sat, 1 Nov 2025 18:18:18 +0100
Subject: [PATCH 037/203] disable format nodes option when either a) all
 selected nodes have NoMove or b) clicked on node has NoMove

---
 Source/Editor/Surface/VisjectSurface.ContextMenu.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Source/Editor/Surface/VisjectSurface.ContextMenu.cs b/Source/Editor/Surface/VisjectSurface.ContextMenu.cs
index d8dfb8ad3..ffb1c725a 100644
--- a/Source/Editor/Surface/VisjectSurface.ContextMenu.cs
+++ b/Source/Editor/Surface/VisjectSurface.ContextMenu.cs
@@ -410,8 +410,11 @@ namespace FlaxEditor.Surface
             }
             menu.AddSeparator();
 
-            _cmFormatNodesMenu = menu.AddChildMenu("Format node(s)");
-            _cmFormatNodesMenu.Enabled = CanEdit && HasNodesSelection;
+            bool allNodesNoMove = SelectedNodes.All(n => n.Archetype.Flags.HasFlag(NodeFlags.NoMove));
+            bool clickedNodeNoMove = ((SelectedNodes.Count == 1 && controlUnderMouse is SurfaceNode n && n.Archetype.Flags.HasFlag(NodeFlags.NoMove)));
+
+            _cmFormatNodesMenu = menu.AddChildMenu("Format nodes");
+            _cmFormatNodesMenu.Enabled = CanEdit && HasNodesSelection && !(allNodesNoMove || clickedNodeNoMove);
 
             _cmFormatNodesConnectionButton = _cmFormatNodesMenu.ContextMenu.AddButton("Auto format", Editor.Instance.Options.Options.Input.NodesAutoFormat, () => { FormatGraph(SelectedNodes); });
             _cmFormatNodesConnectionButton = _cmFormatNodesMenu.ContextMenu.AddButton("Straighten connections", Editor.Instance.Options.Options.Input.NodesStraightenConnections, () => { StraightenGraphConnections(SelectedNodes); });

From fbad6ba75cf2621008d822b89d59ad4be125269f Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sun, 2 Nov 2025 00:50:07 +0100
Subject: [PATCH 038/203] add alternative node titles to pack/unpack nodes

Now every pack/ unpack node can be found by searching:
- Make
- Construct
- Compose

-  Break
- Deconstruct
- Decompose
---
 Source/Editor/Surface/Archetypes/Layers.cs  |  4 ++++
 Source/Editor/Surface/Archetypes/Packing.cs | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/Source/Editor/Surface/Archetypes/Layers.cs b/Source/Editor/Surface/Archetypes/Layers.cs
index fe0053f7f..29de7cad5 100644
--- a/Source/Editor/Surface/Archetypes/Layers.cs
+++ b/Source/Editor/Surface/Archetypes/Layers.cs
@@ -52,6 +52,7 @@ namespace FlaxEditor.Surface.Archetypes
             },
             new NodeArchetype
             {
+                // [Deprecated]
                 TypeID = 3,
                 Title = "Pack Material Layer",
                 Description = "Pack material properties",
@@ -75,6 +76,7 @@ namespace FlaxEditor.Surface.Archetypes
             },
             new NodeArchetype
             {
+                // [Deprecated]
                 TypeID = 4,
                 Title = "Unpack Material Layer",
                 Description = "Unpack material properties",
@@ -120,6 +122,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 6,
                 Title = "Pack Material Layer",
                 Description = "Pack material properties",
+                AlternativeTitles = new[] { "Make Material Layer", "Construct Material Layer", "Compose Material Layer" },
                 Flags = NodeFlags.MaterialGraph,
                 Size = new Float2(200, 280),
                 Elements = new[]
@@ -146,6 +149,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 7,
                 Title = "Unpack Material Layer",
                 Description = "Unpack material properties",
+                AlternativeTitles = new[] { "Break Material Layers", "Deconstruct Material Layers", "Decompose Material Layers" },
                 Flags = NodeFlags.MaterialGraph,
                 Size = new Float2(210, 280),
                 Elements = new[]
diff --git a/Source/Editor/Surface/Archetypes/Packing.cs b/Source/Editor/Surface/Archetypes/Packing.cs
index 363d867f7..4d1e1d475 100644
--- a/Source/Editor/Surface/Archetypes/Packing.cs
+++ b/Source/Editor/Surface/Archetypes/Packing.cs
@@ -342,6 +342,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 20,
                 Title = "Pack Float2",
                 Description = "Pack components to Float2",
+                AlternativeTitles = new[] { "Make Float2", "Construct Float2", "Compose Float2" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(150, 40),
                 DefaultValues = new object[]
@@ -361,6 +362,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 21,
                 Title = "Pack Float3",
                 Description = "Pack components to Float3",
+                AlternativeTitles = new[] { "Make Float3", "Construct Float3", "Compose Float3" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(150, 60),
                 DefaultValues = new object[]
@@ -382,6 +384,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 22,
                 Title = "Pack Float4",
                 Description = "Pack components to Float4",
+                AlternativeTitles = new[] { "Make Float4", "Construct Float4", "Compose Float4" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(150, 80),
                 DefaultValues = new object[]
@@ -405,6 +408,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 23,
                 Title = "Pack Rotation",
                 Description = "Pack components to Rotation",
+                AlternativeTitles = new[] { "Make Rotation", "Construct Rotation", "Compose Rotation" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(150, 60),
                 DefaultValues = new object[]
@@ -426,6 +430,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 24,
                 Title = "Pack Transform",
                 Description = "Pack components to Transform",
+                AlternativeTitles = new[] { "Make Transform", "Construct Transform", "Compose Transform" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(150, 80),
                 Elements = new[]
@@ -441,6 +446,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 25,
                 Title = "Pack Box",
                 Description = "Pack components to BoundingBox",
+                AlternativeTitles = new[] { "Make Box", "Construct Box", "Compose Box" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(150, 40),
                 Elements = new[]
@@ -454,6 +460,7 @@ namespace FlaxEditor.Surface.Archetypes
             {
                 TypeID = 26,
                 Title = "Pack Structure",
+                AlternativeTitles = new[] { "Make Structure", "Construct Structure", "Compose Structure" },
                 Create = (id, context, arch, groupArch) => new PackStructureNode(id, context, arch, groupArch),
                 IsInputCompatible = PackStructureNode.IsInputCompatible,
                 IsOutputCompatible = PackStructureNode.IsOutputCompatible,
@@ -479,6 +486,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 30,
                 Title = "Unpack Float2",
                 Description = "Unpack components from Float2",
+                AlternativeTitles = new[] { "Break Float2", "Deconstruct Float2", "Decompose Float2" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(150, 40),
                 Elements = new[]
@@ -493,6 +501,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 31,
                 Title = "Unpack Float3",
                 Description = "Unpack components from Float3",
+                AlternativeTitles = new[] { "Break Float3", "Deconstruct Float3", "Decompose Float3" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(150, 60),
                 Elements = new[]
@@ -508,6 +517,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 32,
                 Title = "Unpack Float4",
                 Description = "Unpack components from Float4",
+                AlternativeTitles = new[] { "Break Float4", "Deconstruct Float4", "Decompose Float4" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(150, 80),
                 Elements = new[]
@@ -524,6 +534,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 33,
                 Title = "Unpack Rotation",
                 Description = "Unpack components from Rotation",
+                AlternativeTitles = new[] { "Break Rotation", "Deconstruct Rotation", "Decompose Rotation" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(170, 60),
                 Elements = new[]
@@ -539,6 +550,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 34,
                 Title = "Unpack Transform",
                 Description = "Unpack components from Transform",
+                AlternativeTitles = new[] { "Break Transform", "Deconstruct Transform", "Decompose Transform" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(170, 60),
                 Elements = new[]
@@ -554,6 +566,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 35,
                 Title = "Unpack Box",
                 Description = "Unpack components from BoundingBox",
+                AlternativeTitles = new[] { "Break BoundingBox", "Deconstruct BoundingBox", "Decompose BoundingBox" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(170, 40),
                 Elements = new[]
@@ -572,6 +585,7 @@ namespace FlaxEditor.Surface.Archetypes
                 IsOutputCompatible = UnpackStructureNode.IsOutputCompatible,
                 GetInputOutputDescription = UnpackStructureNode.GetInputOutputDescription,
                 Description = "Breaks the structure data to allow extracting components from it.",
+                AlternativeTitles = new[] { "Break Structure", "Deconstruct Structure", "Decompose Structure" },
                 Flags = NodeFlags.VisualScriptGraph | NodeFlags.AnimGraph | NodeFlags.NoSpawnViaGUI,
                 Size = new Float2(180, 20),
                 DefaultValues = new object[]

From 206b948ee1d9ecbe669d069f1e27d9ec0042b368 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sun, 2 Nov 2025 13:36:21 +0100
Subject: [PATCH 039/203] add "Split" for Unpack nodes

---
 Source/Editor/Surface/Archetypes/Layers.cs  |  2 +-
 Source/Editor/Surface/Archetypes/Packing.cs | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/Editor/Surface/Archetypes/Layers.cs b/Source/Editor/Surface/Archetypes/Layers.cs
index 29de7cad5..6c4caa6e7 100644
--- a/Source/Editor/Surface/Archetypes/Layers.cs
+++ b/Source/Editor/Surface/Archetypes/Layers.cs
@@ -149,7 +149,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 7,
                 Title = "Unpack Material Layer",
                 Description = "Unpack material properties",
-                AlternativeTitles = new[] { "Break Material Layers", "Deconstruct Material Layers", "Decompose Material Layers" },
+                AlternativeTitles = new[] { "Break Material Layer", "Deconstruct Material Layer", "Decompose Material Layer", "Split Material Layer" },
                 Flags = NodeFlags.MaterialGraph,
                 Size = new Float2(210, 280),
                 Elements = new[]
diff --git a/Source/Editor/Surface/Archetypes/Packing.cs b/Source/Editor/Surface/Archetypes/Packing.cs
index 4d1e1d475..8d57bc81e 100644
--- a/Source/Editor/Surface/Archetypes/Packing.cs
+++ b/Source/Editor/Surface/Archetypes/Packing.cs
@@ -486,7 +486,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 30,
                 Title = "Unpack Float2",
                 Description = "Unpack components from Float2",
-                AlternativeTitles = new[] { "Break Float2", "Deconstruct Float2", "Decompose Float2" },
+                AlternativeTitles = new[] { "Break Float2", "Deconstruct Float2", "Decompose Float2", "Split Float2" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(150, 40),
                 Elements = new[]
@@ -501,7 +501,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 31,
                 Title = "Unpack Float3",
                 Description = "Unpack components from Float3",
-                AlternativeTitles = new[] { "Break Float3", "Deconstruct Float3", "Decompose Float3" },
+                AlternativeTitles = new[] { "Break Float3", "Deconstruct Float3", "Decompose Float3", "Split Float3" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(150, 60),
                 Elements = new[]
@@ -517,7 +517,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 32,
                 Title = "Unpack Float4",
                 Description = "Unpack components from Float4",
-                AlternativeTitles = new[] { "Break Float4", "Deconstruct Float4", "Decompose Float4" },
+                AlternativeTitles = new[] { "Break Float4", "Deconstruct Float4", "Decompose Float4", "Split Float4" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(150, 80),
                 Elements = new[]
@@ -534,7 +534,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 33,
                 Title = "Unpack Rotation",
                 Description = "Unpack components from Rotation",
-                AlternativeTitles = new[] { "Break Rotation", "Deconstruct Rotation", "Decompose Rotation" },
+                AlternativeTitles = new[] { "Break Rotation", "Deconstruct Rotation", "Decompose Rotation", "Split Rotation" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(170, 60),
                 Elements = new[]
@@ -550,7 +550,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 34,
                 Title = "Unpack Transform",
                 Description = "Unpack components from Transform",
-                AlternativeTitles = new[] { "Break Transform", "Deconstruct Transform", "Decompose Transform" },
+                AlternativeTitles = new[] { "Break Transform", "Deconstruct Transform", "Decompose Transform", "Split Transform" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(170, 60),
                 Elements = new[]
@@ -566,7 +566,7 @@ namespace FlaxEditor.Surface.Archetypes
                 TypeID = 35,
                 Title = "Unpack Box",
                 Description = "Unpack components from BoundingBox",
-                AlternativeTitles = new[] { "Break BoundingBox", "Deconstruct BoundingBox", "Decompose BoundingBox" },
+                AlternativeTitles = new[] { "Break BoundingBox", "Deconstruct BoundingBox", "Decompose BoundingBox", "Split BoundingBox" },
                 Flags = NodeFlags.AllGraphs,
                 Size = new Float2(170, 40),
                 Elements = new[]
@@ -585,7 +585,7 @@ namespace FlaxEditor.Surface.Archetypes
                 IsOutputCompatible = UnpackStructureNode.IsOutputCompatible,
                 GetInputOutputDescription = UnpackStructureNode.GetInputOutputDescription,
                 Description = "Breaks the structure data to allow extracting components from it.",
-                AlternativeTitles = new[] { "Break Structure", "Deconstruct Structure", "Decompose Structure" },
+                AlternativeTitles = new[] { "Break Structure", "Deconstruct Structure", "Decompose Structure", "Split Structure" },
                 Flags = NodeFlags.VisualScriptGraph | NodeFlags.AnimGraph | NodeFlags.NoSpawnViaGUI,
                 Size = new Float2(180, 20),
                 DefaultValues = new object[]

From ab22b88a53acf7dec3830967b47abe485d017af1 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Sat, 29 Nov 2025 15:57:35 -0600
Subject: [PATCH 040/203] Better calculation for moving ui by the widgets.

---
 Source/Editor/Gizmo/UIEditorGizmo.cs | 39 ++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/Source/Editor/Gizmo/UIEditorGizmo.cs b/Source/Editor/Gizmo/UIEditorGizmo.cs
index 66bcd7634..45a44d572 100644
--- a/Source/Editor/Gizmo/UIEditorGizmo.cs
+++ b/Source/Editor/Gizmo/UIEditorGizmo.cs
@@ -387,18 +387,47 @@ namespace FlaxEditor
             if (_mouseMovesWidget && _activeWidget.UIControl)
             {
                 // Calculate transform delta
-                var resizeAxisAbs = _activeWidget.ResizeAxis.Absolute;
-                var resizeAxisPos = Float2.Clamp(_activeWidget.ResizeAxis, Float2.Zero, Float2.One);
-                var resizeAxisNeg = Float2.Clamp(-_activeWidget.ResizeAxis, Float2.Zero, Float2.One);
                 var delta = location - _mouseMovesPos;
                 // TODO: scale/size snapping?
-                delta *= resizeAxisAbs;
 
                 // Resize control via widget
                 var moveLocation = _mouseMovesPos + delta;
                 var control = _activeWidget.UIControl.Control;
                 var uiControlDelta = GetControlDelta(control, ref _mouseMovesPos, ref moveLocation);
-                control.Size += uiControlDelta * resizeAxisPos - uiControlDelta * resizeAxisNeg;
+
+                // Transform delta to control local space
+                var rotation = control.Rotation * Mathf.DegreesToRadians; // TODO: use total parent rotation
+                var cos = Mathf.Cos(rotation);
+                var sin = Mathf.Sin(rotation);
+                var localDeltaX = uiControlDelta.X * cos + uiControlDelta.Y * sin;
+                var localDeltaY = uiControlDelta.Y * cos - uiControlDelta.X * sin;
+                var localDelta = new Float2(localDeltaX, localDeltaY);
+                localDelta *= _activeWidget.ResizeAxis.Absolute;
+
+                // Calculate size change
+                var resizeAxisPos = Float2.Clamp(_activeWidget.ResizeAxis, Float2.Zero, Float2.One);
+                var resizeAxisNeg = Float2.Clamp(-_activeWidget.ResizeAxis, Float2.Zero, Float2.One);
+                var dSizeScaled = localDelta * resizeAxisPos - localDelta * resizeAxisNeg;
+                var scale = control.Scale;
+                var dSize = new Float2(
+                    Mathf.Abs(scale.X) > Mathf.Epsilon ? dSizeScaled.X / scale.X : 0,
+                    Mathf.Abs(scale.Y) > Mathf.Epsilon ? dSizeScaled.Y / scale.Y : 0);
+
+                // Calculate pivot offset to keep the opposite edge stationary
+                var pivotOffset = Float2.Zero;
+                if (Mathf.Abs(dSizeScaled.X) > Mathf.Epsilon)
+                    pivotOffset.X = (_activeWidget.ResizeAxis.X < 0 ? control.Pivot.X - 1.0f : control.Pivot.X) * dSizeScaled.X;
+                if (Mathf.Abs(dSizeScaled.Y) > Mathf.Epsilon)
+                    pivotOffset.Y = (_activeWidget.ResizeAxis.Y < 0 ? control.Pivot.Y - 1.0f : control.Pivot.Y) * dSizeScaled.Y;
+
+                // Transform pivot offset back to parent space
+                var dLocationX = pivotOffset.X * cos - pivotOffset.Y * sin;
+                var dLocationY = pivotOffset.X * sin + pivotOffset.Y * cos;
+                var dLocation = new Float2(dLocationX, dLocationY);
+
+                // Apply changes
+                control.Size += dSize;
+                control.LocalLocation += dLocation;
 
                 // Don't move if layout doesn't allow it
                 if (control.Parent != null)

From bbaa2dfc73ec5cecd2625a0059d4e9b7bac41ad1 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Sat, 29 Nov 2025 16:13:46 -0600
Subject: [PATCH 041/203] Fix pibot relative movement.

---
 Source/Editor/Gizmo/UIEditorGizmo.cs | 34 ++++++++++++++++------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/Source/Editor/Gizmo/UIEditorGizmo.cs b/Source/Editor/Gizmo/UIEditorGizmo.cs
index 45a44d572..7ae34f590 100644
--- a/Source/Editor/Gizmo/UIEditorGizmo.cs
+++ b/Source/Editor/Gizmo/UIEditorGizmo.cs
@@ -413,21 +413,27 @@ namespace FlaxEditor
                     Mathf.Abs(scale.X) > Mathf.Epsilon ? dSizeScaled.X / scale.X : 0,
                     Mathf.Abs(scale.Y) > Mathf.Epsilon ? dSizeScaled.Y / scale.Y : 0);
 
-                // Calculate pivot offset to keep the opposite edge stationary
-                var pivotOffset = Float2.Zero;
-                if (Mathf.Abs(dSizeScaled.X) > Mathf.Epsilon)
-                    pivotOffset.X = (_activeWidget.ResizeAxis.X < 0 ? control.Pivot.X - 1.0f : control.Pivot.X) * dSizeScaled.X;
-                if (Mathf.Abs(dSizeScaled.Y) > Mathf.Epsilon)
-                    pivotOffset.Y = (_activeWidget.ResizeAxis.Y < 0 ? control.Pivot.Y - 1.0f : control.Pivot.Y) * dSizeScaled.Y;
-
-                // Transform pivot offset back to parent space
-                var dLocationX = pivotOffset.X * cos - pivotOffset.Y * sin;
-                var dLocationY = pivotOffset.X * sin + pivotOffset.Y * cos;
-                var dLocation = new Float2(dLocationX, dLocationY);
-
-                // Apply changes
+                // Apply size change
                 control.Size += dSize;
-                control.LocalLocation += dLocation;
+
+                // Calculate location offset to keep the opposite edge stationary
+                // When PivotRelative is false, resizing keeps Top-Left (Location) constant,
+                // so we only need to slide back if we are resizing Left or Top edges.
+                if (!control.PivotRelative)
+                {
+                    var pivotOffset = Float2.Zero;
+                    if (_activeWidget.ResizeAxis.X < 0 && Mathf.Abs(dSize.X) > Mathf.Epsilon)
+                        pivotOffset.X = -dSize.X * scale.X;
+                    if (_activeWidget.ResizeAxis.Y < 0 && Mathf.Abs(dSize.Y) > Mathf.Epsilon)
+                        pivotOffset.Y = -dSize.Y * scale.Y;
+
+                    // Transform offset back to parent space and apply
+                    var dLocationX = pivotOffset.X * cos - pivotOffset.Y * sin;
+                    var dLocationY = pivotOffset.X * sin + pivotOffset.Y * cos;
+                    var dLocation = new Float2(dLocationX, dLocationY);
+                    
+                    control.LocalLocation += dLocation;
+                }
 
                 // Don't move if layout doesn't allow it
                 if (control.Parent != null)

From 4b62395d69543df32d4dfeb383bdc5b264d1a499 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 10 Dec 2025 18:41:57 +0100
Subject: [PATCH 042/203] add script obsolete icon to script editor

---
 .../CustomEditors/Dedicated/ActorEditor.cs    |  2 +-
 .../CustomEditors/Dedicated/ScriptsEditor.cs  | 27 ++++++++++++++++---
 .../Elements/Container/GroupElement.cs        |  8 +++---
 .../Windows/Assets/MaterialInstanceWindow.cs  |  2 +-
 .../Windows/Assets/SkinnedModelWindow.cs      |  2 +-
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
index d312f64b2..46c4066f2 100644
--- a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
@@ -115,7 +115,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 {
                     if (actor != null)
                         group.Panel.TooltipText = Surface.SurfaceUtils.GetVisualScriptTypeDescription(TypeUtils.GetObjectType(actor));
-                    var settingsButton = group.AddSettingsButton();
+                    var settingsButton = group.AddHeaderButton("Settings.", 0.0f, FlaxEngine.GUI.Style.Current.Settings);
                     settingsButton.Clicked += OnSettingsButtonClicked;
                     break;
                 }
diff --git a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
index 954599347..ef7a137f6 100644
--- a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
@@ -640,7 +640,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             var group = layout.Group("Missing script");
 
             // Add settings button to the group
-            var settingsButton = group.AddSettingsButton();
+            var settingsButton = group.AddHeaderButton("Settings.", 0.0f, FlaxEngine.GUI.Style.Current.Settings);
             settingsButton.Tag = index;
             settingsButton.Clicked += MissingSettingsButtonOnClicked;
         }
@@ -739,6 +739,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
         /// <inheritdoc />
         public override void Initialize(LayoutElementsContainer layout)
         {
+            var _style = FlaxEngine.GUI.Style.Current;
+
             // Area for drag&drop scripts
             var dragArea = layout.CustomContainer<DragAreaControl>();
             dragArea.CustomControl.ScriptsEditor = this;
@@ -905,11 +907,30 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 };
 
                 // Add settings button to the group
-                var settingsButton = group.AddSettingsButton();
+                var settingsButton = group.AddHeaderButton("Settings.", 0.0f, _style.Settings);
                 settingsButton.Tag = script;
                 settingsButton.Clicked += OnSettingsButtonClicked;
 
-                group.Panel.HeaderTextMargin = new Margin(scriptDrag.Right - 12, 15, 2, 2);
+                // Add script obsolete icon to the group
+                if (scriptType.HasAttribute(typeof(ObsoleteAttribute), false))
+                {
+                    ObsoleteAttribute attribute = null;
+                    foreach (var e in scriptType.GetAttributes(false))
+                    {
+                        if (e is not ObsoleteAttribute obsoleteAttribute)
+                            continue;
+                        attribute = obsoleteAttribute;
+                        break;
+                    }
+
+                    string tooltip = "Script marked as obsolete." +
+                        (string.IsNullOrEmpty(attribute.Message) ? "" : $"\n{attribute.Message}") +
+                        (string.IsNullOrEmpty(attribute.DiagnosticId) ? "" : $"\n{attribute.DiagnosticId}");
+                    var obsoleteButton = group.AddHeaderButton(tooltip, settingsButton.Width + FlaxEditor.Utilities.Constants.UIMargin, Editor.Instance.Icons.Info32);
+                    obsoleteButton.Color = Color.Orange;
+                }
+
+                group.Panel.HeaderTextMargin = new Margin(scriptDrag.Right - 12, 35, 2, 2);
                 group.Object(values, editor);
                 // Remove drop down arrows and containment lines if no objects in the group
                 if (group.Children.Count == 0)
diff --git a/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs b/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
index 64bc9080b..e2db8b69e 100644
--- a/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
+++ b/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
@@ -40,21 +40,21 @@ namespace FlaxEditor.CustomEditors.Elements
         /// Adds utility settings button to the group header.
         /// </summary>
         /// <returns>The created control.</returns>
-        public Image AddSettingsButton()
+        public Image AddHeaderButton(string tooltipText, float xOffset, SpriteHandle sprite)
         {
             var style = Style.Current;
             var settingsButtonSize = Panel.HeaderHeight;
             return new Image
             {
-                TooltipText = "Settings",
+                TooltipText = tooltipText,
                 AutoFocus = true,
                 AnchorPreset = AnchorPresets.TopRight,
                 Parent = Panel,
-                Bounds = new Rectangle(Panel.Width - settingsButtonSize, 0, settingsButtonSize, settingsButtonSize),
+                Bounds = new Rectangle(Panel.Width - settingsButtonSize - xOffset, 0, settingsButtonSize, settingsButtonSize),
                 IsScrollable = false,
                 Color = style.ForegroundGrey,
                 Margin = new Margin(1),
-                Brush = new SpriteBrush(style.Settings),
+                Brush = new SpriteBrush(sprite),
             };
         }
     }
diff --git a/Source/Editor/Windows/Assets/MaterialInstanceWindow.cs b/Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
index cb39930f9..b6b67e191 100644
--- a/Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
+++ b/Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
@@ -249,7 +249,7 @@ namespace FlaxEditor.Windows.Assets
                     return;
 
                 var parametersGroup = SurfaceUtils.InitGraphParametersGroup(layout);
-                var settingButton = parametersGroup.AddSettingsButton();
+                var settingButton = parametersGroup.AddHeaderButton("Settings.", 0.0f, FlaxEngine.GUI.Style.Current.Settings);
                 settingButton.Clicked += (image, button) => OnSettingsButtonClicked(image, button, proxy.Window);
                 var baseMaterial = materialInstance.BaseMaterial;
                 var material = baseMaterial;
diff --git a/Source/Editor/Windows/Assets/SkinnedModelWindow.cs b/Source/Editor/Windows/Assets/SkinnedModelWindow.cs
index 392cc896a..073cf7614 100644
--- a/Source/Editor/Windows/Assets/SkinnedModelWindow.cs
+++ b/Source/Editor/Windows/Assets/SkinnedModelWindow.cs
@@ -284,7 +284,7 @@ namespace FlaxEditor.Windows.Assets
                         var setupGroup = layout.Group(Path.GetFileNameWithoutExtension(sourceAsset.Path));
                         setupGroup.Panel.Tag = sourceAsset;
                         setupGroup.Panel.MouseButtonRightClicked += OnPanelHeaderRightClicked;
-                        var settingsButton = setupGroup.AddSettingsButton();
+                        var settingsButton = setupGroup.AddHeaderButton("Settings.", 0.0f, FlaxEngine.GUI.Style.Current.Settings);
                         settingsButton.Tag = sourceAsset;
                         settingsButton.Clicked += OnShowSetupSettings;
 

From b5b1d84b3f85d1f466b2c461963f699afafd1010 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 12 Dec 2025 22:44:13 +0100
Subject: [PATCH 043/203] fix silent crash sometimes occurring when dragging
 and dropping connections

---
 Source/Editor/Surface/ContextMenu/VisjectCM.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Editor/Surface/ContextMenu/VisjectCM.cs b/Source/Editor/Surface/ContextMenu/VisjectCM.cs
index 1b14c8a9f..f13cb7117 100644
--- a/Source/Editor/Surface/ContextMenu/VisjectCM.cs
+++ b/Source/Editor/Surface/ContextMenu/VisjectCM.cs
@@ -585,7 +585,7 @@ namespace FlaxEditor.Surface.ContextMenu
 
         private void UpdateFilters()
         {
-            if (string.IsNullOrEmpty(_searchBox.Text) && _selectedBoxes.Count > 0)
+            if (string.IsNullOrEmpty(_searchBox.Text) && _selectedBoxes.Count > 0 && _selectedBoxes[0] == null)
             {
                 ResetView();
                 Profiler.EndEvent();

From bb2e22ecf230317a20ce5a782e51fcdb0f6e66fc Mon Sep 17 00:00:00 2001
From: Phantom <salvini.michael01@gmail.com>
Date: Sun, 14 Dec 2025 13:14:45 +0100
Subject: [PATCH 044/203] Improved readability of highlighted text in drop-down
 menus

TextColorHighlighted is now automatically lightened if too dark, by calculating brightness and interpolating towards white. This ensures better readability of selected items in drop-down menus.
---
 Source/Engine/UI/GUI/Common/Dropdown.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Engine/UI/GUI/Common/Dropdown.cs b/Source/Engine/UI/GUI/Common/Dropdown.cs
index a227e5acd..a8b5929c3 100644
--- a/Source/Engine/UI/GUI/Common/Dropdown.cs
+++ b/Source/Engine/UI/GUI/Common/Dropdown.cs
@@ -588,6 +588,7 @@ namespace FlaxEngine.GUI
                 AutoFocus = false,
                 Size = size,
             };
+            float brightness = TextColorHighlighted.R * 0.299f + TextColorHighlighted.G * 0.587f + TextColorHighlighted.B * 0.114f;
             var label = new DropdownLabel
             {
                 AutoFocus = true,
@@ -595,7 +596,7 @@ namespace FlaxEngine.GUI
                 Size = new Float2(size.X - margin, size.Y),
                 Font = Font,
                 TextColor = TextColor * 0.9f,
-                TextColorHighlighted = TextColorHighlighted,
+                TextColorHighlighted = brightness < 0.05f ? Color.Lerp(TextColorHighlighted, Color.White, 0.3f) : TextColorHighlighted,
                 HorizontalAlignment = HorizontalAlignment,
                 VerticalAlignment = VerticalAlignment,
                 Text = _items[i],

From 9f8b15f0d5aa1281d1c9d8fa8bc38704c782d7cc Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Sun, 14 Dec 2025 19:32:52 +0200
Subject: [PATCH 045/203] Fix Editor state after loading a scene without
 compiled game modules

---
 Source/Engine/Level/Level.cpp | 49 ++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/Source/Engine/Level/Level.cpp b/Source/Engine/Level/Level.cpp
index 9cf6794be..956005f57 100644
--- a/Source/Engine/Level/Level.cpp
+++ b/Source/Engine/Level/Level.cpp
@@ -1123,6 +1123,32 @@ SceneResult SceneLoader::OnBegin(Args& args)
     _lastSceneLoadTime = DateTime::Now();
     StartFrame = Engine::UpdateCount;
 
+    // Validate arguments
+    if (!args.Data.IsArray())
+    {
+        LOG(Error, "Invalid Data member.");
+        CallSceneEvent(SceneEventType::OnSceneLoadError, nullptr, Guid::Empty);
+        return SceneResult::Failed;
+    }
+
+    // Peek scene node value (it's the first actor serialized)
+    SceneId = JsonTools::GetGuid(args.Data[0], "ID");
+    if (!SceneId.IsValid())
+    {
+        LOG(Error, "Invalid scene id.");
+        CallSceneEvent(SceneEventType::OnSceneLoadError, nullptr, SceneId);
+        return SceneResult::Failed;
+    }
+
+    // Peek meta
+    if (args.EngineBuild < 6000)
+    {
+        LOG(Error, "Invalid serialized engine build.");
+        CallSceneEvent(SceneEventType::OnSceneLoadError, nullptr, SceneId);
+        return SceneResult::Failed;
+    }
+    Modifier->EngineBuild = args.EngineBuild;
+
     // Scripting backend should be loaded for the current project before loading scene
     if (!Scripting::HasGameModulesLoaded())
     {
@@ -1136,27 +1162,7 @@ SceneResult SceneLoader::OnBegin(Args& args)
                 MessageBox::Show(TEXT("Failed to load scripts.\n\nCannot load scene without game script modules.\n\nSee logs for more info."), TEXT("Missing game modules"), MessageBoxButtons::OK, MessageBoxIcon::Error);
         }
 #endif
-        return SceneResult::Failed;
-    }
-
-    // Peek meta
-    if (args.EngineBuild < 6000)
-    {
-        LOG(Error, "Invalid serialized engine build.");
-        return SceneResult::Failed;
-    }
-    if (!args.Data.IsArray())
-    {
-        LOG(Error, "Invalid Data member.");
-        return SceneResult::Failed;
-    }
-    Modifier->EngineBuild = args.EngineBuild;
-
-    // Peek scene node value (it's the first actor serialized)
-    SceneId = JsonTools::GetGuid(args.Data[0], "ID");
-    if (!SceneId.IsValid())
-    {
-        LOG(Error, "Invalid scene id.");
+        CallSceneEvent(SceneEventType::OnSceneLoadError, nullptr, SceneId);
         return SceneResult::Failed;
     }
 
@@ -1164,6 +1170,7 @@ SceneResult SceneLoader::OnBegin(Args& args)
     if (Level::FindScene(SceneId) != nullptr)
     {
         LOG(Info, "Scene {0} is already loaded.", SceneId);
+        CallSceneEvent(SceneEventType::OnSceneLoadError, nullptr, SceneId);
         return SceneResult::Failed;
     }
 

From 7f2f73afd89353c05de156fccf148cb727e0d521 Mon Sep 17 00:00:00 2001
From: Phantom <salvini.michael01@gmail.com>
Date: Mon, 15 Dec 2025 00:48:42 +0100
Subject: [PATCH 046/203] Added Luminance property and updated authors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-Added public Luminance property in Color.cs to calculate colour brightness.
-Refactored Dropdown.cs to use Luminance instead of manual calculation.
-Updated author list in AboutDialog.cs by adding ‘Michael Salvini’.
---
 Source/Editor/Windows/AboutDialog.cs    | 1 +
 Source/Engine/Core/Math/Color.cs        | 5 +++++
 Source/Engine/UI/GUI/Common/Dropdown.cs | 3 +--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Source/Editor/Windows/AboutDialog.cs b/Source/Editor/Windows/AboutDialog.cs
index 1d9afbdfe..af0d121c2 100644
--- a/Source/Editor/Windows/AboutDialog.cs
+++ b/Source/Editor/Windows/AboutDialog.cs
@@ -98,6 +98,7 @@ namespace FlaxEditor.Windows
                 "Chandler Cox",
                 "Ari Vuollet",
                 "Vincent Saarmann",
+                "Michael Salvini",
             });
             authors.Sort();
             var authorsLabel = new Label(4, topParentControl.Bottom + 20, Width - 8, 70)
diff --git a/Source/Engine/Core/Math/Color.cs b/Source/Engine/Core/Math/Color.cs
index 2d779dcfa..f11ba07ec 100644
--- a/Source/Engine/Core/Math/Color.cs
+++ b/Source/Engine/Core/Math/Color.cs
@@ -82,6 +82,11 @@ namespace FlaxEngine
             }
         }
 
+        /// <summary>
+        ///  Gets the brightness of the color
+        /// </summary>
+        public float Luminance => R * 0.299f + G * 0.587f + B * 0.114f;
+
         /// <summary>
         /// Returns the minimum color component value: Min(r,g,b).
         /// </summary>
diff --git a/Source/Engine/UI/GUI/Common/Dropdown.cs b/Source/Engine/UI/GUI/Common/Dropdown.cs
index a8b5929c3..9efad789e 100644
--- a/Source/Engine/UI/GUI/Common/Dropdown.cs
+++ b/Source/Engine/UI/GUI/Common/Dropdown.cs
@@ -588,7 +588,6 @@ namespace FlaxEngine.GUI
                 AutoFocus = false,
                 Size = size,
             };
-            float brightness = TextColorHighlighted.R * 0.299f + TextColorHighlighted.G * 0.587f + TextColorHighlighted.B * 0.114f;
             var label = new DropdownLabel
             {
                 AutoFocus = true,
@@ -596,7 +595,7 @@ namespace FlaxEngine.GUI
                 Size = new Float2(size.X - margin, size.Y),
                 Font = Font,
                 TextColor = TextColor * 0.9f,
-                TextColorHighlighted = brightness < 0.05f ? Color.Lerp(TextColorHighlighted, Color.White, 0.3f) : TextColorHighlighted,
+                TextColorHighlighted = TextColorHighlighted.Luminance < 0.05f ? Color.Lerp(TextColorHighlighted, Color.White, 0.3f) : TextColorHighlighted,
                 HorizontalAlignment = HorizontalAlignment,
                 VerticalAlignment = VerticalAlignment,
                 Text = _items[i],

From 0094216ff8eaac61fd417424e6ef4c1e65e8ed5f Mon Sep 17 00:00:00 2001
From: Phantom <salvini.michael01@gmail.com>
Date: Mon, 15 Dec 2025 14:29:57 +0100
Subject: [PATCH 047/203] Renaming Luminance name to Brightness

---
 Source/Engine/Core/Math/Color.cs        | 2 +-
 Source/Engine/UI/GUI/Common/Dropdown.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/Core/Math/Color.cs b/Source/Engine/Core/Math/Color.cs
index f11ba07ec..711ffb7d9 100644
--- a/Source/Engine/Core/Math/Color.cs
+++ b/Source/Engine/Core/Math/Color.cs
@@ -85,7 +85,7 @@ namespace FlaxEngine
         /// <summary>
         ///  Gets the brightness of the color
         /// </summary>
-        public float Luminance => R * 0.299f + G * 0.587f + B * 0.114f;
+        public float Brightness => R * 0.299f + G * 0.587f + B * 0.114f;
 
         /// <summary>
         /// Returns the minimum color component value: Min(r,g,b).
diff --git a/Source/Engine/UI/GUI/Common/Dropdown.cs b/Source/Engine/UI/GUI/Common/Dropdown.cs
index 9efad789e..6488bb14a 100644
--- a/Source/Engine/UI/GUI/Common/Dropdown.cs
+++ b/Source/Engine/UI/GUI/Common/Dropdown.cs
@@ -595,7 +595,7 @@ namespace FlaxEngine.GUI
                 Size = new Float2(size.X - margin, size.Y),
                 Font = Font,
                 TextColor = TextColor * 0.9f,
-                TextColorHighlighted = TextColorHighlighted.Luminance < 0.05f ? Color.Lerp(TextColorHighlighted, Color.White, 0.3f) : TextColorHighlighted,
+                TextColorHighlighted = TextColorHighlighted.Brightness < 0.05f ? Color.Lerp(TextColorHighlighted, Color.White, 0.3f) : TextColorHighlighted,
                 HorizontalAlignment = HorizontalAlignment,
                 VerticalAlignment = VerticalAlignment,
                 Text = _items[i],

From 88b02105b3ade4fc9c2f3bb2e795f1b029dd8e15 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Mon, 15 Dec 2025 20:36:35 -0600
Subject: [PATCH 048/203] Add direction gizmo.

---
 Source/Editor/Gizmo/DirectionGizmo.cs         | 168 ++++++++++++++++++
 .../Viewport/MainEditorGizmoViewport.cs       |   3 +
 2 files changed, 171 insertions(+)
 create mode 100644 Source/Editor/Gizmo/DirectionGizmo.cs

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
new file mode 100644
index 000000000..17e94564c
--- /dev/null
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -0,0 +1,168 @@
+using System.Collections.Generic;
+using FlaxEditor.Gizmo;
+using FlaxEditor.Viewport;
+using FlaxEngine;
+using FlaxEngine.GUI;
+
+namespace FlaxEditor.Gizmo;
+
+public class DirectionGizmo
+{
+    private IGizmoOwner _owner;
+    private ViewportProjection _viewportProjection;
+    private EditorViewport _viewport;
+    private Vector3 _gizmoCenter;
+    private float _axisLength = 70.0f;
+    private float _textAxisLength = 85.0f;
+
+    private AxisData _xAxisData;
+    private AxisData _yAxisData;
+    private AxisData _zAxisData;
+    private AxisData _negXAxisData;
+    private AxisData _negYAxisData;
+    private AxisData _negZAxisData;
+
+    private List<AxisData> _axisData = new List<AxisData>();
+
+    private SpriteHandle _posHandle;
+    private SpriteHandle _negHandle;
+
+    private FontReference _fontReference;
+    
+    private struct ViewportProjection
+    {
+        private Matrix _viewProjection;
+        private BoundingFrustum _frustum;
+        private FlaxEngine.Viewport _viewport;
+        private Vector3 _origin;
+
+        public void Init(EditorViewport editorViewport)
+        {
+            // Inline EditorViewport.ProjectPoint to save on calculation for large set of points
+            _viewport = new FlaxEngine.Viewport(0, 0, editorViewport.Width, editorViewport.Height);
+            _frustum = editorViewport.ViewFrustum;
+            _viewProjection = _frustum.Matrix;
+            _origin = editorViewport.Task.View.Origin;
+        }
+
+        public void ProjectPoint(Vector3 worldSpaceLocation, out Float2 viewportSpaceLocation)
+        {
+            worldSpaceLocation -= _origin;
+            _viewport.Project(ref worldSpaceLocation, ref _viewProjection, out var projected);
+            viewportSpaceLocation = new Float2((float)projected.X, (float)projected.Y);
+        }
+    }
+
+    private struct AxisData
+    {
+        public Float2 Delta;
+        public float Distance;
+        public string Label;
+        public Color AxisColor;
+        public bool Negative;
+    }
+
+    /// <summary>
+    /// Constructor of the Direction Gizmo
+    /// </summary>
+    /// <param name="owner">The owner of this object.</param>
+    public DirectionGizmo(IGizmoOwner owner)
+    {
+        _owner = owner;
+        _viewport = owner.Viewport;
+        _viewportProjection.Init(owner.Viewport);
+        
+        _xAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "X", AxisColor = new Color(1.0f, 0.0f, 0.02745f, 1.0f), Negative = false };
+        _yAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "Y", AxisColor = new Color(0.239215f, 1.0f, 0.047058f, 1.0f), Negative = false };
+        _zAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "Z", AxisColor = new Color(0.0f, 0.0235294f, 1.0f, 1.0f), Negative = false };
+        
+        _negXAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-X", AxisColor = new Color(1.0f, 0.0f, 0.02745f, 1.0f), Negative = true };
+        _negYAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Y", AxisColor = new Color(0.239215f, 1.0f, 0.047058f, 1.0f), Negative = true };
+        _negZAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Z", AxisColor = new Color(0.0f, 0.0235294f, 1.0f, 1.0f), Negative = true };
+        _axisData.EnsureCapacity(6);
+
+        _posHandle = Editor.Instance.Icons.VisjectBoxClosed32;
+        _negHandle = Editor.Instance.Icons.VisjectBoxOpen32;
+        
+        _fontReference = new FontReference(Style.Current.FontSmall);
+        _fontReference.Size = 8;
+    }
+    
+    /// <summary>
+    /// Used to Draw the gizmo.
+    /// </summary>
+    public void Draw()
+    {
+        _viewportProjection.Init(_owner.Viewport);
+        _gizmoCenter = _viewport.Task.View.WorldPosition + _viewport.Task.View.Direction * 1500;
+        _viewportProjection.ProjectPoint(_gizmoCenter, out var gizmoCenterScreen);
+        var bounds = _viewport.Bounds;
+        var screenLocation = bounds.Location - new Float2(-bounds.Width * 0.5f + 50, bounds.Height * 0.5f - 50);
+        var relativeCenter = gizmoCenterScreen - screenLocation;
+
+        // Project unit vectors
+        _viewportProjection.ProjectPoint(_gizmoCenter + Vector3.Right, out var xProjected);
+        _viewportProjection.ProjectPoint(_gizmoCenter + Vector3.Up, out var yProjected);
+        _viewportProjection.ProjectPoint(_gizmoCenter + Vector3.Forward, out var zProjected);
+        _viewportProjection.ProjectPoint(_gizmoCenter - Vector3.Right, out var negXProjected);
+        _viewportProjection.ProjectPoint(_gizmoCenter - Vector3.Up, out var negYProjected);
+        _viewportProjection.ProjectPoint(_gizmoCenter - Vector3.Forward, out var negZProjected);
+
+        // Normalize by viewport height to keep size independent of FOV and viewport dimensions
+        float heightNormalization = _viewport.Height / 720.0f; // 720 = reference height
+
+        Float2 xDelta = (xProjected - gizmoCenterScreen) / heightNormalization;
+        Float2 yDelta = (yProjected - gizmoCenterScreen) / heightNormalization;
+        Float2 zDelta = (zProjected - gizmoCenterScreen) / heightNormalization;
+        Float2 negXDelta = (negXProjected - gizmoCenterScreen) / heightNormalization;
+        Float2 negYDelta = (negYProjected - gizmoCenterScreen) / heightNormalization;
+        Float2 negZDelta = (negZProjected - gizmoCenterScreen) / heightNormalization;
+
+        // Calculate distances from camera to determine draw order
+        Vector3 cameraPosition = _viewport.Task.View.Position;
+        float xDistance = Vector3.Distance(cameraPosition, _gizmoCenter + Vector3.Right);
+        float yDistance = Vector3.Distance(cameraPosition, _gizmoCenter + Vector3.Up);
+        float zDistance = Vector3.Distance(cameraPosition, _gizmoCenter + Vector3.Forward);
+        float negXDistance = Vector3.Distance(cameraPosition, _gizmoCenter - Vector3.Right);
+        float negYDistance = Vector3.Distance(cameraPosition, _gizmoCenter - Vector3.Up);
+        float negZDistance = Vector3.Distance(cameraPosition, _gizmoCenter - Vector3.Forward);
+
+        _xAxisData.Delta = xDelta;
+        _xAxisData.Distance = xDistance;
+        _yAxisData.Delta = yDelta;
+        _yAxisData.Distance = yDistance;
+        _zAxisData.Delta = zDelta;
+        _zAxisData.Distance = zDistance;
+        _negXAxisData.Delta = negXDelta;
+        _negXAxisData.Distance = negXDistance;
+        _negYAxisData.Delta = negYDelta;
+        _negYAxisData.Distance = negYDistance;
+        _negZAxisData.Delta = negZDelta;
+        _negZAxisData.Distance = negZDistance;
+
+        // Sort for correct draw order.
+        _axisData.Clear();
+        _axisData.AddRange([_xAxisData, _yAxisData, _zAxisData, _negXAxisData, _negYAxisData, _negZAxisData]);
+        _axisData.Sort( (a, b) => -a.Distance.CompareTo(b.Distance));
+        
+        // Draw in order from farthest to closest
+        foreach (var axis in _axisData)
+        {
+            Float2 tipScreen = relativeCenter + axis.Delta * _axisLength;
+            Float2 tipTextScreen = relativeCenter + axis.Delta * _textAxisLength;
+
+            if (!axis.Negative)
+            {
+                Render2D.DrawLine(relativeCenter, tipScreen, axis.AxisColor, 2.0f);
+                Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(12, 12), new Float2(24, 24)), axis.AxisColor);
+                var font = _fontReference.GetFont();
+                Render2D.DrawText(font, axis.Label, Color.Black, tipTextScreen - font.MeasureText(axis.Label) * 0.5f);
+            }
+            else
+            {
+                Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(12, 12), new Float2(24, 24)), axis.AxisColor.RGBMultiplied(0.65f));
+                Render2D.DrawSprite(_negHandle, new Rectangle(tipTextScreen - new Float2(12, 12), new Float2(24, 24)), axis.AxisColor);
+            }
+        }
+    }
+}
diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index 5343a1fe5..cd4b15799 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -107,6 +107,7 @@ namespace FlaxEditor.Viewport
         private readonly ViewportDebugDrawData _debugDrawData = new ViewportDebugDrawData(32);
         private EditorSpritesRenderer _editorSpritesRenderer;
         private ViewportRubberBandSelector _rubberBandSelector;
+        private DirectionGizmo _directionGizmo;
 
         /// <summary>
         /// Drag and drop handlers
@@ -216,6 +217,7 @@ namespace FlaxEditor.Viewport
 
             // Add rubber band selector
             _rubberBandSelector = new ViewportRubberBandSelector(this);
+            _directionGizmo = new DirectionGizmo(this);
 
             // Add grid
             Grid = new GridGizmo(this);
@@ -593,6 +595,7 @@ namespace FlaxEditor.Viewport
 
             // Draw rubber band for rectangle selection
             _rubberBandSelector.Draw();
+            _directionGizmo.Draw();
         }
 
         /// <inheritdoc />

From 56e6df261d37c7adb71973d50d6dc7b0632efdc9 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Mon, 15 Dec 2025 21:22:11 -0600
Subject: [PATCH 049/203] Add hovering and selecting.

---
 Source/Editor/Gizmo/DirectionGizmo.cs         | 113 ++++++++++++++++--
 .../Viewport/MainEditorGizmoViewport.cs       |   5 +
 2 files changed, 108 insertions(+), 10 deletions(-)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index 17e94564c..bfe2ebab9 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -12,8 +12,9 @@ public class DirectionGizmo
     private ViewportProjection _viewportProjection;
     private EditorViewport _viewport;
     private Vector3 _gizmoCenter;
-    private float _axisLength = 70.0f;
-    private float _textAxisLength = 85.0f;
+    private float _axisLength = 75.0f;
+    private float _textAxisLength = 95.0f;
+    private float _spriteRadius = 12.0f;
 
     private AxisData _xAxisData;
     private AxisData _yAxisData;
@@ -23,11 +24,15 @@ public class DirectionGizmo
     private AxisData _negZAxisData;
 
     private List<AxisData> _axisData = new List<AxisData>();
+    private int _hoveredAxisIndex = -1;
 
     private SpriteHandle _posHandle;
     private SpriteHandle _negHandle;
 
     private FontReference _fontReference;
+
+    // Store sprite positions for hover detection
+    private List<(Float2 position, AxisDirection direction)> _spritePositions = new List<(Float2, AxisDirection)>();
     
     private struct ViewportProjection
     {
@@ -60,6 +65,17 @@ public class DirectionGizmo
         public string Label;
         public Color AxisColor;
         public bool Negative;
+        public AxisDirection Direction;
+    }
+
+    private enum AxisDirection
+    {
+        PosX,
+        PosY,
+        PosZ,
+        NegX,
+        NegY,
+        NegZ
     }
 
     /// <summary>
@@ -72,13 +88,13 @@ public class DirectionGizmo
         _viewport = owner.Viewport;
         _viewportProjection.Init(owner.Viewport);
         
-        _xAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "X", AxisColor = new Color(1.0f, 0.0f, 0.02745f, 1.0f), Negative = false };
-        _yAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "Y", AxisColor = new Color(0.239215f, 1.0f, 0.047058f, 1.0f), Negative = false };
-        _zAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "Z", AxisColor = new Color(0.0f, 0.0235294f, 1.0f, 1.0f), Negative = false };
+        _xAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "X", AxisColor = new Color(1.0f, 0.0f, 0.02745f, 1.0f), Negative = false, Direction = AxisDirection.PosX };
+        _yAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "Y", AxisColor = new Color(0.239215f, 1.0f, 0.047058f, 1.0f), Negative = false, Direction = AxisDirection.PosY };
+        _zAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "Z", AxisColor = new Color(0.0f, 0.0235294f, 1.0f, 1.0f), Negative = false, Direction = AxisDirection.PosZ };
         
-        _negXAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-X", AxisColor = new Color(1.0f, 0.0f, 0.02745f, 1.0f), Negative = true };
-        _negYAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Y", AxisColor = new Color(0.239215f, 1.0f, 0.047058f, 1.0f), Negative = true };
-        _negZAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Z", AxisColor = new Color(0.0f, 0.0235294f, 1.0f, 1.0f), Negative = true };
+        _negXAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-X", AxisColor = new Color(1.0f, 0.0f, 0.02745f, 1.0f), Negative = true, Direction = AxisDirection.NegX };
+        _negYAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Y", AxisColor = new Color(0.239215f, 1.0f, 0.047058f, 1.0f), Negative = true, Direction = AxisDirection.NegY };
+        _negZAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Z", AxisColor = new Color(0.0f, 0.0235294f, 1.0f, 1.0f), Negative = true, Direction = AxisDirection.NegZ };
         _axisData.EnsureCapacity(6);
 
         _posHandle = Editor.Instance.Icons.VisjectBoxClosed32;
@@ -87,6 +103,66 @@ public class DirectionGizmo
         _fontReference = new FontReference(Style.Current.FontSmall);
         _fontReference.Size = 8;
     }
+
+    private bool IsPointInSprite(Float2 point, Float2 spriteCenter)
+    {
+        Float2 delta = point - spriteCenter;
+        float distanceSq = delta.LengthSquared;
+        float radiusSq = _spriteRadius * _spriteRadius;
+        return distanceSq <= radiusSq;
+    }
+
+    /// <summary>
+    /// Updates the gizmo for mouse interactions (hover and click detection).
+    /// </summary>
+    public void Update(Float2 mousePos)
+    {
+        _hoveredAxisIndex = -1;
+
+        // Check which axis is being hovered - check from end (closest) to start (farthest) for proper layering
+        for (int i = _spritePositions.Count - 1; i >= 0; i--)
+        {
+            if (IsPointInSprite(mousePos, _spritePositions[i].position))
+            {
+                _hoveredAxisIndex = i;
+                break;
+            }
+        }
+    }
+    
+    /// <summary>
+    /// Handles mouse click on direction gizmo sprites.
+    /// </summary>
+    public bool OnMouseDown(Float2 mousePos)
+    {
+        // Check which axis is being clicked - check from end (closest) to start (farthest) for proper layering
+        for (int i = _spritePositions.Count - 1; i >= 0; i--)
+        {
+            if (IsPointInSprite(mousePos, _spritePositions[i].position))
+            {
+                OrientViewToAxis(_spritePositions[i].direction);
+                return true;
+            }
+        }
+        
+        return false;
+    }
+
+    private void OrientViewToAxis(AxisDirection direction)
+    {
+        Quaternion orientation = direction switch
+        {
+            AxisDirection.PosX => Quaternion.Euler(0, 90, 0),
+            AxisDirection.NegX => Quaternion.Euler(0, -90, 0),
+            AxisDirection.PosY => Quaternion.Euler(-90, 0, 0),
+            AxisDirection.NegY => Quaternion.Euler(90, 0, 0),
+            AxisDirection.PosZ => Quaternion.Euler(0, 0, 0),
+            AxisDirection.NegZ => Quaternion.Euler(0, 180, 0),
+            _ => Quaternion.Identity
+        };
+
+        _viewport.ViewOrientation = orientation;
+    }
     
     /// <summary>
     /// Used to Draw the gizmo.
@@ -144,24 +220,41 @@ public class DirectionGizmo
         _axisData.Clear();
         _axisData.AddRange([_xAxisData, _yAxisData, _zAxisData, _negXAxisData, _negYAxisData, _negZAxisData]);
         _axisData.Sort( (a, b) => -a.Distance.CompareTo(b.Distance));
+
+        // Rebuild sprite positions list for hover detection
+        _spritePositions.Clear();
         
         // Draw in order from farthest to closest
-        foreach (var axis in _axisData)
+        for (int i = 0; i < _axisData.Count; i++)
         {
+            var axis = _axisData[i];
             Float2 tipScreen = relativeCenter + axis.Delta * _axisLength;
             Float2 tipTextScreen = relativeCenter + axis.Delta * _textAxisLength;
+            bool isHovered = _hoveredAxisIndex == i;
+
+            // Store sprite position for hover detection
+            _spritePositions.Add((tipTextScreen, axis.Direction));
 
             if (!axis.Negative)
             {
                 Render2D.DrawLine(relativeCenter, tipScreen, axis.AxisColor, 2.0f);
                 Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(12, 12), new Float2(24, 24)), axis.AxisColor);
+                
                 var font = _fontReference.GetFont();
-                Render2D.DrawText(font, axis.Label, Color.Black, tipTextScreen - font.MeasureText(axis.Label) * 0.5f);
+                Color textColor = isHovered ? Color.White : Color.Black;
+                Render2D.DrawText(font, axis.Label, textColor, tipTextScreen - font.MeasureText(axis.Label) * 0.5f);
             }
             else
             {
                 Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(12, 12), new Float2(24, 24)), axis.AxisColor.RGBMultiplied(0.65f));
                 Render2D.DrawSprite(_negHandle, new Rectangle(tipTextScreen - new Float2(12, 12), new Float2(24, 24)), axis.AxisColor);
+                
+                // Draw white label text on hover for negative axes
+                if (isHovered)
+                {
+                    var font = _fontReference.GetFont();
+                    Render2D.DrawText(font, axis.Label, Color.White, tipTextScreen - font.MeasureText(axis.Label) * 0.5f);
+                }
             }
         }
     }
diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index cd4b15799..b5232c7e4 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -612,6 +612,8 @@ namespace FlaxEditor.Viewport
         {
             base.OnMouseMove(location);
 
+            _directionGizmo.Update(location);
+
             // Don't allow rubber band selection when gizmo is controlling mouse, vertex painting mode, or cloth painting is enabled
             bool canStart = !(IsControllingMouse || IsRightMouseButtonDown || IsAltKeyDown) &&
                             Gizmos?.Active is TransformGizmo && !Gizmos.Active.IsControllingMouse;
@@ -622,6 +624,9 @@ namespace FlaxEditor.Viewport
         protected override void OnLeftMouseButtonDown()
         {
             base.OnLeftMouseButtonDown();
+            
+            if (_directionGizmo.OnMouseDown(_viewMousePos))
+                return;
 
             _rubberBandSelector.TryStartingRubberBandSelection();
         }

From d671f57952ed9279961b0b6fc5ff1a0fec250ea1 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Mon, 15 Dec 2025 21:41:45 -0600
Subject: [PATCH 050/203] Change to container control for anchoring.

---
 Source/Editor/Gizmo/DirectionGizmo.cs         | 43 +++++++++++--------
 .../Viewport/MainEditorGizmoViewport.cs       | 10 ++---
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index bfe2ebab9..350c3be5c 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -6,7 +6,7 @@ using FlaxEngine.GUI;
 
 namespace FlaxEditor.Gizmo;
 
-public class DirectionGizmo
+public class DirectionGizmo : ContainerControl
 {
     private IGizmoOwner _owner;
     private ViewportProjection _viewportProjection;
@@ -33,7 +33,7 @@ public class DirectionGizmo
 
     // Store sprite positions for hover detection
     private List<(Float2 position, AxisDirection direction)> _spritePositions = new List<(Float2, AxisDirection)>();
-    
+
     private struct ViewportProjection
     {
         private Matrix _viewProjection;
@@ -112,33 +112,40 @@ public class DirectionGizmo
         return distanceSq <= radiusSq;
     }
 
-    /// <summary>
-    /// Updates the gizmo for mouse interactions (hover and click detection).
-    /// </summary>
-    public void Update(Float2 mousePos)
+    /// <inheritdoc />
+    public override void OnMouseMove(Float2 location)
     {
         _hoveredAxisIndex = -1;
 
+        // Convert local control space to screen space
+        Float2 viewportLocation = PointToParent(ref location);
+
         // Check which axis is being hovered - check from end (closest) to start (farthest) for proper layering
         for (int i = _spritePositions.Count - 1; i >= 0; i--)
         {
-            if (IsPointInSprite(mousePos, _spritePositions[i].position))
+            if (IsPointInSprite(viewportLocation, _spritePositions[i].position))
             {
                 _hoveredAxisIndex = i;
                 break;
             }
         }
+        
+        base.OnMouseMove(location);
     }
-    
-    /// <summary>
-    /// Handles mouse click on direction gizmo sprites.
-    /// </summary>
-    public bool OnMouseDown(Float2 mousePos)
+
+    /// <inheritdoc />
+    public override bool OnMouseDown(Float2 location, MouseButton button)
     {
+        if (base.OnMouseDown(location, button))
+            return true;
+
+        // Convert local control space to screen space
+        Float2 viewportLocation = PointToParent(ref location);
+
         // Check which axis is being clicked - check from end (closest) to start (farthest) for proper layering
         for (int i = _spritePositions.Count - 1; i >= 0; i--)
         {
-            if (IsPointInSprite(mousePos, _spritePositions[i].position))
+            if (IsPointInSprite(viewportLocation, _spritePositions[i].position))
             {
                 OrientViewToAxis(_spritePositions[i].direction);
                 return true;
@@ -167,14 +174,16 @@ public class DirectionGizmo
     /// <summary>
     /// Used to Draw the gizmo.
     /// </summary>
-    public void Draw()
+    public override void DrawSelf()
     {
+        base.DrawSelf();
+ 
         _viewportProjection.Init(_owner.Viewport);
         _gizmoCenter = _viewport.Task.View.WorldPosition + _viewport.Task.View.Direction * 1500;
         _viewportProjection.ProjectPoint(_gizmoCenter, out var gizmoCenterScreen);
-        var bounds = _viewport.Bounds;
-        var screenLocation = bounds.Location - new Float2(-bounds.Width * 0.5f + 50, bounds.Height * 0.5f - 50);
-        var relativeCenter = gizmoCenterScreen - screenLocation;
+            
+        // Use the settable bounds instead of hardcoded positioning
+        var relativeCenter = Bounds.Location + Bounds.Size * 0.5f;
 
         // Project unit vectors
         _viewportProjection.ProjectPoint(_gizmoCenter + Vector3.Right, out var xProjected);
diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index b5232c7e4..fccb7a79e 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -218,6 +218,11 @@ namespace FlaxEditor.Viewport
             // Add rubber band selector
             _rubberBandSelector = new ViewportRubberBandSelector(this);
             _directionGizmo = new DirectionGizmo(this);
+            _directionGizmo.Parent = this;
+            _directionGizmo.AnchorPreset = AnchorPresets.TopRight;
+            _directionGizmo.LocalY += 30;
+            _directionGizmo.LocalX -= 10;
+            _directionGizmo.Size = new Float2(100, 100);
 
             // Add grid
             Grid = new GridGizmo(this);
@@ -612,8 +617,6 @@ namespace FlaxEditor.Viewport
         {
             base.OnMouseMove(location);
 
-            _directionGizmo.Update(location);
-
             // Don't allow rubber band selection when gizmo is controlling mouse, vertex painting mode, or cloth painting is enabled
             bool canStart = !(IsControllingMouse || IsRightMouseButtonDown || IsAltKeyDown) &&
                             Gizmos?.Active is TransformGizmo && !Gizmos.Active.IsControllingMouse;
@@ -624,9 +627,6 @@ namespace FlaxEditor.Viewport
         protected override void OnLeftMouseButtonDown()
         {
             base.OnLeftMouseButtonDown();
-            
-            if (_directionGizmo.OnMouseDown(_viewMousePos))
-                return;
 
             _rubberBandSelector.TryStartingRubberBandSelection();
         }

From 9708601d3b6d879e52207b5d71cb35d3951c8a51 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Mon, 15 Dec 2025 21:46:03 -0600
Subject: [PATCH 051/203] Small cleanup.

---
 Source/Editor/Gizmo/DirectionGizmo.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index 350c3be5c..bb6823002 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -120,7 +120,7 @@ public class DirectionGizmo : ContainerControl
         // Convert local control space to screen space
         Float2 viewportLocation = PointToParent(ref location);
 
-        // Check which axis is being hovered - check from end (closest) to start (farthest) for proper layering
+        // Check which axis is being hovered - check from closest to farthest for proper layering
         for (int i = _spritePositions.Count - 1; i >= 0; i--)
         {
             if (IsPointInSprite(viewportLocation, _spritePositions[i].position))
@@ -142,7 +142,7 @@ public class DirectionGizmo : ContainerControl
         // Convert local control space to screen space
         Float2 viewportLocation = PointToParent(ref location);
 
-        // Check which axis is being clicked - check from end (closest) to start (farthest) for proper layering
+        // Check which axis is being clicked - check from closest to farthest for proper layering
         for (int i = _spritePositions.Count - 1; i >= 0; i--)
         {
             if (IsPointInSprite(viewportLocation, _spritePositions[i].position))
@@ -247,7 +247,7 @@ public class DirectionGizmo : ContainerControl
             if (!axis.Negative)
             {
                 Render2D.DrawLine(relativeCenter, tipScreen, axis.AxisColor, 2.0f);
-                Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(12, 12), new Float2(24, 24)), axis.AxisColor);
+                Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axis.AxisColor);
                 
                 var font = _fontReference.GetFont();
                 Color textColor = isHovered ? Color.White : Color.Black;
@@ -255,8 +255,8 @@ public class DirectionGizmo : ContainerControl
             }
             else
             {
-                Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(12, 12), new Float2(24, 24)), axis.AxisColor.RGBMultiplied(0.65f));
-                Render2D.DrawSprite(_negHandle, new Rectangle(tipTextScreen - new Float2(12, 12), new Float2(24, 24)), axis.AxisColor);
+                Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axis.AxisColor.RGBMultiplied(0.65f));
+                Render2D.DrawSprite(_negHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axis.AxisColor);
                 
                 // Draw white label text on hover for negative axes
                 if (isHovered)

From b9f177d1ab17185f1ebf7ecee0bbcd8daeb1ae1b Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Tue, 16 Dec 2025 17:12:54 -0600
Subject: [PATCH 052/203] Add ensure capacity to lists.

---
 Source/Editor/Gizmo/DirectionGizmo.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index bb6823002..1c0af3d70 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -96,6 +96,7 @@ public class DirectionGizmo : ContainerControl
         _negYAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Y", AxisColor = new Color(0.239215f, 1.0f, 0.047058f, 1.0f), Negative = true, Direction = AxisDirection.NegY };
         _negZAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Z", AxisColor = new Color(0.0f, 0.0235294f, 1.0f, 1.0f), Negative = true, Direction = AxisDirection.NegZ };
         _axisData.EnsureCapacity(6);
+        _spritePositions.EnsureCapacity(6);
 
         _posHandle = Editor.Instance.Icons.VisjectBoxClosed32;
         _negHandle = Editor.Instance.Icons.VisjectBoxOpen32;

From 2c5cc7fcc00d83fe165ef7ef09830571ee41cf8e Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Tue, 16 Dec 2025 17:32:35 -0600
Subject: [PATCH 053/203] Fix double drawing.

---
 Source/Editor/Gizmo/DirectionGizmo.cs         | 22 +++++++------------
 .../Viewport/MainEditorGizmoViewport.cs       |  9 ++++----
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index 1c0af3d70..082ceef0c 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -118,13 +118,10 @@ public class DirectionGizmo : ContainerControl
     {
         _hoveredAxisIndex = -1;
 
-        // Convert local control space to screen space
-        Float2 viewportLocation = PointToParent(ref location);
-
         // Check which axis is being hovered - check from closest to farthest for proper layering
         for (int i = _spritePositions.Count - 1; i >= 0; i--)
         {
-            if (IsPointInSprite(viewportLocation, _spritePositions[i].position))
+            if (IsPointInSprite(location, _spritePositions[i].position))
             {
                 _hoveredAxisIndex = i;
                 break;
@@ -140,13 +137,10 @@ public class DirectionGizmo : ContainerControl
         if (base.OnMouseDown(location, button))
             return true;
 
-        // Convert local control space to screen space
-        Float2 viewportLocation = PointToParent(ref location);
-
         // Check which axis is being clicked - check from closest to farthest for proper layering
         for (int i = _spritePositions.Count - 1; i >= 0; i--)
         {
-            if (IsPointInSprite(viewportLocation, _spritePositions[i].position))
+            if (IsPointInSprite(location, _spritePositions[i].position))
             {
                 OrientViewToAxis(_spritePositions[i].direction);
                 return true;
@@ -182,9 +176,8 @@ public class DirectionGizmo : ContainerControl
         _viewportProjection.Init(_owner.Viewport);
         _gizmoCenter = _viewport.Task.View.WorldPosition + _viewport.Task.View.Direction * 1500;
         _viewportProjection.ProjectPoint(_gizmoCenter, out var gizmoCenterScreen);
-            
-        // Use the settable bounds instead of hardcoded positioning
-        var relativeCenter = Bounds.Location + Bounds.Size * 0.5f;
+
+        var relativeCenter = Size * 0.5f;
 
         // Project unit vectors
         _viewportProjection.ProjectPoint(_gizmoCenter + Vector3.Right, out var xProjected);
@@ -233,7 +226,9 @@ public class DirectionGizmo : ContainerControl
 
         // Rebuild sprite positions list for hover detection
         _spritePositions.Clear();
-        
+
+        Render2D.DrawSprite(_posHandle, new Rectangle(0, 0, Size), Color.Black.AlphaMultiplied(0.1f));
+
         // Draw in order from farthest to closest
         for (int i = 0; i < _axisData.Count; i++)
         {
@@ -258,8 +253,7 @@ public class DirectionGizmo : ContainerControl
             {
                 Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axis.AxisColor.RGBMultiplied(0.65f));
                 Render2D.DrawSprite(_negHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axis.AxisColor);
-                
-                // Draw white label text on hover for negative axes
+
                 if (isHovered)
                 {
                     var font = _fontReference.GetFont();
diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index fccb7a79e..86dba5947 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -218,11 +218,11 @@ namespace FlaxEditor.Viewport
             // Add rubber band selector
             _rubberBandSelector = new ViewportRubberBandSelector(this);
             _directionGizmo = new DirectionGizmo(this);
-            _directionGizmo.Parent = this;
             _directionGizmo.AnchorPreset = AnchorPresets.TopRight;
-            _directionGizmo.LocalY += 30;
-            _directionGizmo.LocalX -= 10;
-            _directionGizmo.Size = new Float2(100, 100);
+            _directionGizmo.Parent = this;
+            _directionGizmo.LocalY += 25;
+            _directionGizmo.LocalX -= 150;
+            _directionGizmo.Size = new Float2(150, 150);
 
             // Add grid
             Grid = new GridGizmo(this);
@@ -600,7 +600,6 @@ namespace FlaxEditor.Viewport
 
             // Draw rubber band for rectangle selection
             _rubberBandSelector.Draw();
-            _directionGizmo.Draw();
         }
 
         /// <inheritdoc />

From 1b9f6ed20f81a9b046336e72acb1e5feaf8efdeb Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Tue, 16 Dec 2025 18:16:58 -0600
Subject: [PATCH 054/203] Fix large world build.

---
 Source/Editor/Gizmo/DirectionGizmo.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index 082ceef0c..c9089e5fc 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -199,12 +199,12 @@ public class DirectionGizmo : ContainerControl
 
         // Calculate distances from camera to determine draw order
         Vector3 cameraPosition = _viewport.Task.View.Position;
-        float xDistance = Vector3.Distance(cameraPosition, _gizmoCenter + Vector3.Right);
-        float yDistance = Vector3.Distance(cameraPosition, _gizmoCenter + Vector3.Up);
-        float zDistance = Vector3.Distance(cameraPosition, _gizmoCenter + Vector3.Forward);
-        float negXDistance = Vector3.Distance(cameraPosition, _gizmoCenter - Vector3.Right);
-        float negYDistance = Vector3.Distance(cameraPosition, _gizmoCenter - Vector3.Up);
-        float negZDistance = Vector3.Distance(cameraPosition, _gizmoCenter - Vector3.Forward);
+        float xDistance = (float)Vector3.Distance(cameraPosition, _gizmoCenter + Vector3.Right);
+        float yDistance = (float)Vector3.Distance(cameraPosition, _gizmoCenter + Vector3.Up);
+        float zDistance = (float)Vector3.Distance(cameraPosition, _gizmoCenter + Vector3.Forward);
+        float negXDistance = (float)Vector3.Distance(cameraPosition, _gizmoCenter - Vector3.Right);
+        float negYDistance = (float)Vector3.Distance(cameraPosition, _gizmoCenter - Vector3.Up);
+        float negZDistance = (float)Vector3.Distance(cameraPosition, _gizmoCenter - Vector3.Forward);
 
         _xAxisData.Delta = xDelta;
         _xAxisData.Distance = xDistance;

From 3afd3ce2d5cf6bbfaef36447d0746cce6e6b5ed9 Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Wed, 17 Dec 2025 02:52:29 +0200
Subject: [PATCH 055/203] Use XDG user directories on Linux special paths

---
 .../Engine/Platform/Linux/LinuxFileSystem.cpp | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/Source/Engine/Platform/Linux/LinuxFileSystem.cpp b/Source/Engine/Platform/Linux/LinuxFileSystem.cpp
index 9b31dc28f..4293985fa 100644
--- a/Source/Engine/Platform/Linux/LinuxFileSystem.cpp
+++ b/Source/Engine/Platform/Linux/LinuxFileSystem.cpp
@@ -338,17 +338,35 @@ void LinuxFileSystem::GetSpecialFolderPath(const SpecialFolder type, String& res
     switch (type)
     {
     case SpecialFolder::Desktop:
-        result = home / TEXT("Desktop");
+    {
+        String desktopDir;
+        if (!Platform::GetEnvironmentVariable(TEXT("XDG_DESKTOP_DIR"), desktopDir))
+            result = desktopDir;
+        else
+            result = home / TEXT("Desktop");
         break;
+    }
     case SpecialFolder::Documents:
         result = String::Empty;
         break;
     case SpecialFolder::Pictures:
-        result = home / TEXT("Pictures");
+    {
+        String picturesDir;
+        if (!Platform::GetEnvironmentVariable(TEXT("XDG_PICTURES_DIR"), picturesDir))
+            result = picturesDir;
+        else
+            result = home / TEXT("Pictures");
         break;
+    }
     case SpecialFolder::AppData:
-        result = TEXT("/usr/share");
+    {
+        String configHome;
+        if (!Platform::GetEnvironmentVariable(TEXT("XDG_CONFIG_HOME"), configHome))
+            result = configHome;
+        else
+            result = home / TEXT(".config");
         break;
+    }
     case SpecialFolder::LocalAppData:
     {
         String dataHome;

From 5d368e59a098d0ee5854426a97f5ee8514521edb Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Wed, 17 Dec 2025 03:19:58 +0200
Subject: [PATCH 056/203] Fix `SpecialFolder::AppData` on Apple systems

---
 Source/Engine/Platform/Apple/AppleFileSystem.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/Engine/Platform/Apple/AppleFileSystem.cpp b/Source/Engine/Platform/Apple/AppleFileSystem.cpp
index 450507009..a38269d69 100644
--- a/Source/Engine/Platform/Apple/AppleFileSystem.cpp
+++ b/Source/Engine/Platform/Apple/AppleFileSystem.cpp
@@ -83,17 +83,19 @@ void AppleFileSystem::GetSpecialFolderPath(const SpecialFolder type, String& res
     switch (type)
     {
     case SpecialFolder::Desktop:
-        result = home / TEXT("/Desktop");
+        result = home / TEXT("/Desktop"); // TODO: should be NSDesktopDirectory
         break;
     case SpecialFolder::Documents:
-        result = home / TEXT("/Documents");
+        result = home / TEXT("/Documents"); // TODO: should be NSDocumentDirectory
         break;
     case SpecialFolder::Pictures:
-        result = home / TEXT("/Pictures");
+        result = home / TEXT("/Pictures"); // TODO: should be NSPicturesDirectory
         break;
     case SpecialFolder::AppData:
+        result = home / TEXT("/Library/Application Support"); // TODO: should be NSApplicationSupportDirectory
+        break;
     case SpecialFolder::LocalAppData:
-        result = home / TEXT("/Library/Caches");
+        result = home / TEXT("/Library/Caches"); // TODO: should be NSApplicationSupportDirectory
         break;
     case SpecialFolder::ProgramData:
         result = home / TEXT("/Library/Application Support");

From b3ea47b9896896ec998142407115444660d20b3d Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Wed, 17 Dec 2025 03:03:41 +0200
Subject: [PATCH 057/203] Use last opened project as initial directory in
 project file dialog

---
 Source/Editor/Editor.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Source/Editor/Editor.cpp b/Source/Editor/Editor.cpp
index 58739917e..92c15f591 100644
--- a/Source/Editor/Editor.cpp
+++ b/Source/Editor/Editor.cpp
@@ -526,6 +526,17 @@ int32 Editor::LoadProduct()
             return 12;
     }
 
+    // Get the last opened project path
+    String localCachePath;
+    FileSystem::GetSpecialFolderPath(SpecialFolder::AppData, localCachePath);
+    String editorConfigPath = localCachePath / TEXT("Flax");
+    String lastProjectSettingPath = editorConfigPath / TEXT("LastProject.txt");
+    if (!FileSystem::DirectoryExists(editorConfigPath))
+        FileSystem::CreateDirectory(editorConfigPath);
+    String lastProjectPath;
+    if (FileSystem::FileExists(lastProjectSettingPath))
+        File::ReadAllText(lastProjectSettingPath, lastProjectPath);
+
     // Missing project case
     if (projectPath.IsEmpty())
     {
@@ -541,7 +552,7 @@ int32 Editor::LoadProduct()
         Array<String> files;
         if (FileSystem::ShowOpenFileDialog(
             nullptr,
-            StringView::Empty,
+            lastProjectPath,
             TEXT("Project files (*.flaxproj)\0*.flaxproj\0All files (*.*)\0*.*\0"),
             false,
             TEXT("Select project to open in Editor"),
@@ -625,6 +636,10 @@ int32 Editor::LoadProduct()
         }
     }
 
+    // Update the last opened project path
+    if (lastProjectPath.Compare(Project->ProjectFolderPath) != 0)
+        File::WriteAllText(lastProjectSettingPath, Project->ProjectFolderPath, Encoding::UTF8);
+
     return 0;
 }
 

From 604bfb5fe6230d6b2c67787329e5020726237535 Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Wed, 17 Dec 2025 03:29:43 +0200
Subject: [PATCH 058/203] Add `-lastproject` editor command-line option to open
 the last project

---
 Source/Editor/Editor.cpp             | 7 +++++++
 Source/Engine/Engine/CommandLine.cpp | 1 +
 Source/Engine/Engine/CommandLine.h   | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/Source/Editor/Editor.cpp b/Source/Editor/Editor.cpp
index 92c15f591..e82be1128 100644
--- a/Source/Editor/Editor.cpp
+++ b/Source/Editor/Editor.cpp
@@ -537,6 +537,13 @@ int32 Editor::LoadProduct()
     if (FileSystem::FileExists(lastProjectSettingPath))
         File::ReadAllText(lastProjectSettingPath, lastProjectPath);
 
+    // Try to open the last project when requested
+    if (projectPath.IsEmpty() && CommandLine::Options.LastProject.IsTrue())
+    {
+        if (!lastProjectPath.IsEmpty() && FileSystem::DirectoryExists(lastProjectPath))
+            projectPath = lastProjectPath;
+    }
+
     // Missing project case
     if (projectPath.IsEmpty())
     {
diff --git a/Source/Engine/Engine/CommandLine.cpp b/Source/Engine/Engine/CommandLine.cpp
index e0f9441eb..ad2c9c903 100644
--- a/Source/Engine/Engine/CommandLine.cpp
+++ b/Source/Engine/Engine/CommandLine.cpp
@@ -149,6 +149,7 @@ bool CommandLine::Parse(const Char* cmdLine)
     PARSE_BOOL_SWITCH("-clearcache ", ClearCache);
     PARSE_BOOL_SWITCH("-clearcooker ", ClearCookerCache);
     PARSE_ARG_SWITCH("-project ", Project);
+    PARSE_BOOL_SWITCH("-lastproject ", LastProject);
     PARSE_BOOL_SWITCH("-new ", NewProject);
     PARSE_BOOL_SWITCH("-genprojectfiles ", GenProjectFiles);
     PARSE_ARG_SWITCH("-build ", Build);
diff --git a/Source/Engine/Engine/CommandLine.h b/Source/Engine/Engine/CommandLine.h
index ad49bee04..0464a478f 100644
--- a/Source/Engine/Engine/CommandLine.h
+++ b/Source/Engine/Engine/CommandLine.h
@@ -133,6 +133,11 @@ public:
         /// </summary>
         String Project;
 
+        /// <summary>
+        /// -lastproject (Opens the last project)
+        /// </summary>
+        Nullable<bool> LastProject;
+
         /// <summary>
         /// -new (generates the project files inside the specified project folder or uses current workspace folder)
         /// </summary>

From f6e9cf644ace20e13bc62d0df7bc7fe057c4822d Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Wed, 17 Dec 2025 03:45:08 +0200
Subject: [PATCH 059/203] Verify the last project path before using it

---
 Source/Editor/Editor.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Source/Editor/Editor.cpp b/Source/Editor/Editor.cpp
index e82be1128..c08648505 100644
--- a/Source/Editor/Editor.cpp
+++ b/Source/Editor/Editor.cpp
@@ -536,13 +536,12 @@ int32 Editor::LoadProduct()
     String lastProjectPath;
     if (FileSystem::FileExists(lastProjectSettingPath))
         File::ReadAllText(lastProjectSettingPath, lastProjectPath);
+    if (!FileSystem::DirectoryExists(lastProjectPath))
+        lastProjectPath = String::Empty;
 
     // Try to open the last project when requested
-    if (projectPath.IsEmpty() && CommandLine::Options.LastProject.IsTrue())
-    {
-        if (!lastProjectPath.IsEmpty() && FileSystem::DirectoryExists(lastProjectPath))
-            projectPath = lastProjectPath;
-    }
+    if (projectPath.IsEmpty() && CommandLine::Options.LastProject.IsTrue() && !lastProjectPath.IsEmpty())
+        projectPath = lastProjectPath;
 
     // Missing project case
     if (projectPath.IsEmpty())

From 0d8ac5b7acef060d6c880c311972a2a69d9518c5 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Thu, 18 Dec 2025 12:17:22 +0100
Subject: [PATCH 060/203] implement review

- Remove trailing tooltip "."
- Add `AddSettingsButton` method
- Simplify loop into LINQ expression
---
 .../Editor/CustomEditors/Dedicated/ActorEditor.cs   |  2 +-
 .../Editor/CustomEditors/Dedicated/ScriptsEditor.cs | 13 +++----------
 .../Elements/Container/GroupElement.cs              | 11 ++++++++++-
 .../Editor/Windows/Assets/MaterialInstanceWindow.cs |  2 +-
 Source/Editor/Windows/Assets/SkinnedModelWindow.cs  |  2 +-
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
index 46c4066f2..d312f64b2 100644
--- a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
@@ -115,7 +115,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 {
                     if (actor != null)
                         group.Panel.TooltipText = Surface.SurfaceUtils.GetVisualScriptTypeDescription(TypeUtils.GetObjectType(actor));
-                    var settingsButton = group.AddHeaderButton("Settings.", 0.0f, FlaxEngine.GUI.Style.Current.Settings);
+                    var settingsButton = group.AddSettingsButton();
                     settingsButton.Clicked += OnSettingsButtonClicked;
                     break;
                 }
diff --git a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
index ef7a137f6..49fa5e564 100644
--- a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
@@ -640,7 +640,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             var group = layout.Group("Missing script");
 
             // Add settings button to the group
-            var settingsButton = group.AddHeaderButton("Settings.", 0.0f, FlaxEngine.GUI.Style.Current.Settings);
+            var settingsButton = group.AddSettingsButton();
             settingsButton.Tag = index;
             settingsButton.Clicked += MissingSettingsButtonOnClicked;
         }
@@ -907,21 +907,14 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 };
 
                 // Add settings button to the group
-                var settingsButton = group.AddHeaderButton("Settings.", 0.0f, _style.Settings);
+                var settingsButton = group.AddSettingsButton();
                 settingsButton.Tag = script;
                 settingsButton.Clicked += OnSettingsButtonClicked;
 
                 // Add script obsolete icon to the group
                 if (scriptType.HasAttribute(typeof(ObsoleteAttribute), false))
                 {
-                    ObsoleteAttribute attribute = null;
-                    foreach (var e in scriptType.GetAttributes(false))
-                    {
-                        if (e is not ObsoleteAttribute obsoleteAttribute)
-                            continue;
-                        attribute = obsoleteAttribute;
-                        break;
-                    }
+                    ObsoleteAttribute attribute = (ObsoleteAttribute)scriptType.GetAttributes(false).First(x => x is ObsoleteAttribute);
 
                     string tooltip = "Script marked as obsolete." +
                         (string.IsNullOrEmpty(attribute.Message) ? "" : $"\n{attribute.Message}") +
diff --git a/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs b/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
index e2db8b69e..4c307a903 100644
--- a/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
+++ b/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
@@ -37,7 +37,16 @@ namespace FlaxEditor.CustomEditors.Elements
         public override ContainerControl ContainerControl => Panel;
 
         /// <summary>
-        /// Adds utility settings button to the group header.
+        /// Add utility settings button to the group header.
+        /// </summary>
+        /// <returns>The created control.</returns>
+        public Image AddSettingsButton()
+        {
+            return AddHeaderButton("Settings", 0, Style.Current.Settings);
+        }
+
+        /// <summary>
+        /// Adds a button to the group header.
         /// </summary>
         /// <returns>The created control.</returns>
         public Image AddHeaderButton(string tooltipText, float xOffset, SpriteHandle sprite)
diff --git a/Source/Editor/Windows/Assets/MaterialInstanceWindow.cs b/Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
index b6b67e191..cb39930f9 100644
--- a/Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
+++ b/Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
@@ -249,7 +249,7 @@ namespace FlaxEditor.Windows.Assets
                     return;
 
                 var parametersGroup = SurfaceUtils.InitGraphParametersGroup(layout);
-                var settingButton = parametersGroup.AddHeaderButton("Settings.", 0.0f, FlaxEngine.GUI.Style.Current.Settings);
+                var settingButton = parametersGroup.AddSettingsButton();
                 settingButton.Clicked += (image, button) => OnSettingsButtonClicked(image, button, proxy.Window);
                 var baseMaterial = materialInstance.BaseMaterial;
                 var material = baseMaterial;
diff --git a/Source/Editor/Windows/Assets/SkinnedModelWindow.cs b/Source/Editor/Windows/Assets/SkinnedModelWindow.cs
index 073cf7614..392cc896a 100644
--- a/Source/Editor/Windows/Assets/SkinnedModelWindow.cs
+++ b/Source/Editor/Windows/Assets/SkinnedModelWindow.cs
@@ -284,7 +284,7 @@ namespace FlaxEditor.Windows.Assets
                         var setupGroup = layout.Group(Path.GetFileNameWithoutExtension(sourceAsset.Path));
                         setupGroup.Panel.Tag = sourceAsset;
                         setupGroup.Panel.MouseButtonRightClicked += OnPanelHeaderRightClicked;
-                        var settingsButton = setupGroup.AddHeaderButton("Settings.", 0.0f, FlaxEngine.GUI.Style.Current.Settings);
+                        var settingsButton = setupGroup.AddSettingsButton();
                         settingsButton.Tag = sourceAsset;
                         settingsButton.Clicked += OnShowSetupSettings;
 

From 5b1ca13225001a01b52e18aea16ac646426f27d3 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Thu, 18 Dec 2025 12:22:24 +0100
Subject: [PATCH 061/203] choose darker mouse over color

---
 Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
index 49fa5e564..5b068eed8 100644
--- a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
@@ -921,6 +921,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                         (string.IsNullOrEmpty(attribute.DiagnosticId) ? "" : $"\n{attribute.DiagnosticId}");
                     var obsoleteButton = group.AddHeaderButton(tooltip, settingsButton.Width + FlaxEditor.Utilities.Constants.UIMargin, Editor.Instance.Icons.Info32);
                     obsoleteButton.Color = Color.Orange;
+                    obsoleteButton.MouseOverColor = Color.DarkOrange;
                 }
 
                 group.Panel.HeaderTextMargin = new Margin(scriptDrag.Right - 12, 35, 2, 2);

From d8c90184b9c7c218620563cec2d4c5f39900711e Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Thu, 18 Dec 2025 17:19:41 +0100
Subject: [PATCH 062/203] add script only on prefab instance header button

- add some padding to `AddHeaderButton()`
- Add visual indicator (Header button) if script is only in prefab instance and not part of the prefab
---
 .../CustomEditors/Dedicated/ScriptsEditor.cs  | 21 +++++++++++++++----
 .../Elements/Container/GroupElement.cs        |  3 ++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
index 5b068eed8..f9a03468b 100644
--- a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
@@ -852,7 +852,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 var title = Utilities.Utils.GetPropertyNameUI(scriptType.Name);
                 var group = layout.Group(title, editor);
                 if (!hasAllRequirements)
-                    group.Panel.HeaderTextColor = FlaxEngine.GUI.Style.Current.Statusbar.Failed;
+                    group.Panel.HeaderTextColor = _style.Statusbar.Failed;
                 if ((Presenter.Features & FeatureFlags.CacheExpandedGroups) != 0)
                 {
                     if (Editor.Instance.ProjectCache.IsGroupToggled(title))
@@ -865,9 +865,10 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     group.Panel.Open();
 
                 // Customize
+                float totalHeaderButtonsOffset = 0f;
                 group.Panel.TooltipText = Editor.Instance.CodeDocs.GetTooltip(scriptType);
                 if (script.HasPrefabLink)
-                    group.Panel.HeaderTextColor = FlaxEngine.GUI.Style.Current.ProgressNormal;
+                    group.Panel.HeaderTextColor = _style.ProgressNormal;
 
                 // Add toggle button to the group
                 var headerHeight = group.Panel.HeaderHeight;
@@ -891,7 +892,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     TooltipText = "Script reference.",
                     AutoFocus = true,
                     IsScrollable = false,
-                    Color = FlaxEngine.GUI.Style.Current.ForegroundGrey,
+                    Color = _style.ForegroundGrey,
                     Parent = group.Panel,
                     Bounds = new Rectangle(scriptToggle.Right, 0.5f, headerHeight, headerHeight),
                     Margin = new Margin(1),
@@ -910,6 +911,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 var settingsButton = group.AddSettingsButton();
                 settingsButton.Tag = script;
                 settingsButton.Clicked += OnSettingsButtonClicked;
+                totalHeaderButtonsOffset += settingsButton.Width + FlaxEditor.Utilities.Constants.UIMargin;
 
                 // Add script obsolete icon to the group
                 if (scriptType.HasAttribute(typeof(ObsoleteAttribute), false))
@@ -919,9 +921,20 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     string tooltip = "Script marked as obsolete." +
                         (string.IsNullOrEmpty(attribute.Message) ? "" : $"\n{attribute.Message}") +
                         (string.IsNullOrEmpty(attribute.DiagnosticId) ? "" : $"\n{attribute.DiagnosticId}");
-                    var obsoleteButton = group.AddHeaderButton(tooltip, settingsButton.Width + FlaxEditor.Utilities.Constants.UIMargin, Editor.Instance.Icons.Info32);
+                    var obsoleteButton = group.AddHeaderButton(tooltip, totalHeaderButtonsOffset, Editor.Instance.Icons.Info32);
                     obsoleteButton.Color = Color.Orange;
                     obsoleteButton.MouseOverColor = Color.DarkOrange;
+                    totalHeaderButtonsOffset += obsoleteButton.Width;
+                }
+
+                // Show visual indicator if script only exists in prefab instance and is not part of the prefab
+                bool isPrefabActor = scripts.Any(s => s.Actor.HasPrefabLink);
+                if (isPrefabActor && script.PrefabID == Guid.Empty)
+                {
+                    var prefabInstanceButton = group.AddHeaderButton("Script only exists in this prefab instance.", totalHeaderButtonsOffset, Editor.Instance.Icons.Add32);
+                    prefabInstanceButton.Color = _style.ProgressNormal;
+                    prefabInstanceButton.MouseOverColor = _style.ProgressNormal * 0.9f;
+                    totalHeaderButtonsOffset += prefabInstanceButton.Width;
                 }
 
                 group.Panel.HeaderTextMargin = new Margin(scriptDrag.Right - 12, 35, 2, 2);
diff --git a/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs b/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
index 4c307a903..0c757c484 100644
--- a/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
+++ b/Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
@@ -52,6 +52,7 @@ namespace FlaxEditor.CustomEditors.Elements
         public Image AddHeaderButton(string tooltipText, float xOffset, SpriteHandle sprite)
         {
             var style = Style.Current;
+            const float padding = 2.0f;
             var settingsButtonSize = Panel.HeaderHeight;
             return new Image
             {
@@ -59,7 +60,7 @@ namespace FlaxEditor.CustomEditors.Elements
                 AutoFocus = true,
                 AnchorPreset = AnchorPresets.TopRight,
                 Parent = Panel,
-                Bounds = new Rectangle(Panel.Width - settingsButtonSize - xOffset, 0, settingsButtonSize, settingsButtonSize),
+                Bounds = new Rectangle(Panel.Width - settingsButtonSize - xOffset, padding * 0.5f, settingsButtonSize - padding, settingsButtonSize - padding),
                 IsScrollable = false,
                 Color = style.ForegroundGrey,
                 Margin = new Margin(1),

From cba3899c62ed831278ac124b5616d9ddb190edb9 Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Thu, 18 Dec 2025 23:44:44 +0200
Subject: [PATCH 063/203] Fix invalid code editor when selected editor is not
 detected

---
 Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs b/Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs
index e379e911b..fc70d0e81 100644
--- a/Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs
+++ b/Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs
@@ -334,6 +334,9 @@ namespace FlaxEditor.Modules.SourceCodeEditing
                     }
                 }
             }
+            if (editor == null)
+                editor = Editor.Instance.CodeEditing.Editors[0];
+
             Editor.Instance.CodeEditing.SelectedEditor = editor;
         }
 

From 39269583c396dbd490e983329d7057bfb9cc3113 Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Thu, 18 Dec 2025 23:45:44 +0200
Subject: [PATCH 064/203] Fix default code editor not using Visual Studio as
 fallback editor

---
 .../Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs b/Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs
index 074dade6a..e0c23831f 100644
--- a/Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs
+++ b/Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs
@@ -41,9 +41,9 @@ namespace FlaxEditor.Modules.SourceCodeEditing
             var vsCode = codeEditing.GetInBuildEditor(CodeEditorTypes.VSCode);
             var rider = codeEditing.GetInBuildEditor(CodeEditorTypes.Rider);
 
-#if PLATFORM_WINDOW
+#if PLATFORM_WINDOWS
             // Favor the newest Visual Studio
-            for (int i = (int)CodeEditorTypes.VS2019; i >= (int)CodeEditorTypes.VS2008; i--)
+            for (int i = (int)CodeEditorTypes.VS2026; i >= (int)CodeEditorTypes.VS2008; i--)
             {
                 var visualStudio = codeEditing.GetInBuildEditor((CodeEditorTypes)i);
                 if (visualStudio != null)

From 5921f60af219722f965170757da58fbf6376fbec Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Thu, 18 Dec 2025 23:48:03 +0200
Subject: [PATCH 065/203] Get code editor name through CodeEditingManager

---
 .../InBuildSourceCodeEditor.cs                | 47 +------------------
 Source/Editor/Scripting/CodeEditor.cpp        | 13 +++++
 Source/Editor/Scripting/CodeEditor.h          |  9 +++-
 3 files changed, 22 insertions(+), 47 deletions(-)

diff --git a/Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs b/Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs
index a2a333805..87d9e3eb7 100644
--- a/Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs
+++ b/Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs
@@ -22,52 +22,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
         public InBuildSourceCodeEditor(CodeEditorTypes type)
         {
             Type = type;
-            switch (type)
-            {
-            case CodeEditorTypes.Custom:
-                Name = "Custom";
-                break;
-            case CodeEditorTypes.SystemDefault:
-                Name = "System Default";
-                break;
-            case CodeEditorTypes.VS2008:
-                Name = "Visual Studio 2008";
-                break;
-            case CodeEditorTypes.VS2010:
-                Name = "Visual Studio 2010";
-                break;
-            case CodeEditorTypes.VS2012:
-                Name = "Visual Studio 2012";
-                break;
-            case CodeEditorTypes.VS2013:
-                Name = "Visual Studio 2013";
-                break;
-            case CodeEditorTypes.VS2015:
-                Name = "Visual Studio 2015";
-                break;
-            case CodeEditorTypes.VS2017:
-                Name = "Visual Studio 2017";
-                break;
-            case CodeEditorTypes.VS2019:
-                Name = "Visual Studio 2019";
-                break;
-            case CodeEditorTypes.VS2022:
-                Name = "Visual Studio 2022";
-                break;
-            case CodeEditorTypes.VS2026:
-                Name = "Visual Studio 2026";
-                break;
-            case CodeEditorTypes.VSCode:
-                Name = "Visual Studio Code";
-                break;
-            case CodeEditorTypes.VSCodeInsiders:
-                Name = "Visual Studio Code - Insiders";
-                break;
-            case CodeEditorTypes.Rider:
-                Name = "Rider";
-                break;
-            default: throw new ArgumentOutOfRangeException(nameof(type), type, null);
-            }
+            Name = CodeEditingManager.GetName(type);
         }
 
         /// <inheritdoc />
diff --git a/Source/Editor/Scripting/CodeEditor.cpp b/Source/Editor/Scripting/CodeEditor.cpp
index b372da189..038ec0329 100644
--- a/Source/Editor/Scripting/CodeEditor.cpp
+++ b/Source/Editor/Scripting/CodeEditor.cpp
@@ -139,6 +139,19 @@ CodeEditor* CodeEditingManager::GetCodeEditor(CodeEditorTypes editorType)
     return nullptr;
 }
 
+String CodeEditingManager::GetName(CodeEditorTypes editorType)
+{
+    const auto editor = GetCodeEditor(editorType);
+    if (editor)
+    {
+        return editor->GetName();
+    }
+    else
+    {
+        LOG(Warning, "Missing code editor type {0}", (int32)editorType);
+        return String::Empty;
+    }
+}
 void CodeEditingManager::OpenFile(CodeEditorTypes editorType, const String& path, int32 line)
 {
     const auto editor = GetCodeEditor(editorType);
diff --git a/Source/Editor/Scripting/CodeEditor.h b/Source/Editor/Scripting/CodeEditor.h
index 9cc71977b..670ec51e2 100644
--- a/Source/Editor/Scripting/CodeEditor.h
+++ b/Source/Editor/Scripting/CodeEditor.h
@@ -109,7 +109,7 @@ public:
     /// <summary>
     /// Gets the name of the editor.
     /// </summary>
-    /// <returns>The name</returns>
+    /// <returns>The name.</returns>
     virtual String GetName() const = 0;
 
     /// <summary>
@@ -169,6 +169,13 @@ public:
     /// <returns>The editor object or null if not found.</returns>
     static CodeEditor* GetCodeEditor(CodeEditorTypes editorType);
 
+    /// <summary>
+    /// Gets the name of the editor.
+    /// </summary>
+    /// <param name="editorType">The code editor type.</param>
+    /// <returns>The name.</returns>
+    API_FUNCTION() static String GetName(CodeEditorTypes editorType);
+
     /// <summary>
     /// Opens the file. Handles async opening.
     /// </summary>

From 71b222e0b0c29fc4c4f8956e5a4b6553e7f4afe3 Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Thu, 18 Dec 2025 23:52:06 +0200
Subject: [PATCH 066/203] Fix Editor project file generation to use custom code
 editor arguments

---
 .../SourceCodeEditing/DefaultSourceCodeEditor.cs |  2 +-
 .../SourceCodeEditing/InBuildSourceCodeEditor.cs | 14 +-------------
 Source/Editor/Scripting/CodeEditor.cpp           | 15 +++++++++++++++
 Source/Editor/Scripting/CodeEditor.h             | 16 ++++++++++++++++
 .../Scripting/CodeEditors/RiderCodeEditor.cpp    | 11 ++++++++---
 .../Scripting/CodeEditors/RiderCodeEditor.h      |  1 +
 .../VisualStudio/VisualStudioEditor.cpp          | 11 ++++++++---
 .../VisualStudio/VisualStudioEditor.h            |  1 +
 .../CodeEditors/VisualStudioCodeEditor.cpp       |  5 +++++
 .../CodeEditors/VisualStudioCodeEditor.h         |  1 +
 10 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs b/Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs
index e0c23831f..00057e9a7 100644
--- a/Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs
+++ b/Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs
@@ -74,7 +74,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
         public string Name => "Default";
 
         /// <inheritdoc />
-        public string GenerateProjectCustomArgs => null;
+        public string GenerateProjectCustomArgs => _currentEditor?.GenerateProjectCustomArgs;
 
         /// <inheritdoc />
         public void OpenSolution()
diff --git a/Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs b/Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs
index 87d9e3eb7..222a7a0bc 100644
--- a/Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs
+++ b/Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs
@@ -29,19 +29,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
         public string Name { get; set; }
 
         /// <inheritdoc />
-        public string GenerateProjectCustomArgs
-        {
-            get
-            {
-                switch (Type)
-                {
-                case CodeEditorTypes.VSCodeInsiders:
-                case CodeEditorTypes.VSCode: return "-vscode -vs2022";
-                case CodeEditorTypes.Rider: return "-vs2022";
-                default: return null;
-                }
-            }
-        }
+        public string GenerateProjectCustomArgs => CodeEditingManager.GetGenerateProjectCustomArgs(Type);
 
         /// <inheritdoc />
         public void OpenSolution()
diff --git a/Source/Editor/Scripting/CodeEditor.cpp b/Source/Editor/Scripting/CodeEditor.cpp
index 038ec0329..fcc8eef7c 100644
--- a/Source/Editor/Scripting/CodeEditor.cpp
+++ b/Source/Editor/Scripting/CodeEditor.cpp
@@ -152,6 +152,21 @@ String CodeEditingManager::GetName(CodeEditorTypes editorType)
         return String::Empty;
     }
 }
+
+String CodeEditingManager::GetGenerateProjectCustomArgs(CodeEditorTypes editorType)
+{
+    const auto editor = GetCodeEditor(editorType);
+    if (editor)
+    {
+        return editor->GetGenerateProjectCustomArgs();
+    }
+    else
+    {
+        LOG(Warning, "Missing code editor type {0}", (int32)editorType);
+        return String::Empty;
+    }
+}
+
 void CodeEditingManager::OpenFile(CodeEditorTypes editorType, const String& path, int32 line)
 {
     const auto editor = GetCodeEditor(editorType);
diff --git a/Source/Editor/Scripting/CodeEditor.h b/Source/Editor/Scripting/CodeEditor.h
index 670ec51e2..0baae21b0 100644
--- a/Source/Editor/Scripting/CodeEditor.h
+++ b/Source/Editor/Scripting/CodeEditor.h
@@ -112,6 +112,15 @@ public:
     /// <returns>The name.</returns>
     virtual String GetName() const = 0;
 
+    /// <summary>
+    /// Gets the custom arguments for the Flax.Build tool to add when generating project files for this code editor.
+    /// </summary>
+    /// <returns>The custom arguments to generate project files.</returns>
+    virtual String GetGenerateProjectCustomArgs() const
+    {
+        return String::Empty;
+    }
+
     /// <summary>
     /// Opens the file.
     /// </summary>
@@ -176,6 +185,13 @@ public:
     /// <returns>The name.</returns>
     API_FUNCTION() static String GetName(CodeEditorTypes editorType);
 
+    /// <summary>
+    /// Gets the custom arguments for the Flax.Build tool to add when generating project files for this code editor.
+    /// </summary>
+    /// <param name="editorType">The code editor type.</param>
+    /// <returns>The custom arguments to generate project files.</returns>
+    API_FUNCTION() static String GetGenerateProjectCustomArgs(CodeEditorTypes editorType);
+
     /// <summary>
     /// Opens the file. Handles async opening.
     /// </summary>
diff --git a/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp b/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp
index 8884ca322..b63815dce 100644
--- a/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp
+++ b/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp
@@ -257,12 +257,17 @@ String RiderCodeEditor::GetName() const
     return TEXT("Rider");
 }
 
+String RiderCodeEditor::GetGenerateProjectCustomArgs() const
+{
+    return TEXT("-vs2022");
+}
+
 void RiderCodeEditor::OpenFile(const String& path, int32 line)
 {
     // Generate project files if solution is missing
     if (!FileSystem::FileExists(_solutionPath))
     {
-        ScriptsBuilder::GenerateProject(TEXT("-vs2022"));
+        ScriptsBuilder::GenerateProject(GetGenerateProjectCustomArgs());
     }
 
     // Open file
@@ -290,7 +295,7 @@ void RiderCodeEditor::OpenSolution()
     // Generate project files if solution is missing
     if (!FileSystem::FileExists(_solutionPath))
     {
-        ScriptsBuilder::GenerateProject(TEXT("-vs2022"));
+        ScriptsBuilder::GenerateProject(GetGenerateProjectCustomArgs());
     }
 
     // Open solution
@@ -312,5 +317,5 @@ void RiderCodeEditor::OpenSolution()
 
 void RiderCodeEditor::OnFileAdded(const String& path)
 {
-    ScriptsBuilder::GenerateProject();
+    ScriptsBuilder::GenerateProject(GetGenerateProjectCustomArgs());
 }
diff --git a/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.h b/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.h
index d9bf00947..f3c43b5b2 100644
--- a/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.h
+++ b/Source/Editor/Scripting/CodeEditors/RiderCodeEditor.h
@@ -35,6 +35,7 @@ public:
     // [CodeEditor]
     CodeEditorTypes GetType() const override;
     String GetName() const override;
+    String GetGenerateProjectCustomArgs() const override;
     void OpenFile(const String& path, int32 line) override;
     void OpenSolution() override;
     void OnFileAdded(const String& path) override;
diff --git a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
index 5c06eec9c..48b475275 100644
--- a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
+++ b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
@@ -148,12 +148,17 @@ String VisualStudioEditor::GetName() const
     return String(ToString(_version));
 }
 
+String VisualStudioEditor::GetGenerateProjectCustomArgs() const
+{
+    return String::Format(TEXT("-{0}"), String(ToString(_version)).ToLower());
+}
+
 void VisualStudioEditor::OpenFile(const String& path, int32 line)
 {
     // Generate project files if solution is missing
     if (!FileSystem::FileExists(_solutionPath))
     {
-        ScriptsBuilder::GenerateProject();
+        ScriptsBuilder::GenerateProject(GetGenerateProjectCustomArgs());
     }
 
     // Open file
@@ -172,7 +177,7 @@ void VisualStudioEditor::OpenSolution()
     // Generate project files if solution is missing
     if (!FileSystem::FileExists(_solutionPath))
     {
-        ScriptsBuilder::GenerateProject();
+        ScriptsBuilder::GenerateProject(GetGenerateProjectCustomArgs());
     }
 
     // Open solution
@@ -187,7 +192,7 @@ void VisualStudioEditor::OpenSolution()
 void VisualStudioEditor::OnFileAdded(const String& path)
 {
     // TODO: finish dynamic files adding to the project - for now just regenerate it
-    ScriptsBuilder::GenerateProject();
+    ScriptsBuilder::GenerateProject(GetGenerateProjectCustomArgs());
     return;
     if (!FileSystem::FileExists(_solutionPath))
     {
diff --git a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.h b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.h
index 1bf1f1433..5c32a1171 100644
--- a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.h
+++ b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.h
@@ -56,6 +56,7 @@ public:
     // [CodeEditor]
     CodeEditorTypes GetType() const override;
     String GetName() const override;
+    String GetGenerateProjectCustomArgs() const override;
     void OpenFile(const String& path, int32 line) override;
     void OpenSolution() override;
     void OnFileAdded(const String& path) override;
diff --git a/Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp b/Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
index 5eba7f20c..bf2ef6bb6 100644
--- a/Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
+++ b/Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
@@ -128,6 +128,11 @@ String VisualStudioCodeEditor::GetName() const
     return _isInsiders ? TEXT("Visual Studio Code - Insiders") : TEXT("Visual Studio Code");
 }
 
+String VisualStudioCodeEditor::GetGenerateProjectCustomArgs() const
+{
+    return TEXT("-vs2022 -vscode");
+}
+
 void VisualStudioCodeEditor::OpenFile(const String& path, int32 line)
 {
     // Generate VS solution files for intellisense
diff --git a/Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.h b/Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.h
index 0212f207e..5091e1134 100644
--- a/Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.h
+++ b/Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.h
@@ -37,6 +37,7 @@ public:
     // [CodeEditor]
     CodeEditorTypes GetType() const override;
     String GetName() const override;
+    String GetGenerateProjectCustomArgs() const override;
     void OpenFile(const String& path, int32 line) override;
     void OpenSolution() override;
     bool UseAsyncForOpen() const override;

From 564c9ff0ca331f80bbe132ba02d3e08215961dc5 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Fri, 19 Dec 2025 19:00:55 +0100
Subject: [PATCH 067/203] improve orthographic/ perspective viewport cam toggle

---
 Source/Editor/Viewport/EditorViewport.cs      |  8 +-
 .../Viewport/Widgets/ViewportWidgetButton.cs  | 91 +++++++++++++++++++
 2 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/Source/Editor/Viewport/EditorViewport.cs b/Source/Editor/Viewport/EditorViewport.cs
index c16d3d9f5..08e65f9d0 100644
--- a/Source/Editor/Viewport/EditorViewport.cs
+++ b/Source/Editor/Viewport/EditorViewport.cs
@@ -247,8 +247,8 @@ namespace FlaxEditor.Viewport
             {
                 _movementSpeed = value;
 
-                if (_cameraButton != null)
-                    _cameraButton.Text = string.Format(MovementSpeedTextFormat, _movementSpeed);
+                if (_orthographicModeButton != null)
+                    _orthographicModeButton.Text = string.Format(MovementSpeedTextFormat, _movementSpeed);
             }
         }
 
@@ -581,7 +581,7 @@ namespace FlaxEditor.Viewport
 
                 // Camera Settings Menu
                 var cameraCM = new ContextMenu();
-                _cameraButton = new ViewportWidgetButton(string.Format(MovementSpeedTextFormat, _movementSpeed), _editor.Icons.Camera64, cameraCM, false, cameraSpeedTextWidth)
+                _cameraButton = new ViewportWidgetButton("", _editor.Icons.Camera64, cameraCM)
                 {
                     Tag = this,
                     TooltipText = "Camera Settings",
@@ -590,7 +590,7 @@ namespace FlaxEditor.Viewport
                 _cameraWidget.Parent = this;
 
                 // Orthographic/Perspective Mode Widget
-                _orthographicModeButton = new ViewportWidgetButton(string.Empty, _editor.Icons.CamSpeed32, null, true)
+                _orthographicModeButton = new OrthoCamToggleViewportWidgetButton(cameraSpeedTextWidth)
                 {
                     Checked = !_isOrtho,
                     TooltipText = "Toggle Orthographic/Perspective Mode",
diff --git a/Source/Editor/Viewport/Widgets/ViewportWidgetButton.cs b/Source/Editor/Viewport/Widgets/ViewportWidgetButton.cs
index 55c3e9c71..545d71d9b 100644
--- a/Source/Editor/Viewport/Widgets/ViewportWidgetButton.cs
+++ b/Source/Editor/Viewport/Widgets/ViewportWidgetButton.cs
@@ -7,6 +7,97 @@ using FlaxEngine.GUI;
 
 namespace FlaxEditor.Viewport.Widgets
 {
+    /// <summary>
+    /// Otrhographic view toggle viewport Widget Button class.
+    /// Will draw a custom camera frustum to represent an orthographic or perspective camera.
+    /// </summary>
+    /// <seealso cref="ViewportWidgetButton" />
+    [HideInEditor]
+    public class OrthoCamToggleViewportWidgetButton : ViewportWidgetButton
+    {
+        private const int iconPointCount = 4;
+        private const float iconRenderScale = 4.0f;
+
+        private readonly Float2 iconDrawOffset = new Float2(3.0f, 3.0f);
+
+        private readonly Float2[] iconPointsPerspective = new[]
+        {
+            new Float2(0.0f, 1.0f), // Top left
+            new Float2(4.0f, 0.0f), // Top right
+            new Float2(4.0f, 3.0f), // Bottom right
+            new Float2(0.0f, 2.0f), // Bottom left
+        };
+
+        private readonly Float2[] iconPointsOrtho = new[]
+        {
+            new Float2(0.0f, 0.0f), // Top left
+            new Float2(4.0f, 0.0f), // Top right
+            new Float2(4.0f, 3.0f), // Bottom right
+            new Float2(0.0f, 3.0f), // Bottom left
+        };
+
+        private bool wasChecked;
+        private float lerpWeight;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrthoCamToggleViewportWidgetButton"/> class.
+        /// </summary>
+        public OrthoCamToggleViewportWidgetButton(float speedTextWidth)
+        : base("00.0", SpriteHandle.Invalid, null, true, 20.0f + speedTextWidth)
+        {
+            wasChecked = Checked;
+        }
+
+        /// <inheritdoc />
+        public override void Update(float deltaTime)
+        {
+            if (wasChecked != Checked)
+            {
+                lerpWeight = 0.0f;
+                wasChecked = Checked;
+            }
+
+            if (lerpWeight <= 1.0f)
+                lerpWeight += deltaTime * 4.2f;
+
+            base.Update(deltaTime);
+        }
+
+        /// <inheritdoc />
+        public override void Draw()
+        {
+            // Cache data
+            var style = Style.Current;
+            var textRect = new Rectangle(0.0f, 0.0f, Width - 2.0f, Height);
+            var backgroundRect = textRect with { Width = Width - 1.0f };
+
+            // Check if is checked or mouse is over
+            if (Checked)
+                Render2D.FillRectangle(backgroundRect, style.BackgroundSelected * (IsMouseOver ? 0.9f : 0.6f));
+            else if (IsMouseOver)
+                Render2D.FillRectangle(backgroundRect, style.BackgroundHighlighted);
+
+            // Draw text
+            Render2D.DrawText(style.FontMedium, Text, textRect, style.ForegroundViewport * (IsMouseOver ? 1.0f : 0.9f), TextAlignment.Far, TextAlignment.Center);
+
+            // Draw camera frustum icon
+            Float2[] currentStart = Checked ? iconPointsOrtho : iconPointsPerspective;
+            Float2[] currentTarget = Checked ? iconPointsPerspective : iconPointsOrtho;
+
+            for (int i = 1; i < iconPointCount + 1; i++)
+            {
+                int endPointIndex = Mathf.Wrap(i, 0, iconPointCount - 1);
+                Float2 lineStart = Float2.Lerp(currentStart[i - 1], currentTarget[i - 1], lerpWeight);
+                Float2 lineEnd = Float2.Lerp(currentStart[endPointIndex], currentTarget[endPointIndex], lerpWeight);
+
+                lineStart = lineStart * iconRenderScale + iconDrawOffset;
+                lineEnd = lineEnd * iconRenderScale + iconDrawOffset;
+
+                Render2D.DrawLine(lineStart, lineEnd, Color.White);
+            }
+        }
+    }
+
     /// <summary>
     /// Viewport Widget Button class.
     /// </summary>

From 5d9d64e6e76701160bf3c860712d8145376307bd Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Tue, 27 Jan 2026 22:10:22 -0600
Subject: [PATCH 068/203] Fix missing scale for inverse squared setting for
 lights.

---
 Source/Shaders/LightingCommon.hlsl | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Source/Shaders/LightingCommon.hlsl b/Source/Shaders/LightingCommon.hlsl
index f09572310..5b15a0d4d 100644
--- a/Source/Shaders/LightingCommon.hlsl
+++ b/Source/Shaders/LightingCommon.hlsl
@@ -68,20 +68,25 @@ void GetRadialLightAttenuation(
     // Distance attenuation
     if (lightData.InverseSquared)
     {
+        // Convert cm-based scene units to meters for inverse-squared falloff.
+        const float distanceScale = 0.01f;
+        const float distanceScaleSqr = distanceScale * distanceScale;
+        float distanceSqrScaled = distanceSqr * distanceScaleSqr;
+        float distanceBiasSqrScaled = distanceBiasSqr * distanceScaleSqr;
         BRANCH
         if (lightData.SourceLength > 0)
         {
-            float3 l01 = lightData.Direction * lightData.SourceLength;
-            float3 l0 = toLight - 0.5 * l01;
-            float3 l1 = toLight + 0.5 * l01;
+            float3 l01 = lightData.Direction * (lightData.SourceLength * distanceScale);
+            float3 l0 = (toLight * distanceScale) - 0.5 * l01;
+            float3 l1 = (toLight * distanceScale) + 0.5 * l01;
             float lengthL0 = length(l0);
             float lengthL1 = length(l1);
-            attenuation = rcp((lengthL0 * lengthL1 + dot(l0, l1)) * 0.5 + distanceBiasSqr);
+            attenuation = rcp((lengthL0 * lengthL1 + dot(l0, l1)) * 0.5 + distanceBiasSqrScaled);
             NoL = saturate(0.5 * (dot(N, l0) / lengthL0 + dot(N, l1) / lengthL1));
         }
         else
         {
-            attenuation = rcp(distanceSqr + distanceBiasSqr);
+            attenuation = rcp(distanceSqrScaled + distanceBiasSqrScaled);
             NoL = saturate(dot(N, L));
         }
         attenuation *= Square(saturate(1 - Square(distanceSqr * Square(lightData.RadiusInv))));

From f1d5c0257feef5bc0d1023a5a4457dc54bf44d91 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Mon, 2 Feb 2026 12:50:24 +0100
Subject: [PATCH 069/203] improve radial menu control

- Add AllowChangeSelectionWhenOutside to allow changing the selection from the outside the menu
- Expose UpdateAngle() to get *some* kind of controller support
- Expose `SelectedSegment`
- Improve various doc comments
---
 Source/Engine/UI/GUI/Special/RadialMenu.cs | 77 +++++++++++++++-------
 1 file changed, 52 insertions(+), 25 deletions(-)

diff --git a/Source/Engine/UI/GUI/Special/RadialMenu.cs b/Source/Engine/UI/GUI/Special/RadialMenu.cs
index 060c4ef90..f8309fb1e 100644
--- a/Source/Engine/UI/GUI/Special/RadialMenu.cs
+++ b/Source/Engine/UI/GUI/Special/RadialMenu.cs
@@ -5,7 +5,7 @@ using System;
 namespace FlaxEngine.GUI
 {
     /// <summary>
-    /// Radial menu control that arranges child controls (of type Image) in a circle.
+    /// Radial menu control that arranges child controls (of type <see cref="FlaxEngine.GUI.Image"/>) in a circle.
     /// </summary>
     /// <seealso cref="FlaxEngine.GUI.ContainerControl" />
     public class RadialMenu : ContainerControl
@@ -27,7 +27,7 @@ namespace FlaxEngine.GUI
         private bool ShowMatProp => _material != null;
 
         /// <summary>
-        /// The material to use for menu background drawing.
+        /// The material used for menu background drawing.
         /// </summary>
         [EditorOrder(1)]
         public MaterialBase Material
@@ -44,7 +44,7 @@ namespace FlaxEngine.GUI
         }
 
         /// <summary>
-        /// Gets or sets the edge offset.
+        /// Gets or sets the offset of the outer edge from the bounds of the Control.
         /// </summary>
         [EditorOrder(2), Range(0, 1)]
         public float EdgeOffset
@@ -59,7 +59,7 @@ namespace FlaxEngine.GUI
         }
 
         /// <summary>
-        /// Gets or sets the thickness.
+        /// Gets or sets the thickness of the menu.
         /// </summary>
         [EditorOrder(3), Range(0, 1), VisibleIf(nameof(ShowMatProp))]
         public float Thickness
@@ -74,7 +74,7 @@ namespace FlaxEngine.GUI
         }
 
         /// <summary>
-        /// Gets or sets control background color (transparent color (alpha=0) means no background rendering).
+        /// Gets or sets control background color (transparent color means no background rendering).
         /// </summary>
         [VisibleIf(nameof(ShowMatProp))]
         public new Color BackgroundColor
@@ -88,7 +88,7 @@ namespace FlaxEngine.GUI
         }
 
         /// <summary>
-        /// Gets or sets the color of the highlight.
+        /// Gets or sets the color of the outer edge highlight.
         /// </summary>
         [VisibleIf(nameof(ShowMatProp))]
         public Color HighlightColor
@@ -130,19 +130,37 @@ namespace FlaxEngine.GUI
         }
 
         /// <summary>
-        /// The selected callback
+        /// The selected callback.
         /// </summary>
         [HideInEditor]
         public Action<int> Selected;
 
         /// <summary>
-        /// The allow change selection when inside
+        /// Invoked when the hovered segment is changed.
+        /// </summary>
+        [HideInEditor]
+        public Action<int> HoveredSelectionChanged;
+
+        /// <summary>
+        /// The selected segment.
+        /// </summary>
+        [HideInEditor]
+        public float SelectedSegment => _selectedSegment;
+
+        /// <summary>
+        /// Allows the selected to change when the mouse is moved in the empty center of the menu.
         /// </summary>
         [VisibleIf(nameof(ShowMatProp))]
         public bool AllowChangeSelectionWhenInside;
 
         /// <summary>
-        /// The center as button
+        /// Allows the selected to change when the mouse is moved outside of the menu.
+        /// </summary>
+        [VisibleIf(nameof(ShowMatProp))]
+        public bool AllowChangeSelectionWhenOutside;
+
+        /// <summary>
+        /// Wether the center is a button.
         /// </summary>
         [VisibleIf(nameof(ShowMatProp))]
         public bool CenterAsButton;
@@ -225,7 +243,7 @@ namespace FlaxEngine.GUI
                     var min = ((1 - _edgeOffset) - _thickness) * USize * 0.5f;
                     var max = (1 - _edgeOffset) * USize * 0.5f;
                     var val = ((USize * 0.5f) - location).Length;
-                    if (Mathf.IsInRange(val, min, max) || val < min && AllowChangeSelectionWhenInside)
+                    if (Mathf.IsInRange(val, min, max) || val < min && AllowChangeSelectionWhenInside || val > max && AllowChangeSelectionWhenOutside)
                     {
                         UpdateAngle(ref location);
                     }
@@ -276,7 +294,7 @@ namespace FlaxEngine.GUI
                 var min = ((1 - _edgeOffset) - _thickness) * USize * 0.5f;
                 var max = (1 - _edgeOffset) * USize * 0.5f;
                 var val = ((USize * 0.5f) - location).Length;
-                if (Mathf.IsInRange(val, min, max) || val < min && AllowChangeSelectionWhenInside)
+                if (Mathf.IsInRange(val, min, max) || val < min && AllowChangeSelectionWhenInside || val > max && AllowChangeSelectionWhenOutside)
                 {
                     UpdateAngle(ref location);
                 }
@@ -347,6 +365,29 @@ namespace FlaxEngine.GUI
             base.PerformLayout(force);
         }
 
+        /// <summary>
+        /// Updates the current angle and selected segment of the radial menu based on the specified location inside of the control.
+        /// </summary>
+        /// <param name="location">The position used to determine the angle and segment selection within the radial menu.</param>
+        public void UpdateAngle(ref Float2 location)
+        {
+            float previousSelectedSegment = _selectedSegment;
+            
+            var size = new Float2(USize);
+            var p = (size * 0.5f) - location;
+            var sa = (1.0f / _segmentCount) * Mathf.TwoPi;
+            _angle = Mathf.Atan2(p.X, p.Y);
+            _angle = Mathf.Ceil((_angle - (sa * 0.5f)) / sa) * sa;
+            _selectedSegment = _angle;
+            _selectedSegment = Mathf.RoundToInt((_selectedSegment < 0 ? Mathf.TwoPi + _selectedSegment : _selectedSegment) / sa);
+            if (float.IsNaN(_angle) || float.IsInfinity(_angle))
+                _angle = 0;
+            _materialInstance.SetParameterValue("RadialMenu_Rotation", -_angle + Mathf.Pi);
+
+            if (previousSelectedSegment != _selectedSegment)
+                HoveredSelectionChanged?.Invoke((int)_selectedSegment);
+        }
+
         private void UpdateSelectionColor()
         {
             Color color;
@@ -368,20 +409,6 @@ namespace FlaxEngine.GUI
             _materialInstance.SetParameterValue("RadialMenu_SelectionColor", color);
         }
 
-        private void UpdateAngle(ref Float2 location)
-        {
-            var size = new Float2(USize);
-            var p = (size * 0.5f) - location;
-            var sa = (1.0f / _segmentCount) * Mathf.TwoPi;
-            _angle = Mathf.Atan2(p.X, p.Y);
-            _angle = Mathf.Ceil((_angle - (sa * 0.5f)) / sa) * sa;
-            _selectedSegment = _angle;
-            _selectedSegment = Mathf.RoundToInt((_selectedSegment < 0 ? Mathf.TwoPi + _selectedSegment : _selectedSegment) / sa);
-            if (float.IsNaN(_angle) || float.IsInfinity(_angle))
-                _angle = 0;
-            _materialInstance.SetParameterValue("RadialMenu_Rotation", -_angle + Mathf.Pi);
-        }
-
         private static Float2 Rotate2D(Float2 point, float angle)
         {
             return new Float2(Mathf.Cos(angle) * point.X + Mathf.Sin(angle) * point.Y,

From b0a0c5b66c3f783a5bf6de391ef26725b0a4806d Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Mon, 2 Feb 2026 12:52:54 +0100
Subject: [PATCH 070/203] change selectedSegment to int

---
 Source/Engine/UI/GUI/Special/RadialMenu.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Source/Engine/UI/GUI/Special/RadialMenu.cs b/Source/Engine/UI/GUI/Special/RadialMenu.cs
index f8309fb1e..3e752aa46 100644
--- a/Source/Engine/UI/GUI/Special/RadialMenu.cs
+++ b/Source/Engine/UI/GUI/Special/RadialMenu.cs
@@ -12,7 +12,7 @@ namespace FlaxEngine.GUI
     {
         private bool _materialIsDirty = true;
         private float _angle;
-        private float _selectedSegment;
+        private int _selectedSegment;
         private int _highlightSegment = -1;
         private MaterialBase _material;
         private MaterialInstance _materialInstance;
@@ -145,7 +145,7 @@ namespace FlaxEngine.GUI
         /// The selected segment.
         /// </summary>
         [HideInEditor]
-        public float SelectedSegment => _selectedSegment;
+        public int SelectedSegment => _selectedSegment;
 
         /// <summary>
         /// Allows the selected to change when the mouse is moved in the empty center of the menu.
@@ -378,8 +378,7 @@ namespace FlaxEngine.GUI
             var sa = (1.0f / _segmentCount) * Mathf.TwoPi;
             _angle = Mathf.Atan2(p.X, p.Y);
             _angle = Mathf.Ceil((_angle - (sa * 0.5f)) / sa) * sa;
-            _selectedSegment = _angle;
-            _selectedSegment = Mathf.RoundToInt((_selectedSegment < 0 ? Mathf.TwoPi + _selectedSegment : _selectedSegment) / sa);
+            _selectedSegment = Mathf.RoundToInt((_angle < 0 ? Mathf.TwoPi + _angle : _angle) / sa);
             if (float.IsNaN(_angle) || float.IsInfinity(_angle))
                 _angle = 0;
             _materialInstance.SetParameterValue("RadialMenu_Rotation", -_angle + Mathf.Pi);

From b27e55636302ad5eaf1c4cad1027b7ced01c0fa5 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Mon, 2 Feb 2026 21:35:40 +0100
Subject: [PATCH 071/203] expose material instance

---
 Source/Engine/UI/GUI/Special/RadialMenu.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Source/Engine/UI/GUI/Special/RadialMenu.cs b/Source/Engine/UI/GUI/Special/RadialMenu.cs
index 3e752aa46..994d81ab2 100644
--- a/Source/Engine/UI/GUI/Special/RadialMenu.cs
+++ b/Source/Engine/UI/GUI/Special/RadialMenu.cs
@@ -129,6 +129,12 @@ namespace FlaxEngine.GUI
             }
         }
 
+        /// <summary>
+        /// The material instance of <paramref name="Material"/> used to draw the menu.
+        /// </summary>
+        [HideInEditor]
+        public MaterialInstance MaterialInstance => _materialInstance;
+
         /// <summary>
         /// The selected callback.
         /// </summary>

From ab88a6339a111be64226b6f036f8b1317911a393 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Tue, 3 Feb 2026 21:36:32 +0100
Subject: [PATCH 072/203] add ripping apart connection with reconnect and auto
 connect when node is dropped over existing connection

---
 Source/Editor/Surface/VisjectSurface.Input.cs | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/Source/Editor/Surface/VisjectSurface.Input.cs b/Source/Editor/Surface/VisjectSurface.Input.cs
index 056987e52..e3c443a74 100644
--- a/Source/Editor/Surface/VisjectSurface.Input.cs
+++ b/Source/Editor/Surface/VisjectSurface.Input.cs
@@ -321,6 +321,33 @@ namespace FlaxEditor.Surface
 
                         foreach (var node in _movingNodes)
                         {
+                            // Allow ripping the node from its current connection
+                            if (RootWindow.GetKey(KeyboardKeys.Alt))
+                            {
+                                InputBox nodeConnectedInput = null;
+                                OutputBox nodeConnectedOuput = null;
+
+                                var boxes = node.GetBoxes();
+                                foreach (var box in boxes)
+                                {
+                                    if (!box.IsOutput && box.Connections.Count > 0)
+                                    {
+                                        nodeConnectedInput = (InputBox)box;
+                                        continue;
+                                    }
+                                    if (box.IsOutput && box.Connections.Count > 0)
+                                    {
+                                        nodeConnectedOuput = (OutputBox)box;
+                                        continue;
+                                    }
+                                }
+
+                                if (nodeConnectedInput != null && nodeConnectedOuput != null)
+                                    TryConnect(nodeConnectedOuput.Connections[0], nodeConnectedInput.Connections[0]);
+                                
+                                node.RemoveConnections();
+                            }
+
                             if (gridSnap)
                             {
                                 Float2 unroundedLocation = node.Location;
@@ -602,6 +629,24 @@ namespace FlaxEditor.Surface
                 {
                     if (_movingNodes != null && _movingNodes.Count > 0)
                     {
+                        // Allow dropping the node onto an existing connection and connect it
+                        if (_movingNodes.Count == 1)
+                        {
+                            var mousePos = _rootControl.PointFromParent(ref _mousePos);
+                            InputBox intersectedConnectionInputBox;
+                            OutputBox intersectedConnectionOutputBox;
+                            if (IntersectsConnection(mousePos, out intersectedConnectionInputBox, out intersectedConnectionOutputBox))
+                            {
+                                SurfaceNode node = _movingNodes.First();
+                                InputBox nodeInputBox = (InputBox)node.GetBoxes().First(b => !b.IsOutput);
+                                OutputBox nodeOutputBox = (OutputBox)node.GetBoxes().First(b => b.IsOutput);
+                                TryConnect(intersectedConnectionOutputBox, nodeInputBox);
+                                TryConnect(nodeOutputBox, intersectedConnectionInputBox);
+
+                                Debug.Log($"INPUT OUTPUT: {intersectedConnectionNodesXDistance}, NODE: {node.Width}");
+                            }
+                        }
+
                         if (Undo != null && !_movingNodesDelta.IsZero && CanEdit)
                             Undo.AddAction(new MoveNodesAction(Context, _movingNodes.Select(x => x.ID).ToArray(), _movingNodesDelta));
                         _movingNodes.Clear();

From 8d8bf87c6957090d0aae451848ee504669681d54 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 4 Feb 2026 13:52:37 +0100
Subject: [PATCH 073/203] move nodes if needed and add undo support

---
 Source/Editor/Surface/VisjectSurface.Input.cs | 51 +++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/Surface/VisjectSurface.Input.cs b/Source/Editor/Surface/VisjectSurface.Input.cs
index e3c443a74..c2c5fac68 100644
--- a/Source/Editor/Surface/VisjectSurface.Input.cs
+++ b/Source/Editor/Surface/VisjectSurface.Input.cs
@@ -629,7 +629,7 @@ namespace FlaxEditor.Surface
                 {
                     if (_movingNodes != null && _movingNodes.Count > 0)
                     {
-                        // Allow dropping the node onto an existing connection and connect it
+                        // Allow dropping a single node onto an existing connection and connect it
                         if (_movingNodes.Count == 1)
                         {
                             var mousePos = _rootControl.PointFromParent(ref _mousePos);
@@ -643,12 +643,57 @@ namespace FlaxEditor.Surface
                                 TryConnect(intersectedConnectionOutputBox, nodeInputBox);
                                 TryConnect(nodeOutputBox, intersectedConnectionInputBox);
 
-                                Debug.Log($"INPUT OUTPUT: {intersectedConnectionNodesXDistance}, NODE: {node.Width}");
+                                float intersectedConnectionNodesXDistance = intersectedConnectionInputBox.ParentNode.Left - intersectedConnectionOutputBox.ParentNode.Right;
+                                float paddedNodeWidth = node.Width + 2f;
+                                if (intersectedConnectionNodesXDistance < paddedNodeWidth)
+                                {
+                                    List<SurfaceNode> visitedNodes = new List<SurfaceNode>{ node };
+                                    List<SurfaceNode> movedNodes = new List<SurfaceNode>();
+                                    Float2 locationDelta = new Float2(paddedNodeWidth, 0f);
+
+                                    MoveConnectedNodes(intersectedConnectionInputBox.ParentNode);
+
+                                    void MoveConnectedNodes(SurfaceNode node)
+                                    {
+                                        // Only move node if it is to the right of the node we have connected the moved node to
+                                        if (node.Right > intersectedConnectionInputBox.ParentNode.Left + 15f)
+                                        {
+                                            node.Location += locationDelta;
+                                            movedNodes.Add(node);
+                                        }
+
+                                        visitedNodes.Add(node);
+
+                                        foreach (var box in node.GetBoxes())
+                                        {
+                                            if (!box.HasAnyConnection || box == intersectedConnectionInputBox)
+                                                continue;
+
+                                            foreach (var connectedBox in box.Connections)
+                                            {
+                                                SurfaceNode nextNode = connectedBox.ParentNode;
+                                                if (visitedNodes.Contains(nextNode))
+                                                    continue;
+
+                                                MoveConnectedNodes(nextNode);
+                                            }
+                                        }
+                                    }
+
+                                    Float2 nodeMoveOffset = new Float2(node.Width * 0.5f, 0f);
+                                    node.Location += nodeMoveOffset;
+
+                                    var moveNodesAction = new MoveNodesAction(Context, movedNodes.Select(n => n.ID).ToArray(), locationDelta);
+                                    var moveNodeAction = new MoveNodesAction(Context, [node.ID], nodeMoveOffset);
+                                    var multiAction = new MultiUndoAction(moveNodeAction, moveNodesAction);
+
+                                    AddBatchedUndoAction(multiAction);
+                                }
                             }
                         }
 
                         if (Undo != null && !_movingNodesDelta.IsZero && CanEdit)
-                            Undo.AddAction(new MoveNodesAction(Context, _movingNodes.Select(x => x.ID).ToArray(), _movingNodesDelta));
+                            AddBatchedUndoAction(new MoveNodesAction(Context, _movingNodes.Select(x => x.ID).ToArray(), _movingNodesDelta));
                         _movingNodes.Clear();
                     }
                     _movingNodesDelta = Float2.Zero;

From 29b043342af0a73fd1241797edb627ba679a5c56 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 4 Feb 2026 14:11:23 +0100
Subject: [PATCH 074/203] don't fall into the trap of moving nodes with NoMove
 flag again

---
 Source/Editor/Surface/VisjectSurface.Input.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Editor/Surface/VisjectSurface.Input.cs b/Source/Editor/Surface/VisjectSurface.Input.cs
index c2c5fac68..388df0b9c 100644
--- a/Source/Editor/Surface/VisjectSurface.Input.cs
+++ b/Source/Editor/Surface/VisjectSurface.Input.cs
@@ -656,7 +656,7 @@ namespace FlaxEditor.Surface
                                     void MoveConnectedNodes(SurfaceNode node)
                                     {
                                         // Only move node if it is to the right of the node we have connected the moved node to
-                                        if (node.Right > intersectedConnectionInputBox.ParentNode.Left + 15f)
+                                        if (node.Right > intersectedConnectionInputBox.ParentNode.Left + 15f && !node.Archetype.Flags.HasFlag(NodeFlags.NoMove))
                                         {
                                             node.Location += locationDelta;
                                             movedNodes.Add(node);

From a57fe6c04df80cdfe663849f514ad7640ab7006b Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 4 Feb 2026 21:31:03 +0100
Subject: [PATCH 075/203] add lazy connect feature to visject

---
 Source/Editor/Surface/VisjectSurface.Draw.cs  | 41 ++++++++++++
 Source/Editor/Surface/VisjectSurface.Input.cs | 65 ++++++++++++++++++-
 2 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/Source/Editor/Surface/VisjectSurface.Draw.cs b/Source/Editor/Surface/VisjectSurface.Draw.cs
index af5893907..d79b21e9c 100644
--- a/Source/Editor/Surface/VisjectSurface.Draw.cs
+++ b/Source/Editor/Surface/VisjectSurface.Draw.cs
@@ -213,6 +213,44 @@ namespace FlaxEditor.Surface
             }
         }
 
+        /// <summary>
+        /// Draw connection hints for lazy connect feature.
+        /// </summary>
+        protected virtual void DrawLazyConnect()
+        {
+            var style = FlaxEngine.GUI.Style.Current;
+
+            if (_lazyConnectStartNode != null)
+            {
+                Float2 upperLeft = _rootControl.PointToParent(_lazyConnectStartNode.UpperLeft);
+                Rectangle startNodeOutline = new Rectangle(upperLeft + 1f, _lazyConnectStartNode.Size - 1f);
+                startNodeOutline.Size *= ViewScale;
+                Render2D.DrawRectangle(startNodeOutline.MakeExpanded(4f), style.BackgroundSelected, 4f);
+            }
+
+            if (_lazyConnectEndNode != null)
+            {
+                Float2 upperLeft = _rootControl.PointToParent(_lazyConnectEndNode.UpperLeft);
+                Rectangle startNodeOutline = new Rectangle(upperLeft + 1f, _lazyConnectEndNode.Size - 1f);
+                startNodeOutline.Size *= ViewScale;
+                Render2D.DrawRectangle(startNodeOutline.MakeExpanded(4f), style.BackgroundSelected, 4f);
+            }
+
+            Rectangle startRect = new Rectangle(_rightMouseDownPos - 6f, new Float2(12f));
+            Rectangle endRect = new Rectangle(_mousePos - 6f, new Float2(12f));
+            
+            // Start and end shadows/ outlines
+            Render2D.FillRectangle(startRect.MakeExpanded(2.5f), Color.Black);
+            Render2D.FillRectangle(endRect.MakeExpanded(2.5f), Color.Black);
+
+            Render2D.DrawLine(_rightMouseDownPos, _mousePos, Color.Black, 7.5f);
+            Render2D.DrawLine(_rightMouseDownPos, _mousePos, style.ForegroundGrey, 5f);
+
+            // Draw start and end boxes over the lines to hide ugly artifacts at the ends
+            Render2D.FillRectangle(startRect, style.ForegroundGrey);
+            Render2D.FillRectangle(endRect, style.ForegroundGrey);
+        }
+
         /// <summary>
         /// Draws the contents of the surface (nodes, connections, comments, etc.).
         /// </summary>
@@ -260,6 +298,9 @@ namespace FlaxEditor.Surface
 
             DrawContents();
 
+            if (_isLazyConnecting)
+                DrawLazyConnect();
+
             //Render2D.DrawText(style.FontTitle, string.Format("Scale: {0}", _rootControl.Scale), rect, Enabled ? Color.Red : Color.Black);
 
             // Draw border
diff --git a/Source/Editor/Surface/VisjectSurface.Input.cs b/Source/Editor/Surface/VisjectSurface.Input.cs
index 388df0b9c..f7d90512e 100644
--- a/Source/Editor/Surface/VisjectSurface.Input.cs
+++ b/Source/Editor/Surface/VisjectSurface.Input.cs
@@ -29,6 +29,9 @@ namespace FlaxEditor.Surface
         private HashSet<SurfaceNode> _movingNodes;
         private HashSet<SurfaceNode> _temporarySelectedNodes;
         private readonly Stack<InputBracket> _inputBrackets = new Stack<InputBracket>();
+        private bool _isLazyConnecting;
+        private SurfaceNode _lazyConnectStartNode;
+        private SurfaceNode _lazyConnectEndNode;
 
         private class InputBracket
         {
@@ -250,8 +253,13 @@ namespace FlaxEditor.Surface
             // Cache mouse location
             _mousePos = location;
 
+            if (_isLazyConnecting && GetControlUnderMouse() is SurfaceNode nodeUnderMouse)
+                _lazyConnectEndNode = nodeUnderMouse;
+            else if (_isLazyConnecting && Nodes.Count > 0)
+                _lazyConnectEndNode = GetClosestNodeAtLocation(location);
+
             // Moving around surface with mouse
-            if (_rightMouseDown)
+            if (_rightMouseDown && !_isLazyConnecting)
             {
                 // Calculate delta
                 var delta = location - _rightMouseDownPos;
@@ -542,11 +550,17 @@ namespace FlaxEditor.Surface
                 _middleMouseDownPos = location;
             }
 
+            if (root.GetKey(KeyboardKeys.Alt) && button == MouseButton.Right)
+                _isLazyConnecting = true;
+
             // Check if any node is under the mouse
             SurfaceControl controlUnderMouse = GetControlUnderMouse();
             var cLocation = _rootControl.PointFromParent(ref location);
             if (controlUnderMouse != null)
             {
+                if (controlUnderMouse is SurfaceNode node && _isLazyConnecting)
+                    _lazyConnectStartNode = node;
+
                 // Check if mouse is over header and user is pressing mouse left button
                 if (_leftMouseDown && controlUnderMouse.CanSelect(ref cLocation))
                 {
@@ -581,6 +595,9 @@ namespace FlaxEditor.Surface
             }
             else
             {
+                if (_isLazyConnecting && Nodes.Count > 0)
+                    _lazyConnectStartNode = GetClosestNodeAtLocation(location);
+
                 // Cache flags and state
                 if (_leftMouseDown)
                 {
@@ -720,12 +737,36 @@ namespace FlaxEditor.Surface
                 {
                     // Check if any control is under the mouse
                     _cmStartPos = location;
-                    if (controlUnderMouse == null)
+                    if (controlUnderMouse == null && !_isLazyConnecting)
                     {
                         showPrimaryMenu = true;
                     }
                 }
                 _mouseMoveAmount = 0;
+
+                if (_isLazyConnecting)
+                {
+                    if (_lazyConnectStartNode != null && _lazyConnectEndNode != null && _lazyConnectStartNode != _lazyConnectEndNode)
+                    {
+                        // First check if there is a type matching input and output where input
+                        OutputBox startNodeOutput = (OutputBox)_lazyConnectStartNode.GetBoxes().FirstOrDefault(b => b.IsOutput, null);
+                        InputBox endNodeInput = null;
+
+                        if (startNodeOutput != null)
+                            endNodeInput = (InputBox)_lazyConnectEndNode.GetBoxes().FirstOrDefault(b => !b.IsOutput && b.CurrentType == startNodeOutput.CurrentType && !b.HasAnyConnection && b.IsActive && b.CanConnectWith(startNodeOutput), null);
+
+                        // Perform less strict checks (less ideal conditions for connection but still good) if the first checks failed
+                        if (endNodeInput == null)
+                            endNodeInput = (InputBox)_lazyConnectEndNode.GetBoxes().FirstOrDefault(b => !b.IsOutput && !b.HasAnyConnection && b.CanConnectWith(startNodeOutput), null);
+
+                        if (startNodeOutput != null && endNodeInput != null)
+                            TryConnect(startNodeOutput, endNodeInput);
+                    }
+
+                    _isLazyConnecting = false;
+                    _lazyConnectStartNode = null;
+                    _lazyConnectEndNode = null;
+                }
             }
             if (_middleMouseDown && button == MouseButton.Middle)
             {
@@ -927,6 +968,26 @@ namespace FlaxEditor.Surface
             return false;
         }
 
+        private SurfaceNode GetClosestNodeAtLocation(Float2 location)
+        {
+            SurfaceNode currentClosestNode = null;
+            float currentClosestDistanceSquared = float.MaxValue;
+
+            foreach (var node in Nodes)
+            {
+                Float2 nodeSurfaceLocation = _rootControl.PointToParent(node.Center);
+
+                float distanceSquared = Float2.DistanceSquared(location, nodeSurfaceLocation);
+                if (distanceSquared < currentClosestDistanceSquared)
+                {
+                    currentClosestNode = node;
+                    currentClosestDistanceSquared = distanceSquared;
+                }
+            }
+
+            return currentClosestNode;
+        }
+
         private void ResetInput()
         {
             InputText = "";

From 3adda3629e5cdf42b6d8dd5d6a8a5731c28eafb6 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 4 Feb 2026 23:29:41 +0100
Subject: [PATCH 076/203] don't try to auto connect to comments and particle
 emitter nodes

---
 Source/Editor/Surface/VisjectSurface.Input.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Source/Editor/Surface/VisjectSurface.Input.cs b/Source/Editor/Surface/VisjectSurface.Input.cs
index f7d90512e..74eaa3e04 100644
--- a/Source/Editor/Surface/VisjectSurface.Input.cs
+++ b/Source/Editor/Surface/VisjectSurface.Input.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using static FlaxEditor.Surface.Archetypes.Particles;
 using FlaxEditor.Options;
 using FlaxEditor.Surface.Elements;
 using FlaxEditor.Surface.Undo;
@@ -253,7 +254,7 @@ namespace FlaxEditor.Surface
             // Cache mouse location
             _mousePos = location;
 
-            if (_isLazyConnecting && GetControlUnderMouse() is SurfaceNode nodeUnderMouse)
+            if (_isLazyConnecting && GetControlUnderMouse() is SurfaceNode nodeUnderMouse && !(nodeUnderMouse is SurfaceComment || nodeUnderMouse is ParticleEmitterNode))
                 _lazyConnectEndNode = nodeUnderMouse;
             else if (_isLazyConnecting && Nodes.Count > 0)
                 _lazyConnectEndNode = GetClosestNodeAtLocation(location);
@@ -558,7 +559,7 @@ namespace FlaxEditor.Surface
             var cLocation = _rootControl.PointFromParent(ref location);
             if (controlUnderMouse != null)
             {
-                if (controlUnderMouse is SurfaceNode node && _isLazyConnecting)
+                if (controlUnderMouse is SurfaceNode node && _isLazyConnecting && !(controlUnderMouse is SurfaceComment || controlUnderMouse is ParticleEmitterNode))
                     _lazyConnectStartNode = node;
 
                 // Check if mouse is over header and user is pressing mouse left button
@@ -975,6 +976,9 @@ namespace FlaxEditor.Surface
 
             foreach (var node in Nodes)
             {
+                if (node is SurfaceComment || node is ParticleEmitterNode)
+                    continue;
+
                 Float2 nodeSurfaceLocation = _rootControl.PointToParent(node.Center);
 
                 float distanceSquared = Float2.DistanceSquared(location, nodeSurfaceLocation);

From 37e776e407dbbe4e05052803bbc5c493a78127ff Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Fri, 6 Feb 2026 21:56:25 -0600
Subject: [PATCH 077/203] Add HideInEditor attribute to DirectionGizmo

---
 Source/Editor/Gizmo/DirectionGizmo.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index c9089e5fc..176832c5e 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -6,6 +6,7 @@ using FlaxEngine.GUI;
 
 namespace FlaxEditor.Gizmo;
 
+[HideInEditor]
 public class DirectionGizmo : ContainerControl
 {
     private IGizmoOwner _owner;

From b19611e3d2626cda2de1e05836d8062b8a28cd1e Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sat, 7 Feb 2026 19:58:26 +0100
Subject: [PATCH 078/203] steal right fix from Tryibions PR

---
 Source/Editor/Surface/ContextMenu/VisjectCM.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Editor/Surface/ContextMenu/VisjectCM.cs b/Source/Editor/Surface/ContextMenu/VisjectCM.cs
index f13cb7117..e1a61fd5f 100644
--- a/Source/Editor/Surface/ContextMenu/VisjectCM.cs
+++ b/Source/Editor/Surface/ContextMenu/VisjectCM.cs
@@ -585,7 +585,7 @@ namespace FlaxEditor.Surface.ContextMenu
 
         private void UpdateFilters()
         {
-            if (string.IsNullOrEmpty(_searchBox.Text) && _selectedBoxes.Count > 0 && _selectedBoxes[0] == null)
+            if (string.IsNullOrEmpty(_searchBox.Text) && _selectedBoxes.Count == 0)
             {
                 ResetView();
                 Profiler.EndEvent();

From 2a21141dd48aa219d3f32949ccb857dd71b6c785 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Mon, 9 Feb 2026 15:56:37 +0100
Subject: [PATCH 079/203] focus whole graph if no selection

---
 Source/Editor/Surface/VisjectSurface.cs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/Surface/VisjectSurface.cs b/Source/Editor/Surface/VisjectSurface.cs
index bb082aefe..a11f6710a 100644
--- a/Source/Editor/Surface/VisjectSurface.cs
+++ b/Source/Editor/Surface/VisjectSurface.cs
@@ -423,9 +423,9 @@ namespace FlaxEditor.Surface
                 new InputActionsContainer.Binding(options => options.NodesAlignLeft, () => { AlignNodes(SelectedNodes, NodeAlignmentType.Left); }),
                 new InputActionsContainer.Binding(options => options.NodesAlignCenter, () => { AlignNodes(SelectedNodes, NodeAlignmentType.Center); }),
                 new InputActionsContainer.Binding(options => options.NodesAlignRight, () => { AlignNodes(SelectedNodes, NodeAlignmentType.Right); }),
-                new InputActionsContainer.Binding(options => options.NodesDistributeHorizontal, () => {  DistributeNodes(SelectedNodes, false); }),
-                new InputActionsContainer.Binding(options => options.NodesDistributeVertical, () => {  DistributeNodes(SelectedNodes, true); }),
-                new InputActionsContainer.Binding(options => options.FocusSelectedNodes, () => {  ShowSelection(); }),
+                new InputActionsContainer.Binding(options => options.NodesDistributeHorizontal, () => { DistributeNodes(SelectedNodes, false); }),
+                new InputActionsContainer.Binding(options => options.NodesDistributeVertical, () => { DistributeNodes(SelectedNodes, true); }),
+                new InputActionsContainer.Binding(options => options.FocusSelectedNodes, () => { FocusSelectionOrWholeGraph(); }),
             });
 
             Context.ControlSpawned += OnSurfaceControlSpawned;
@@ -652,6 +652,17 @@ namespace FlaxEditor.Surface
             ViewCenterPosition = areaRect.Center;
         }
 
+        /// <summary>
+        /// Adjusts the view to focus on the currently selected nodes, or the entire graph if no nodes are selected.
+        /// </summary>
+        public void FocusSelectionOrWholeGraph()
+        {
+            if (SelectedNodes.Count > 0)
+                ShowSelection();
+            else
+                ShowWholeGraph();
+        }
+
         /// <summary>
         /// Shows the selected controls by changing the view scale and the position.
         /// </summary>

From 75a1b14bebe2717b67e1de6a9fbe5ec577f506e6 Mon Sep 17 00:00:00 2001
From: fibref <fibref_233@outlook.com>
Date: Sat, 14 Feb 2026 19:42:31 +0800
Subject: [PATCH 080/203] initial support for MSDF font

---
 Source/Editor/Windows/Assets/FontWindow.cs    |   8 +-
 .../Content/Upgraders/FontAssetUpgrader.h     |  26 +++-
 Source/Engine/ContentImporters/ImportFont.cpp |   3 +-
 Source/Engine/Render2D/FontAsset.cs           |  13 +-
 Source/Engine/Render2D/FontAsset.h            |  23 ++-
 Source/Engine/Render2D/FontManager.cpp        | 136 +++++++++++-------
 Source/Engine/Render2D/FontTextureAtlas.h     |  12 +-
 Source/Engine/Render2D/MSDFGenerator.h        | 129 +++++++++++++++++
 8 files changed, 285 insertions(+), 65 deletions(-)
 create mode 100644 Source/Engine/Render2D/MSDFGenerator.h

diff --git a/Source/Editor/Windows/Assets/FontWindow.cs b/Source/Editor/Windows/Assets/FontWindow.cs
index 3f4a7a681..1a69f7724 100644
--- a/Source/Editor/Windows/Assets/FontWindow.cs
+++ b/Source/Editor/Windows/Assets/FontWindow.cs
@@ -21,6 +21,10 @@ namespace FlaxEditor.Windows.Assets
         /// </summary>
         private sealed class PropertiesProxy
         {
+            [DefaultValue(FontRasterMode.Bitmap)]
+            [EditorOrder(5), EditorDisplay("Properties"), Tooltip("The rasterization mode used when generating font atlases.")]
+            public FontRasterMode RasterMode;
+
             [DefaultValue(FontHinting.Default)]
             [EditorOrder(10), EditorDisplay("Properties"), Tooltip("The font hinting used when rendering characters.")]
             public FontHinting Hinting;
@@ -41,7 +45,8 @@ namespace FlaxEditor.Windows.Assets
             {
                 options = new FontOptions
                 {
-                    Hinting = Hinting
+                    Hinting = Hinting,
+                    RasterMode = RasterMode
                 };
                 if (AntiAliasing)
                     options.Flags |= FontFlags.AntiAliasing;
@@ -57,6 +62,7 @@ namespace FlaxEditor.Windows.Assets
                 AntiAliasing = (options.Flags & FontFlags.AntiAliasing) == FontFlags.AntiAliasing;
                 Bold = (options.Flags & FontFlags.Bold) == FontFlags.Bold;
                 Italic = (options.Flags & FontFlags.Italic) == FontFlags.Italic;
+                RasterMode = options.RasterMode;
             }
         }
 
diff --git a/Source/Engine/Content/Upgraders/FontAssetUpgrader.h b/Source/Engine/Content/Upgraders/FontAssetUpgrader.h
index 80c2e6c39..4ca6e6d73 100644
--- a/Source/Engine/Content/Upgraders/FontAssetUpgrader.h
+++ b/Source/Engine/Content/Upgraders/FontAssetUpgrader.h
@@ -5,6 +5,7 @@
 #if USE_EDITOR
 
 #include "BinaryAssetUpgrader.h"
+#include "Engine/Render2D/FontAsset.h"
 
 /// <summary>
 /// Font Asset Upgrader
@@ -17,10 +18,33 @@ public:
     {
         const Upgrader upgraders[] =
         {
-            {},
+            { 3, 4, &Upgrade_3_To_4 },
         };
         setup(upgraders, ARRAY_COUNT(upgraders));
     }
+
+private:
+    struct FontOptionsOld
+    {
+        FontHinting Hinting;
+        FontFlags Flags;
+    };
+
+    static bool Upgrade_3_To_4(AssetMigrationContext& context)
+    {
+        ASSERT(context.Input.SerializedVersion == 3 && context.Output.SerializedVersion == 4);
+
+        FontOptionsOld optionsOld;
+        Platform::MemoryCopy(&optionsOld, context.Input.CustomData.Get(), sizeof(FontOptionsOld));
+
+        FontOptions options;
+        options.Hinting = optionsOld.Hinting;
+        options.Flags = optionsOld.Flags;
+        options.RasterMode = FontRasterMode::Bitmap;
+        context.Output.CustomData.Copy(&options);
+
+        return CopyChunk(context, 0);
+    }
 };
 
 #endif
diff --git a/Source/Engine/ContentImporters/ImportFont.cpp b/Source/Engine/ContentImporters/ImportFont.cpp
index c7dc01fe6..964f3907e 100644
--- a/Source/Engine/ContentImporters/ImportFont.cpp
+++ b/Source/Engine/ContentImporters/ImportFont.cpp
@@ -12,12 +12,13 @@
 CreateAssetResult ImportFont::Import(CreateAssetContext& context)
 {
     // Base
-    IMPORT_SETUP(FontAsset, 3);
+    IMPORT_SETUP(FontAsset, 4);
 
     // Setup header
     FontOptions options;
     options.Hinting = FontHinting::Default;
     options.Flags = FontFlags::AntiAliasing;
+    options.RasterMode = FontRasterMode::Bitmap;
     context.Data.CustomData.Copy(&options);
 
     // Open the file
diff --git a/Source/Engine/Render2D/FontAsset.cs b/Source/Engine/Render2D/FontAsset.cs
index 72520db5d..624daab5b 100644
--- a/Source/Engine/Render2D/FontAsset.cs
+++ b/Source/Engine/Render2D/FontAsset.cs
@@ -1,5 +1,7 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
+using System;
+
 namespace FlaxEngine
 {
     partial struct FontOptions
@@ -11,7 +13,7 @@ namespace FlaxEngine
         /// <returns><c>true</c> if this object has the same value as <paramref name="other" />; otherwise, <c>false</c> </returns>
         public bool Equals(FontOptions other)
         {
-            return Hinting == other.Hinting && Flags == other.Flags;
+            return Hinting == other.Hinting && Flags == other.Flags && RasterMode == other.RasterMode;
         }
 
         /// <inheritdoc />
@@ -23,10 +25,7 @@ namespace FlaxEngine
         /// <inheritdoc />
         public override int GetHashCode()
         {
-            unchecked
-            {
-                return ((int)Hinting * 397) ^ (int)Flags;
-            }
+            return HashCode.Combine((int)Hinting, (int)Flags, (int)RasterMode);
         }
 
         /// <summary>
@@ -37,7 +36,7 @@ namespace FlaxEngine
         /// <returns><c>true</c> if <paramref name="left" /> has the same value as <paramref name="right" />; otherwise, <c>false</c>.</returns>
         public static bool operator ==(FontOptions left, FontOptions right)
         {
-            return left.Hinting == right.Hinting && left.Flags == right.Flags;
+            return left.Hinting == right.Hinting && left.Flags == right.Flags && left.RasterMode == right.RasterMode;
         }
 
         /// <summary>
@@ -48,7 +47,7 @@ namespace FlaxEngine
         /// <returns><c>true</c> if <paramref name="left" /> has a different value than <paramref name="right" />; otherwise,<c>false</c>.</returns>
         public static bool operator !=(FontOptions left, FontOptions right)
         {
-            return left.Hinting != right.Hinting || left.Flags != right.Flags;
+            return left.Hinting != right.Hinting || left.Flags != right.Flags || left.RasterMode != right.RasterMode;
         }
     }
 }
diff --git a/Source/Engine/Render2D/FontAsset.h b/Source/Engine/Render2D/FontAsset.h
index b1ea87e0a..c9966c68b 100644
--- a/Source/Engine/Render2D/FontAsset.h
+++ b/Source/Engine/Render2D/FontAsset.h
@@ -66,6 +66,22 @@ API_ENUM(Attributes="Flags") enum class FontFlags : byte
     Italic = 4,
 };
 
+/// <summary>
+/// The font rasterization mode.
+/// </summary>
+API_ENUM() enum class FontRasterMode : byte
+{
+    /// <summary>
+    /// Use the default FreeType rasterizer to render font atlases.
+    /// </summary>
+    Bitmap,
+
+    /// <summary>
+    /// Use the MSDF generator to render font atlases. Need to be rendered with a compatible material.
+    /// </summary>
+    MSDF,
+};
+
 DECLARE_ENUM_OPERATORS(FontFlags);
 
 /// <summary>
@@ -84,6 +100,11 @@ API_STRUCT() struct FontOptions
     /// The flags.
     /// </summary>
     API_FIELD() FontFlags Flags;
+
+    /// <summary>
+    /// The rasterization mode.
+    /// </summary>
+    API_FIELD() FontRasterMode RasterMode;
 };
 
 /// <summary>
@@ -91,7 +112,7 @@ API_STRUCT() struct FontOptions
 /// </summary>
 API_CLASS(NoSpawn) class FLAXENGINE_API FontAsset : public BinaryAsset
 {
-    DECLARE_BINARY_ASSET_HEADER(FontAsset, 3);
+    DECLARE_BINARY_ASSET_HEADER(FontAsset, 4);
     friend Font;
 
 private:
diff --git a/Source/Engine/Render2D/FontManager.cpp b/Source/Engine/Render2D/FontManager.cpp
index 0375814ae..2c75a6f23 100644
--- a/Source/Engine/Render2D/FontManager.cpp
+++ b/Source/Engine/Render2D/FontManager.cpp
@@ -13,6 +13,7 @@
 #include <ThirdParty/freetype/ftsynth.h>
 #include <ThirdParty/freetype/ftbitmap.h>
 #include <ThirdParty/freetype/internal/ftdrv.h>
+#include "Engine/Render2D/MSDFGenerator.h"
 
 namespace FontManagerImpl
 {
@@ -125,7 +126,11 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
     // Set load flags
     uint32 glyphFlags = FT_LOAD_NO_BITMAP;
     const bool useAA = EnumHasAnyFlags(options.Flags, FontFlags::AntiAliasing);
-    if (useAA)
+    if (options.RasterMode == FontRasterMode::MSDF)
+    {
+        glyphFlags |= FT_LOAD_NO_AUTOHINT | FT_LOAD_NO_HINTING;
+    }
+    else if (useAA)
     {
         switch (options.Hinting)
         {
@@ -185,75 +190,102 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
         FT_GlyphSlot_Oblique(face->glyph);
     }
 
-    // Render glyph to the bitmap
-    FT_GlyphSlot glyph = face->glyph;
-    FT_Render_Glyph(glyph, useAA ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO);
-
-    FT_Bitmap* bitmap = &glyph->bitmap;
-    FT_Bitmap tmpBitmap;
-    if (bitmap->pixel_mode != FT_PIXEL_MODE_GRAY)
+    int32 glyphWidth = 0;
+    int32 glyphHeight = 0;
+    if (options.RasterMode == FontRasterMode::Bitmap)
     {
-        // Convert the bitmap to 8bpp grayscale
-        FT_Bitmap_New(&tmpBitmap);
-        FT_Bitmap_Convert(Library, bitmap, &tmpBitmap, 4);
-        bitmap = &tmpBitmap;
-    }
-    ASSERT(bitmap && bitmap->pixel_mode == FT_PIXEL_MODE_GRAY);
+        // Render glyph to the bitmap
+        FT_GlyphSlot glyph = face->glyph;
+        FT_Render_Glyph(glyph, useAA ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO);
 
-    // Fill the character data
-    entry.AdvanceX = Convert26Dot6ToRoundedPixel<int16>(glyph->advance.x);
-    entry.OffsetY = glyph->bitmap_top;
-    entry.OffsetX = glyph->bitmap_left;
-    entry.IsValid = true;
-    entry.BearingY = Convert26Dot6ToRoundedPixel<int16>(glyph->metrics.horiBearingY);
-    entry.Height = Convert26Dot6ToRoundedPixel<int16>(glyph->metrics.height);
+        FT_Bitmap* bitmap = &glyph->bitmap;
+        FT_Bitmap tmpBitmap;
+        if (bitmap->pixel_mode != FT_PIXEL_MODE_GRAY) {
+            // Convert the bitmap to 8bpp grayscale
+            FT_Bitmap_New(&tmpBitmap);
+            FT_Bitmap_Convert(Library, bitmap, &tmpBitmap, 4);
+            bitmap = &tmpBitmap;
+        }
+        ASSERT(bitmap && bitmap->pixel_mode == FT_PIXEL_MODE_GRAY);
 
-    // Allocate memory
-    const int32 glyphWidth = bitmap->width;
-    const int32 glyphHeight = bitmap->rows;
-    GlyphImageData.Clear();
-    GlyphImageData.Resize(glyphWidth * glyphHeight);
+        // Fill the character data
+        entry.AdvanceX = Convert26Dot6ToRoundedPixel<int16>(glyph->advance.x);
+        entry.OffsetY = glyph->bitmap_top;
+        entry.OffsetX = glyph->bitmap_left;
+        entry.IsValid = true;
+        entry.BearingY = Convert26Dot6ToRoundedPixel<int16>(glyph->metrics.horiBearingY);
+        entry.Height = Convert26Dot6ToRoundedPixel<int16>(glyph->metrics.height);
 
-    // End for empty glyphs
-    if (GlyphImageData.IsEmpty())
-    {
-        entry.TextureIndex = MAX_uint8;
-        if (bitmap == &tmpBitmap)
+        // Allocate memory
+        glyphWidth = bitmap->width;
+        glyphHeight = bitmap->rows;
+        GlyphImageData.Clear();
+        GlyphImageData.Resize(glyphWidth * glyphHeight);
+
+        // End for empty glyphs
+        if (GlyphImageData.IsEmpty())
         {
+            entry.TextureIndex = MAX_uint8;
+            if (bitmap == &tmpBitmap)
+            {
+                FT_Bitmap_Done(Library, bitmap);
+                bitmap = nullptr;
+            }
+            return false;
+        }
+        
+        // Copy glyph data after rasterization (row by row)
+        for (int32 row = 0; row < glyphHeight; row++)
+        {
+            Platform::MemoryCopy(&GlyphImageData[row * glyphWidth], &bitmap->buffer[row * bitmap->pitch], glyphWidth);
+        }
+
+        // Normalize gray scale images not using 256 colors
+        if (bitmap->num_grays != 256) {
+            const int32 scale = 255 / (bitmap->num_grays - 1);
+            for (byte& pixel : GlyphImageData) {
+                pixel *= scale;
+            }
+        }
+
+        // Free temporary bitmap if used
+        if (bitmap == &tmpBitmap) {
             FT_Bitmap_Done(Library, bitmap);
             bitmap = nullptr;
         }
-        return false;
     }
-
-    // Copy glyph data after rasterization (row by row)
-    for (int32 row = 0; row < glyphHeight; row++)
+    else
     {
-        Platform::MemoryCopy(&GlyphImageData[row * glyphWidth], &bitmap->buffer[row * bitmap->pitch], glyphWidth);
-    }
+        // Generate bitmap for MSDF
+        FT_GlyphSlot glyph = face->glyph;
+        int16 msdf_top = 0;
+        int16 msdf_left = 0;
+        MSDFGenerator::GenerateMSDF(glyph, GlyphImageData, glyphWidth, glyphHeight, msdf_top, msdf_left);
 
-    // Normalize gray scale images not using 256 colors
-    if (bitmap->num_grays != 256)
-    {
-        const int32 scale = 255 / (bitmap->num_grays - 1);
-        for (byte& pixel : GlyphImageData)
-        {
-            pixel *= scale;
+        // End for empty glyphs
+        if (GlyphImageData.IsEmpty()) {
+            entry.TextureIndex = MAX_uint8;
+            return false;
         }
-    }
 
-    // Free temporary bitmap if used
-    if (bitmap == &tmpBitmap)
-    {
-        FT_Bitmap_Done(Library, bitmap);
-        bitmap = nullptr;
+        // Fill the character data
+        entry.AdvanceX = Convert26Dot6ToRoundedPixel<int16>(glyph->advance.x);
+        entry.OffsetY = msdf_top;
+        entry.OffsetX = msdf_left;
+        entry.IsValid = true;
+        entry.BearingY = Convert26Dot6ToRoundedPixel<int16>(glyph->metrics.horiBearingY);
+        entry.Height = Convert26Dot6ToRoundedPixel<int16>(glyph->metrics.height);
     }
 
     // Find atlas for the character texture
+    PixelFormat requiredFormat = options.RasterMode == FontRasterMode::MSDF ? PixelFormat::R8G8B8A8_UNorm : PixelFormat::R8_UNorm;
     int32 atlasIndex = 0;
     const FontTextureAtlasSlot* slot = nullptr;
-    for (; atlasIndex < Atlases.Count() && slot == nullptr; atlasIndex++)
+    for (; atlasIndex < Atlases.Count() && slot == nullptr; atlasIndex++) {
+        if (Atlases[atlasIndex]->GetPixelFormat() != requiredFormat)
+            continue;
         slot = Atlases[atlasIndex]->AddEntry(glyphWidth, glyphHeight, GlyphImageData);
+    }
     atlasIndex--;
 
     // Check if there is no atlas for this character
@@ -261,7 +293,7 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
     {
         // Create new atlas
         auto atlas = Content::CreateVirtualAsset<FontTextureAtlas>();
-        atlas->Setup(PixelFormat::R8_UNorm, FontTextureAtlas::PaddingStyle::PadWithZero);
+        atlas->Setup(requiredFormat, FontTextureAtlas::PaddingStyle::PadWithZero);
         Atlases.Add(atlas);
         atlasIndex++;
 
diff --git a/Source/Engine/Render2D/FontTextureAtlas.h b/Source/Engine/Render2D/FontTextureAtlas.h
index fe92ed67c..3a6ca98ae 100644
--- a/Source/Engine/Render2D/FontTextureAtlas.h
+++ b/Source/Engine/Render2D/FontTextureAtlas.h
@@ -105,6 +105,14 @@ public:
         return _height;
     }
 
+    /// <summary>
+    /// Gets the atlas pixel format.
+    /// </summary>
+    FORCE_INLINE PixelFormat GetPixelFormat() const
+    {
+        return _format;
+    }
+
     /// <summary>
     /// Gets the atlas size.
     /// </summary>
@@ -186,8 +194,8 @@ public:
     /// <summary>
     /// Returns glyph's bitmap data of the slot.
     /// </summary>
-	/// <param name="slot">The slot in atlas.</param>
-	/// <param name="width">The width of the slot.</param>
+    /// <param name="slot">The slot in atlas.</param>
+    /// <param name="width">The width of the slot.</param>
     /// <param name="height">The height of the slot.</param>
     /// <param name="stride">The stride of the slot.</param>
     /// <returns>The pointer to the bitmap data of the given slot.</returns>
diff --git a/Source/Engine/Render2D/MSDFGenerator.h b/Source/Engine/Render2D/MSDFGenerator.h
new file mode 100644
index 000000000..4db941211
--- /dev/null
+++ b/Source/Engine/Render2D/MSDFGenerator.h
@@ -0,0 +1,129 @@
+// Copyright (c) Wojciech Figat. All rights reserved.
+
+#pragma once
+
+#include "Engine/Core/Collections/Array.h"
+#include "Engine/Core/Math/Math.h"
+#include <ThirdParty/freetype/ftoutln.h>
+#include <ThirdParty/msdfgen/msdfgen.h>
+
+class MSDFGenerator
+{
+    using Point2 = msdfgen::Point2;
+    using Shape = msdfgen::Shape;
+    using Contour = msdfgen::Contour;
+    using EdgeHolder = msdfgen::EdgeHolder;
+
+    static Point2 ftPoint2(const FT_Vector& vector, double scale)
+    {
+        return Point2(scale * vector.x, scale * vector.y);
+    }
+
+    struct FtContext
+    {
+        double scale;
+        Point2 position;
+        Shape* shape;
+        Contour* contour;
+    };
+
+    static int ftMoveTo(const FT_Vector* to, void* user)
+    {
+        FtContext* context = reinterpret_cast<FtContext*>(user);
+        if (!(context->contour && context->contour->edges.empty()))
+            context->contour = &context->shape->addContour();
+        context->position = ftPoint2(*to, context->scale);
+        return 0;
+    }
+
+    static int ftLineTo(const FT_Vector* to, void* user)
+    {
+        FtContext* context = reinterpret_cast<FtContext*>(user);
+        Point2 endpoint = ftPoint2(*to, context->scale);
+        if (endpoint != context->position)
+        {
+            context->contour->addEdge(EdgeHolder(context->position, endpoint));
+            context->position = endpoint;
+        }
+        return 0;
+    }
+
+    static int ftConicTo(const FT_Vector* control, const FT_Vector* to, void* user)
+    {
+        FtContext* context = reinterpret_cast<FtContext*>(user);
+        Point2 endpoint = ftPoint2(*to, context->scale);
+        if (endpoint != context->position)
+        {
+            context->contour->addEdge(EdgeHolder(context->position, ftPoint2(*control, context->scale), endpoint));
+            context->position = endpoint;
+        }
+        return 0;
+    }
+
+    static int ftCubicTo(const FT_Vector* control1, const FT_Vector* control2, const FT_Vector* to, void* user)
+    {
+        FtContext* context = reinterpret_cast<FtContext*>(user);
+        Point2 endpoint = ftPoint2(*to, context->scale);
+        if (endpoint != context->position || msdfgen::crossProduct(ftPoint2(*control1, context->scale) - endpoint, ftPoint2(*control2, context->scale) - endpoint))
+        {
+            context->contour->addEdge(EdgeHolder(context->position, ftPoint2(*control1, context->scale), ftPoint2(*control2, context->scale), endpoint));
+            context->position = endpoint;
+        }
+        return 0;
+    }
+
+public:
+    static void GenerateMSDF(FT_GlyphSlot glyph, Array<byte>& output, int32& outputWidth, int32& outputHeight, int16& top, int16& left)
+    {
+        Shape shape;
+        shape.contours.clear();
+        shape.inverseYAxis = true;
+
+        FtContext context = { };
+        context.scale = 1.0 / 64.0;
+        context.shape = &shape;
+        FT_Outline_Funcs ftFunctions;
+        ftFunctions.move_to = &ftMoveTo;
+        ftFunctions.line_to = &ftLineTo;
+        ftFunctions.conic_to = &ftConicTo;
+        ftFunctions.cubic_to = &ftCubicTo;
+        ftFunctions.shift = 0;
+        ftFunctions.delta = 0;
+        FT_Outline_Decompose(&glyph->outline, &ftFunctions, &context);
+
+        shape.normalize();
+        edgeColoringSimple(shape, 3.0);
+
+        // Todo: make this configurable
+        // Also hard-coded in material: MSDFFontMaterial
+        const double pxRange = 4.0;
+
+        msdfgen::Shape::Bounds bounds = shape.getBounds();
+        int32 width = static_cast<int32>(Math::CeilToInt(bounds.r - bounds.l + pxRange));
+        int32 height = static_cast<int32>(Math::CeilToInt(bounds.t - bounds.b + pxRange));
+        msdfgen::Bitmap<float, 4> msdf(width, height);
+        
+        msdfgen::SDFTransformation t(
+            msdfgen::Projection(1.0, msdfgen::Vector2(-bounds.l + pxRange / 2.0, -bounds.b + pxRange / 2.0)), msdfgen::Range(pxRange)
+        );
+        generateMTSDF(msdf, shape, t);
+
+        output.Resize(width * height * 4);
+
+        const msdfgen::BitmapConstRef<float, 4>& bitmap = msdf;
+        for (int y = 0; y < height; ++y)
+        {
+            for (int x = 0; x < width; ++x)
+            {
+                output[(y * width + x) * 4] = msdfgen::pixelFloatToByte(bitmap(x, y)[0]);
+                output[(y * width + x) * 4 + 1] = msdfgen::pixelFloatToByte(bitmap(x, y)[1]);
+                output[(y * width + x) * 4 + 2] = msdfgen::pixelFloatToByte(bitmap(x, y)[2]);
+                output[(y * width + x) * 4 + 3] = msdfgen::pixelFloatToByte(bitmap(x, y)[3]);
+            }
+        }
+        outputWidth = width;
+        outputHeight = height;
+        top = static_cast<int16>(Math::CeilToInt(bounds.t + pxRange / 2.0));
+        left = static_cast<int16>(Math::FloorToInt(bounds.l + pxRange / 2.0));
+    }
+};

From dd2e2c5b3a0e0ee8427c1b8f6ad917d7f165ebbf Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sat, 14 Feb 2026 18:35:13 +0100
Subject: [PATCH 081/203] add some utility for copying parameter names to
 parameter right click menu

---
 Source/Editor/Surface/VisjectSurfaceWindow.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Source/Editor/Surface/VisjectSurfaceWindow.cs b/Source/Editor/Surface/VisjectSurfaceWindow.cs
index 7c2cb23ad..26cfe9e95 100644
--- a/Source/Editor/Surface/VisjectSurfaceWindow.cs
+++ b/Source/Editor/Surface/VisjectSurfaceWindow.cs
@@ -708,12 +708,27 @@ namespace FlaxEditor.Surface
         {
             var index = (int)label.Tag;
             menu.AddSeparator();
+            menu.AddButton("Copy name", () => Clipboard.Text = ((IVisjectSurfaceWindow)Values[0]).VisjectSurface.Parameters[index].Name);
+            menu.AddButton("Copy all names", () => Clipboard.Text = GetAllParamterNamesAsConstantCSharpCode());
+            menu.AddSeparator();
             menu.AddButton("Rename", () => StartParameterRenaming(index, label));
             menu.AddButton("Edit attributes...", () => EditAttributesParameter(index, label));
             menu.AddButton("Delete", () => DeleteParameter(index));
             OnParamContextMenu(index, menu);
         }
 
+        private string GetAllParamterNamesAsConstantCSharpCode()
+        {
+            string allParamNames = "";
+            foreach (var param in ((IVisjectSurfaceWindow)Values[0]).VisjectSurface.Parameters)
+            {
+                string cleanParamName = param.Name.Replace(" ", "");
+                allParamNames += $"private const string {cleanParamName}ParameterName = \"{param.Name}\";\n";
+            }
+
+            return allParamNames;
+        }
+
         private void StartParameterRenaming(int index, Control label)
         {
             var window = (IVisjectSurfaceWindow)Values[0];

From 0870a86a3ab87ef44970785f5f42644667dba065 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sat, 14 Feb 2026 18:56:58 +0100
Subject: [PATCH 082/203] remove non parameters from parameter list

---
 Source/Editor/Surface/VisjectSurfaceWindow.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Editor/Surface/VisjectSurfaceWindow.cs b/Source/Editor/Surface/VisjectSurfaceWindow.cs
index 26cfe9e95..109499c35 100644
--- a/Source/Editor/Surface/VisjectSurfaceWindow.cs
+++ b/Source/Editor/Surface/VisjectSurfaceWindow.cs
@@ -723,6 +723,9 @@ namespace FlaxEditor.Surface
             foreach (var param in ((IVisjectSurfaceWindow)Values[0]).VisjectSurface.Parameters)
             {
                 string cleanParamName = param.Name.Replace(" ", "");
+                // Filter out headers and other non-parameter entries that can be present in the parameters list
+                if (string.IsNullOrEmpty(cleanParamName))
+                    continue;
                 allParamNames += $"private const string {cleanParamName}ParameterName = \"{param.Name}\";\n";
             }
 

From 974c55418bf56a7309cf5d82f1871ba5c6c0b0c7 Mon Sep 17 00:00:00 2001
From: fibref <fibref_233@outlook.com>
Date: Sun, 15 Feb 2026 20:35:34 +0800
Subject: [PATCH 083/203] fix msdfgen build on Linux (Mac not tested)

---
 Source/ThirdParty/msdfgen/msdfgen.Build.cs    |   4 +-
 .../Flax.Build/Deps/Dependencies/msdfgen.cs   | 112 ++++++++++++++----
 2 files changed, 92 insertions(+), 24 deletions(-)

diff --git a/Source/ThirdParty/msdfgen/msdfgen.Build.cs b/Source/ThirdParty/msdfgen/msdfgen.Build.cs
index 8a01d0c77..4a98013d7 100644
--- a/Source/ThirdParty/msdfgen/msdfgen.Build.cs
+++ b/Source/ThirdParty/msdfgen/msdfgen.Build.cs
@@ -15,7 +15,7 @@ public class msdfgen : DepsModule
         base.Init();
 
         LicenseType = LicenseTypes.MIT;
-        LicenseFilePath = "LICENSE.TXT";
+        LicenseFilePath = "LICENSE.txt";
 
         // Merge third-party modules into engine binary
         BinaryModuleName = "FlaxEngine";
@@ -35,7 +35,7 @@ public class msdfgen : DepsModule
         case TargetPlatform.Linux:
         case TargetPlatform.Mac:
         case TargetPlatform.Android:
-            options.OutputFiles.Add(Path.Combine(depsRoot, "msdfgen-core.a"));
+            options.OutputFiles.Add(Path.Combine(depsRoot, "libmsdfgen-core.a"));
             break;
         default: throw new InvalidPlatformException(options.Platform.Target);
         }
diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs b/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
index 7cff41a71..31f61d873 100644
--- a/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
@@ -39,6 +39,36 @@ namespace Flax.Deps.Dependencies
             }
         }
 
+        /// <inheritdoc />
+        public override TargetArchitecture[] Architectures
+        {
+            get
+            {
+                switch (BuildPlatform)
+                {
+                case TargetPlatform.Windows:
+                    return new[]
+                    {
+                        TargetArchitecture.x64,
+                        TargetArchitecture.ARM64,
+                    };
+                case TargetPlatform.Linux:
+                    return new[]
+                    {
+                        TargetArchitecture.x64,
+                        //TargetArchitecture.ARM64,
+                    };
+                case TargetPlatform.Mac:
+                    return new[]
+                    {
+                        TargetArchitecture.x64,
+                        TargetArchitecture.ARM64,
+                    };
+                default: return new TargetArchitecture[0];
+                }
+            }
+        }
+
         /// <inheritdoc />
         public override void Build(BuildOptions options)
         {
@@ -64,17 +94,18 @@ namespace Flax.Deps.Dependencies
 
             foreach (var platform in options.Platforms)
             {
-                BuildStarted(platform);
-                switch (platform)
+                foreach (var architecture in options.Architectures)
                 {
-                case TargetPlatform.Windows:
-                {
-                    var configuration = "Release";
-
-                    // Build for Windows
-                    File.Delete(Path.Combine(root, "CMakeCache.txt"));
-                    foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 })
+                    BuildStarted(platform, architecture);
+                    switch (platform)
                     {
+                    case TargetPlatform.Windows:
+                    {
+                        var configuration = "Release";
+
+                        // Build for Windows
+                        File.Delete(Path.Combine(root, "CMakeCache.txt"));
+                        
                         var buildDir = Path.Combine(root, "build-" + architecture);
                         var installDir = Path.Combine(root, "install-" + architecture);
                         SetupDirectory(buildDir, true);
@@ -85,20 +116,57 @@ namespace Flax.Deps.Dependencies
                         Utilities.FileCopy(Path.Combine(installDir, "lib", "msdfgen-core.lib"), Path.Combine(depsFolder, "msdfgen-core.lib"));
                         // This will be set multiple times, but the headers are the same anyway.
                         includeDir = Path.Combine(installDir, "include");
-                    }
 
-                    break;
-                }
-                case TargetPlatform.Linux:
-                {
-                    // todo
-                    break;
-                }
-                case TargetPlatform.Mac:
-                {
-                    // todo
-                    break;
-                }
+                        break;
+                    }
+                    case TargetPlatform.Linux:
+                    {
+                        var configuration = "Release";
+                        var envVars = new Dictionary<string, string>
+                        {
+                            { "CC", "clang-" + Configuration.LinuxClangMinVer },
+                            { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer },
+                            { "CXX", "clang++-" + Configuration.LinuxClangMinVer },
+                            { "CMAKE_BUILD_PARALLEL_LEVEL", CmakeBuildParallel },
+                        };
+
+                        // Build for Linux
+                        File.Delete(Path.Combine(root, "CMakeCache.txt"));
+
+                        var buildDir = Path.Combine(root, "build-" + architecture);
+                        var installDir = Path.Combine(root, "install-" + architecture);
+                        SetupDirectory(buildDir, true);
+                        RunCmake(root, platform, architecture, $"-B\"{buildDir}\" " + cmakeArgs + " -DCMAKE_POSITION_INDEPENDENT_CODE=ON", envVars);
+                        BuildCmake(buildDir);
+                        Utilities.Run("cmake", $"--install {buildDir} --prefix {installDir} --config {configuration}", null, root, Utilities.RunOptions.DefaultTool);
+                        var depsFolder = GetThirdPartyFolder(options, platform, architecture);
+                        Utilities.FileCopy(Path.Combine(installDir, "lib", "libmsdfgen-core.a"), Path.Combine(depsFolder, "libmsdfgen-core.a"));
+                        // This will be set multiple times, but the headers are the same anyway.
+                        includeDir = Path.Combine(installDir, "include");
+                        
+                        break;
+                    }
+                    case TargetPlatform.Mac:
+                    {
+                        var configuration = "Release";
+
+                        // Build for Mac
+                        File.Delete(Path.Combine(root, "CMakeCache.txt"));
+
+                        var buildDir = Path.Combine(root, "build-" + architecture);
+                        var installDir = Path.Combine(root, "install-" + architecture);
+                        SetupDirectory(buildDir, true);
+                        RunCmake(root, platform, architecture, $"-B\"{buildDir}\" " + cmakeArgs);
+                        BuildCmake(buildDir);
+                        Utilities.Run("cmake", $"--install {buildDir} --prefix {installDir} --config {configuration}", null, root, Utilities.RunOptions.DefaultTool);
+                        var depsFolder = GetThirdPartyFolder(options, platform, architecture);
+                        Utilities.FileCopy(Path.Combine(installDir, "lib", "libmsdfgen-core.a"), Path.Combine(depsFolder, "libmsdfgen-core.a"));
+                        // This will be set multiple times, but the headers are the same anyway.
+                        includeDir = Path.Combine(installDir, "include");
+                        
+                        break;
+                    }
+                    }
                 }
             }
 

From d3bd3772640a12ef4091e2c54b6718563a823233 Mon Sep 17 00:00:00 2001
From: fibref <fibref_233@outlook.com>
Date: Mon, 16 Feb 2026 11:04:22 +0800
Subject: [PATCH 084/203] update msdfgen

---
 .../ThirdParty/msdfgen/msdfgen/core/Bitmap.h  |  14 +-
 .../msdfgen/msdfgen/core/Bitmap.hpp           |  77 +++++++++--
 .../msdfgen/msdfgen/core/BitmapRef.hpp        | 129 ++++++++++++++++--
 .../ThirdParty/msdfgen/msdfgen/core/Contour.h |   4 +-
 .../msdfgen/core/MSDFErrorCorrection.h        |  14 +-
 .../ThirdParty/msdfgen/msdfgen/core/Shape.h   |  11 +-
 .../msdfgen/msdfgen/core/YAxisOrientation.h   |  17 +++
 .../msdfgen/core/bitmap-interpolation.hpp     |   4 +-
 .../msdfgen/msdfgen/core/edge-segments.h      |   8 +-
 .../msdfgen/core/msdf-error-correction.h      |  36 ++---
 .../msdfgen/msdfgen/core/rasterization.h      |  21 +--
 .../msdfgen/msdfgen/core/render-sdf.h         |  18 +--
 .../msdfgen/msdfgen/core/save-bmp.h           |  12 +-
 .../msdfgen/msdfgen/core/save-fl32.h          |   2 +-
 .../msdfgen/msdfgen/core/save-rgba.h          |  12 +-
 .../msdfgen/msdfgen/core/save-tiff.h          |   6 +-
 .../msdfgen/core/sdf-error-estimation.h       |  27 ++--
 .../msdfgen/msdfgen/msdfgen-config.h          |   8 +-
 Source/ThirdParty/msdfgen/msdfgen/msdfgen.h   |  38 +++---
 .../msdfgen/msdfgen/msdfgen/msdfgen-config.h  |   8 +-
 .../Flax.Build/Deps/Dependencies/msdfgen.cs   |   2 +-
 21 files changed, 339 insertions(+), 129 deletions(-)
 create mode 100644 Source/ThirdParty/msdfgen/msdfgen/core/YAxisOrientation.h

diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.h b/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.h
index 9a08749f4..05c305d64 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.h
@@ -1,6 +1,7 @@
 
 #pragma once
 
+#include "YAxisOrientation.h"
 #include "BitmapRef.hpp"
 
 namespace msdfgen {
@@ -11,14 +12,16 @@ class Bitmap {
 
 public:
     Bitmap();
-    Bitmap(int width, int height);
-    Bitmap(const BitmapConstRef<T, N> &orig);
+    Bitmap(int width, int height, YAxisOrientation yOrientation = MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION);
+    explicit Bitmap(const BitmapConstRef<T, N> &orig);
+    explicit Bitmap(const BitmapConstSection<T, N> &orig);
     Bitmap(const Bitmap<T, N> &orig);
 #ifdef MSDFGEN_USE_CPP11
     Bitmap(Bitmap<T, N> &&orig);
 #endif
     ~Bitmap();
     Bitmap<T, N> &operator=(const BitmapConstRef<T, N> &orig);
+    Bitmap<T, N> &operator=(const BitmapConstSection<T, N> &orig);
     Bitmap<T, N> &operator=(const Bitmap<T, N> &orig);
 #ifdef MSDFGEN_USE_CPP11
     Bitmap<T, N> &operator=(Bitmap<T, N> &&orig);
@@ -38,10 +41,17 @@ public:
 #endif
     operator BitmapRef<T, N>();
     operator BitmapConstRef<T, N>() const;
+    operator BitmapSection<T, N>();
+    operator BitmapConstSection<T, N>() const;
+    /// Returns a reference to a rectangular section of the bitmap specified by bounds (excluding xMax, yMax).
+    BitmapSection<T, N> getSection(int xMin, int yMin, int xMax, int yMax);
+    /// Returns a constant reference to a rectangular section of the bitmap specified by bounds (excluding xMax, yMax).
+    BitmapConstSection<T, N> getConstSection(int xMin, int yMin, int xMax, int yMax) const;
 
 private:
     T *pixels;
     int w, h;
+    YAxisOrientation yOrientation;
 
 };
 
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.hpp b/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.hpp
index 940435778..afb53942f 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.hpp
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/Bitmap.hpp
@@ -7,28 +7,41 @@
 namespace msdfgen {
 
 template <typename T, int N>
-Bitmap<T, N>::Bitmap() : pixels(NULL), w(0), h(0) { }
+Bitmap<T, N>::Bitmap() : pixels(NULL), w(0), h(0), yOrientation(MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION) { }
 
 template <typename T, int N>
-Bitmap<T, N>::Bitmap(int width, int height) : w(width), h(height) {
+Bitmap<T, N>::Bitmap(int width, int height, YAxisOrientation yOrientation) : w(width), h(height), yOrientation(yOrientation) {
     pixels = new T[N*w*h];
 }
 
 template <typename T, int N>
-Bitmap<T, N>::Bitmap(const BitmapConstRef<T, N> &orig) : w(orig.width), h(orig.height) {
+Bitmap<T, N>::Bitmap(const BitmapConstRef<T, N> &orig) : w(orig.width), h(orig.height), yOrientation(orig.yOrientation) {
     pixels = new T[N*w*h];
     memcpy(pixels, orig.pixels, sizeof(T)*N*w*h);
 }
 
 template <typename T, int N>
-Bitmap<T, N>::Bitmap(const Bitmap<T, N> &orig) : w(orig.w), h(orig.h) {
+Bitmap<T, N>::Bitmap(const BitmapConstSection<T, N> &orig) : w(orig.width), h(orig.height), yOrientation(orig.yOrientation) {
+    pixels = new T[N*w*h];
+    T *dst = pixels;
+    const T *src = orig.pixels;
+    int rowLength = N*w;
+    for (int y = 0; y < h; ++y) {
+        memcpy(dst, src, sizeof(T)*rowLength);
+        dst += rowLength;
+        src += orig.rowStride;
+    }
+}
+
+template <typename T, int N>
+Bitmap<T, N>::Bitmap(const Bitmap<T, N> &orig) : w(orig.w), h(orig.h), yOrientation(orig.yOrientation) {
     pixels = new T[N*w*h];
     memcpy(pixels, orig.pixels, sizeof(T)*N*w*h);
 }
 
 #ifdef MSDFGEN_USE_CPP11
 template <typename T, int N>
-Bitmap<T, N>::Bitmap(Bitmap<T, N> &&orig) : pixels(orig.pixels), w(orig.w), h(orig.h) {
+Bitmap<T, N>::Bitmap(Bitmap<T, N> &&orig) : pixels(orig.pixels), w(orig.w), h(orig.h), yOrientation(orig.yOrientation) {
     orig.pixels = NULL;
     orig.w = 0, orig.h = 0;
 }
@@ -36,25 +49,46 @@ Bitmap<T, N>::Bitmap(Bitmap<T, N> &&orig) : pixels(orig.pixels), w(orig.w), h(or
 
 template <typename T, int N>
 Bitmap<T, N>::~Bitmap() {
-    delete [] pixels;
+    delete[] pixels;
 }
 
 template <typename T, int N>
 Bitmap<T, N> &Bitmap<T, N>::operator=(const BitmapConstRef<T, N> &orig) {
     if (pixels != orig.pixels) {
-        delete [] pixels;
+        delete[] pixels;
         w = orig.width, h = orig.height;
+        yOrientation = orig.yOrientation;
         pixels = new T[N*w*h];
         memcpy(pixels, orig.pixels, sizeof(T)*N*w*h);
     }
     return *this;
 }
 
+template <typename T, int N>
+Bitmap<T, N> &Bitmap<T, N>::operator=(const BitmapConstSection<T, N> &orig) {
+    if (orig.pixels && orig.pixels >= pixels && orig.pixels < pixels+N*w*h)
+        return *this = Bitmap<T, N>(orig);
+    delete[] pixels;
+    w = orig.width, h = orig.height;
+    yOrientation = orig.yOrientation;
+    pixels = new T[N*w*h];
+    T *dst = pixels;
+    const T *src = orig.pixels;
+    int rowLength = N*w;
+    for (int y = 0; y < h; ++y) {
+        memcpy(dst, src, sizeof(T)*rowLength);
+        dst += rowLength;
+        src += orig.rowStride;
+    }
+    return *this;
+}
+
 template <typename T, int N>
 Bitmap<T, N> &Bitmap<T, N>::operator=(const Bitmap<T, N> &orig) {
     if (this != &orig) {
-        delete [] pixels;
+        delete[] pixels;
         w = orig.w, h = orig.h;
+        yOrientation = orig.yOrientation;
         pixels = new T[N*w*h];
         memcpy(pixels, orig.pixels, sizeof(T)*N*w*h);
     }
@@ -65,9 +99,10 @@ Bitmap<T, N> &Bitmap<T, N>::operator=(const Bitmap<T, N> &orig) {
 template <typename T, int N>
 Bitmap<T, N> &Bitmap<T, N>::operator=(Bitmap<T, N> &&orig) {
     if (this != &orig) {
-        delete [] pixels;
+        delete[] pixels;
         pixels = orig.pixels;
         w = orig.w, h = orig.h;
+        yOrientation = orig.yOrientation;
         orig.pixels = NULL;
     }
     return *this;
@@ -106,12 +141,32 @@ Bitmap<T, N>::operator const T *() const {
 
 template <typename T, int N>
 Bitmap<T, N>::operator BitmapRef<T, N>() {
-    return BitmapRef<T, N>(pixels, w, h);
+    return BitmapRef<T, N>(pixels, w, h, yOrientation);
 }
 
 template <typename T, int N>
 Bitmap<T, N>::operator BitmapConstRef<T, N>() const {
-    return BitmapConstRef<T, N>(pixels, w, h);
+    return BitmapConstRef<T, N>(pixels, w, h, yOrientation);
+}
+
+template <typename T, int N>
+Bitmap<T, N>::operator BitmapSection<T, N>() {
+    return BitmapSection<T, N>(pixels, w, h, yOrientation);
+}
+
+template <typename T, int N>
+Bitmap<T, N>::operator BitmapConstSection<T, N>() const {
+    return BitmapConstSection<T, N>(pixels, w, h, yOrientation);
+}
+
+template <typename T, int N>
+BitmapSection<T, N> Bitmap<T, N>::getSection(int xMin, int yMin, int xMax, int yMax) {
+    return BitmapSection<T, N>(pixels+N*(w*yMin+xMin), xMax-xMin, yMax-yMin, N*w, yOrientation);
+}
+
+template <typename T, int N>
+BitmapConstSection<T, N> Bitmap<T, N>::getConstSection(int xMin, int yMin, int xMax, int yMax) const {
+    return BitmapConstSection<T, N>(pixels+N*(w*yMin+xMin), xMax-xMin, yMax-yMin, N*w, yOrientation);
 }
 
 }
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/BitmapRef.hpp b/Source/ThirdParty/msdfgen/msdfgen/core/BitmapRef.hpp
index cb17f95dc..6e93fe983 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/BitmapRef.hpp
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/BitmapRef.hpp
@@ -1,41 +1,154 @@
 
 #pragma once
 
-#include "base.h"
+#include "YAxisOrientation.h"
 
 namespace msdfgen {
 
 /// Reference to a 2D image bitmap or a buffer acting as one. Pixel storage not owned or managed by the object.
 template <typename T, int N = 1>
+struct BitmapRef;
+/// Constant reference to a 2D image bitmap or a buffer acting as one. Pixel storage not owned or managed by the object.
+template <typename T, int N = 1>
+struct BitmapConstRef;
+/// Reference to a 2D image bitmap with non-contiguous rows of pixels. Pixel storage not owned or managed by the object. Can represent e.g. a section of a larger bitmap, bitmap with padded rows, or vertically flipped bitmap (rowStride can be negative).
+template <typename T, int N = 1>
+struct BitmapSection;
+/// Constant reference to a 2D image bitmap with non-contiguous rows of pixels. Pixel storage not owned or managed by the object. Can represent e.g. a section of a larger bitmap, bitmap with padded rows, or vertically flipped bitmap (rowStride can be negative).
+template <typename T, int N = 1>
+struct BitmapConstSection;
+
+template <typename T, int N>
 struct BitmapRef {
 
     T *pixels;
     int width, height;
+    YAxisOrientation yOrientation;
 
-    inline BitmapRef() : pixels(NULL), width(0), height(0) { }
-    inline BitmapRef(T *pixels, int width, int height) : pixels(pixels), width(width), height(height) { }
+    inline BitmapRef() : pixels(NULL), width(0), height(0), yOrientation(MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION) { }
+    inline BitmapRef(T *pixels, int width, int height, YAxisOrientation yOrientation = MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION) : pixels(pixels), width(width), height(height), yOrientation(yOrientation) { }
 
     inline T *operator()(int x, int y) const {
         return pixels+N*(width*y+x);
     }
 
+    /// Returns a reference to a rectangular section of the bitmap specified by bounds (excluding xMax, yMax).
+    inline BitmapSection<T, N> getSection(int xMin, int yMin, int xMax, int yMax) const {
+        return BitmapSection<T, N>(pixels+N*(width*yMin+xMin), xMax-xMin, yMax-yMin, N*width, yOrientation);
+    }
+
+    /// Returns a constant reference to a rectangular section of the bitmap specified by bounds (excluding xMax, yMax).
+    inline BitmapConstSection<T, N> getConstSection(int xMin, int yMin, int xMax, int yMax) const {
+        return BitmapConstSection<T, N>(pixels+N*(width*yMin+xMin), xMax-xMin, yMax-yMin, N*width, yOrientation);
+    }
+
 };
 
-/// Constant reference to a 2D image bitmap or a buffer acting as one. Pixel storage not owned or managed by the object.
-template <typename T, int N = 1>
+template <typename T, int N>
 struct BitmapConstRef {
 
     const T *pixels;
     int width, height;
+    YAxisOrientation yOrientation;
 
-    inline BitmapConstRef() : pixels(NULL), width(0), height(0) { }
-    inline BitmapConstRef(const T *pixels, int width, int height) : pixels(pixels), width(width), height(height) { }
-    inline BitmapConstRef(const BitmapRef<T, N> &orig) : pixels(orig.pixels), width(orig.width), height(orig.height) { }
+    inline BitmapConstRef() : pixels(NULL), width(0), height(0), yOrientation(MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION) { }
+    inline BitmapConstRef(const T *pixels, int width, int height, YAxisOrientation yOrientation = MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION) : pixels(pixels), width(width), height(height), yOrientation(yOrientation) { }
+    inline BitmapConstRef(const BitmapRef<T, N> &orig) : pixels(orig.pixels), width(orig.width), height(orig.height), yOrientation(orig.yOrientation) { }
 
     inline const T *operator()(int x, int y) const {
         return pixels+N*(width*y+x);
     }
 
+    /// Returns a constant reference to a rectangular section of the bitmap specified by bounds (excluding xMax, yMax).
+    inline BitmapConstSection<T, N> getSection(int xMin, int yMin, int xMax, int yMax) const {
+        return BitmapConstSection<T, N>(pixels+N*(width*yMin+xMin), xMax-xMin, yMax-yMin, N*width, yOrientation);
+    }
+
+    /// Returns a constant reference to a rectangular section of the bitmap specified by bounds (excluding xMax, yMax).
+    inline BitmapConstSection<T, N> getConstSection(int xMin, int yMin, int xMax, int yMax) const {
+        return getSection(xMin, yMin, xMax, yMax);
+    }
+
+};
+
+template <typename T, int N>
+struct BitmapSection {
+
+    T *pixels;
+    int width, height;
+    /// Specifies the difference between the beginnings of adjacent pixel rows as the number of T elements, can be negative.
+    int rowStride;
+    YAxisOrientation yOrientation;
+
+    inline BitmapSection() : pixels(NULL), width(0), height(0), rowStride(0), yOrientation(MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION) { }
+    inline BitmapSection(T *pixels, int width, int height, YAxisOrientation yOrientation = MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION) : pixels(pixels), width(width), height(height), rowStride(N*width), yOrientation(yOrientation) { }
+    inline BitmapSection(T *pixels, int width, int height, int rowStride, YAxisOrientation yOrientation = MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION) : pixels(pixels), width(width), height(height), rowStride(rowStride), yOrientation(yOrientation) { }
+    inline BitmapSection(const BitmapRef<T, N> &orig) : pixels(orig.pixels), width(orig.width), height(orig.height), rowStride(N*orig.width), yOrientation(orig.yOrientation) { }
+
+    inline T *operator()(int x, int y) const {
+        return pixels+rowStride*y+N*x;
+    }
+
+    /// Returns a reference to a rectangular subsection of the bitmap specified by bounds (excluding xMax, yMax).
+    inline BitmapSection<T, N> getSection(int xMin, int yMin, int xMax, int yMax) const {
+        return BitmapSection<T, N>(pixels+rowStride*yMin+N*xMin, xMax-xMin, yMax-yMin, rowStride, yOrientation);
+    }
+
+    /// Returns a constant reference to a rectangular subsection of the bitmap specified by bounds (excluding xMax, yMax).
+    inline BitmapConstSection<T, N> getConstSection(int xMin, int yMin, int xMax, int yMax) const {
+        return BitmapConstSection<T, N>(pixels+rowStride*yMin+N*xMin, xMax-xMin, yMax-yMin, rowStride, yOrientation);
+    }
+
+    /// Makes sure that the section's Y-axis orientation matches the argument by potentially reordering its rows.
+    inline void reorient(YAxisOrientation newYAxisOrientation) {
+        if (yOrientation != newYAxisOrientation) {
+            pixels += rowStride*(height-1);
+            rowStride = -rowStride;
+            yOrientation = newYAxisOrientation;
+        }
+    }
+
+};
+
+template <typename T, int N>
+struct BitmapConstSection {
+
+    const T *pixels;
+    int width, height;
+    /// Specifies the difference between the beginnings of adjacent pixel rows as the number of T elements, can be negative.
+    int rowStride;
+    YAxisOrientation yOrientation;
+
+    inline BitmapConstSection() : pixels(NULL), width(0), height(0), rowStride(0), yOrientation(MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION) { }
+    inline BitmapConstSection(const T *pixels, int width, int height, YAxisOrientation yOrientation = MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION) : pixels(pixels), width(width), height(height), rowStride(N*width), yOrientation(yOrientation) { }
+    inline BitmapConstSection(const T *pixels, int width, int height, int rowStride, YAxisOrientation yOrientation = MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION) : pixels(pixels), width(width), height(height), rowStride(rowStride), yOrientation(yOrientation) { }
+    inline BitmapConstSection(const BitmapRef<T, N> &orig) : pixels(orig.pixels), width(orig.width), height(orig.height), rowStride(N*orig.width), yOrientation(orig.yOrientation) { }
+    inline BitmapConstSection(const BitmapConstRef<T, N> &orig) : pixels(orig.pixels), width(orig.width), height(orig.height), rowStride(N*orig.width), yOrientation(orig.yOrientation) { }
+    inline BitmapConstSection(const BitmapSection<T, N> &orig) : pixels(orig.pixels), width(orig.width), height(orig.height), rowStride(orig.rowStride), yOrientation(orig.yOrientation) { }
+
+    inline const T *operator()(int x, int y) const {
+        return pixels+rowStride*y+N*x;
+    }
+
+    /// Returns a constant reference to a rectangular subsection of the bitmap specified by bounds (excluding xMax, yMax).
+    inline BitmapConstSection<T, N> getSection(int xMin, int yMin, int xMax, int yMax) const {
+        return BitmapConstSection<T, N>(pixels+rowStride*yMin+N*xMin, xMax-xMin, yMax-yMin, rowStride, yOrientation);
+    }
+
+    /// Returns a constant reference to a rectangular subsection of the bitmap specified by bounds (excluding xMax, yMax).
+    inline BitmapConstSection<T, N> getConstSection(int xMin, int yMin, int xMax, int yMax) const {
+        return getSection(xMin, yMin, xMax, yMax);
+    }
+
+    /// Makes sure that the section's Y-axis orientation matches the argument by potentially reordering its rows.
+    inline void reorient(YAxisOrientation newYAxisOrientation) {
+        if (yOrientation != newYAxisOrientation) {
+            pixels += rowStride*(height-1);
+            rowStride = -rowStride;
+            yOrientation = newYAxisOrientation;
+        }
+    }
+
 };
 
 }
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/Contour.h b/Source/ThirdParty/msdfgen/msdfgen/core/Contour.h
index 4cae48fad..53ceb8eda 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/Contour.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/Contour.h
@@ -21,9 +21,9 @@ public:
     /// Creates a new edge in the contour and returns its reference.
     EdgeHolder &addEdge();
     /// Adjusts the bounding box to fit the contour.
-    void bound(double &l, double &b, double &r, double &t) const;
+    void bound(double &xMin, double &yMin, double &xMax, double &yMax) const;
     /// Adjusts the bounding box to fit the contour border's mitered corners.
-    void boundMiters(double &l, double &b, double &r, double &t, double border, double miterLimit, int polarity) const;
+    void boundMiters(double &xMin, double &yMin, double &xMax, double &yMax, double border, double miterLimit, int polarity) const;
     /// Computes the winding of the contour. Returns 1 if positive, -1 if negative.
     int winding() const;
     /// Reverses the sequence of edges on the contour.
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/MSDFErrorCorrection.h b/Source/ThirdParty/msdfgen/msdfgen/core/MSDFErrorCorrection.h
index 9cd14eccf..995b1d614 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/MSDFErrorCorrection.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/MSDFErrorCorrection.h
@@ -20,7 +20,7 @@ public:
     };
 
     MSDFErrorCorrection();
-    explicit MSDFErrorCorrection(const BitmapRef<byte, 1> &stencil, const SDFTransformation &transformation);
+    explicit MSDFErrorCorrection(const BitmapSection<byte, 1> &stencil, const SDFTransformation &transformation);
     /// Sets the minimum ratio between the actual and maximum expected distance delta to be considered an error.
     void setMinDeviationRatio(double minDeviationRatio);
     /// Sets the minimum ratio between the pre-correction distance error and the post-correction distance error.
@@ -29,23 +29,23 @@ public:
     void protectCorners(const Shape &shape);
     /// Flags all texels that contribute to edges as protected.
     template <int N>
-    void protectEdges(const BitmapConstRef<float, N> &sdf);
+    void protectEdges(const BitmapConstSection<float, N> &sdf);
     /// Flags all texels as protected.
     void protectAll();
     /// Flags texels that are expected to cause interpolation artifacts based on analysis of the SDF only.
     template <int N>
-    void findErrors(const BitmapConstRef<float, N> &sdf);
+    void findErrors(const BitmapConstSection<float, N> &sdf);
     /// Flags texels that are expected to cause interpolation artifacts based on analysis of the SDF and comparison with the exact shape distance.
     template <template <typename> class ContourCombiner, int N>
-    void findErrors(const BitmapConstRef<float, N> &sdf, const Shape &shape);
+    void findErrors(BitmapConstSection<float, N> sdf, const Shape &shape);
     /// Modifies the MSDF so that all texels with the error flag are converted to single-channel.
     template <int N>
-    void apply(const BitmapRef<float, N> &sdf) const;
+    void apply(BitmapSection<float, N> sdf) const;
     /// Returns the stencil in its current state (see Flags).
-    BitmapConstRef<byte, 1> getStencil() const;
+    BitmapConstSection<byte, 1> getStencil() const;
 
 private:
-    BitmapRef<byte, 1> stencil;
+    BitmapSection<byte, 1> stencil;
     SDFTransformation transformation;
     double minDeviationRatio;
     double minImproveRatio;
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/Shape.h b/Source/ThirdParty/msdfgen/msdfgen/core/Shape.h
index 248b19225..d47b43ac1 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/Shape.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/Shape.h
@@ -3,6 +3,7 @@
 
 #include <vector>
 #include "Contour.h"
+#include "YAxisOrientation.h"
 #include "Scanline.h"
 
 namespace msdfgen {
@@ -15,12 +16,14 @@ class Shape {
 
 public:
     struct Bounds {
+        // NOTE: b is actually the lower Y-coordinate and t the higher Y-coordinate. For Y_DOWNWARD orientation, b is actually the top and t the bottom. May be renamed in a future version.
         double l, b, r, t;
     };
 
     /// The list of contours the shape consists of.
     std::vector<Contour> contours;
     /// Specifies whether the shape uses bottom-to-top (false) or top-to-bottom (true) Y coordinates.
+    /// DEPRECATED - use getYAxisOrientation / setYAxisOrientation instead.
     bool inverseYAxis;
 
     Shape();
@@ -36,9 +39,9 @@ public:
     /// Performs basic checks to determine if the object represents a valid shape.
     bool validate() const;
     /// Adjusts the bounding box to fit the shape.
-    void bound(double &l, double &b, double &r, double &t) const;
+    void bound(double &xMin, double &yMin, double &xMax, double &yMax) const;
     /// Adjusts the bounding box to fit the shape border's mitered corners.
-    void boundMiters(double &l, double &b, double &r, double &t, double border, double miterLimit, int polarity) const;
+    void boundMiters(double &xMin, double &yMin, double &xMax, double &yMax, double border, double miterLimit, int polarity) const;
     /// Computes the minimum bounding box that fits the shape, optionally with a (mitered) border.
     Bounds getBounds(double border = 0, double miterLimit = 0, int polarity = 0) const;
     /// Outputs the scanline that intersects the shape at y.
@@ -47,6 +50,10 @@ public:
     int edgeCount() const;
     /// Assumes its contours are unoriented (even-odd fill rule). Attempts to orient them to conform to the non-zero winding rule.
     void orientContours();
+    /// Returns the orientation of the axis of the shape's Y coordinates.
+    YAxisOrientation getYAxisOrientation() const;
+    /// Sets the orientation of the axis of the shape's Y coordinates.
+    void setYAxisOrientation(YAxisOrientation yAxisOrientation);
 
 };
 
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/YAxisOrientation.h b/Source/ThirdParty/msdfgen/msdfgen/core/YAxisOrientation.h
new file mode 100644
index 000000000..803acdce4
--- /dev/null
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/YAxisOrientation.h
@@ -0,0 +1,17 @@
+
+#pragma once
+
+#include "base.h"
+
+namespace msdfgen {
+
+/// Specifies whether the Y component of the coordinate system increases in the upward or downward direction.
+enum YAxisOrientation {
+    Y_UPWARD,
+    Y_DOWNWARD
+};
+
+}
+
+#define MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION msdfgen::Y_UPWARD
+#define MSDFGEN_Y_AXIS_NONDEFAULT_ORIENTATION (MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION == msdfgen::Y_DOWNWARD ? msdfgen::Y_UPWARD : msdfgen::Y_DOWNWARD)
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/bitmap-interpolation.hpp b/Source/ThirdParty/msdfgen/msdfgen/core/bitmap-interpolation.hpp
index ca2e48c08..3e2576f7b 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/bitmap-interpolation.hpp
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/bitmap-interpolation.hpp
@@ -8,7 +8,9 @@
 namespace msdfgen {
 
 template <typename T, int N>
-static void interpolate(T *output, const BitmapConstRef<T, N> &bitmap, Point2 pos) {
+inline void interpolate(T *output, const BitmapConstSection<T, N> &bitmap, Point2 pos) {
+    pos.x = clamp(pos.x, double(bitmap.width));
+    pos.y = clamp(pos.y, double(bitmap.height));
     pos -= .5;
     int l = (int) floor(pos.x);
     int b = (int) floor(pos.y);
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/edge-segments.h b/Source/ThirdParty/msdfgen/msdfgen/core/edge-segments.h
index 815241685..10b803a28 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/edge-segments.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/edge-segments.h
@@ -42,7 +42,7 @@ public:
     /// Outputs a list of (at most three) intersections (their X coordinates) with an infinite horizontal scanline at y and returns how many there are.
     virtual int scanlineIntersections(double x[3], int dy[3], double y) const = 0;
     /// Adjusts the bounding box to fit the edge segment.
-    virtual void bound(double &l, double &b, double &r, double &t) const = 0;
+    virtual void bound(double &xMin, double &yMin, double &xMax, double &yMax) const = 0;
 
     /// Reverses the edge (swaps its start point and end point).
     virtual void reverse() = 0;
@@ -75,7 +75,7 @@ public:
     double length() const;
     SignedDistance signedDistance(Point2 origin, double &param) const;
     int scanlineIntersections(double x[3], int dy[3], double y) const;
-    void bound(double &l, double &b, double &r, double &t) const;
+    void bound(double &xMin, double &yMin, double &xMax, double &yMax) const;
 
     void reverse();
     void moveStartPoint(Point2 to);
@@ -104,7 +104,7 @@ public:
     double length() const;
     SignedDistance signedDistance(Point2 origin, double &param) const;
     int scanlineIntersections(double x[3], int dy[3], double y) const;
-    void bound(double &l, double &b, double &r, double &t) const;
+    void bound(double &xMin, double &yMin, double &xMax, double &yMax) const;
 
     void reverse();
     void moveStartPoint(Point2 to);
@@ -134,7 +134,7 @@ public:
     Vector2 directionChange(double param) const;
     SignedDistance signedDistance(Point2 origin, double &param) const;
     int scanlineIntersections(double x[3], int dy[3], double y) const;
-    void bound(double &l, double &b, double &r, double &t) const;
+    void bound(double &xMin, double &yMin, double &xMax, double &yMax) const;
 
     void reverse();
     void moveStartPoint(Point2 to);
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/msdf-error-correction.h b/Source/ThirdParty/msdfgen/msdfgen/core/msdf-error-correction.h
index c92cbe17a..3edc2510f 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/msdf-error-correction.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/msdf-error-correction.h
@@ -12,29 +12,29 @@
 namespace msdfgen {
 
 /// Predicts potential artifacts caused by the interpolation of the MSDF and corrects them by converting nearby texels to single-channel.
-void msdfErrorCorrection(const BitmapRef<float, 3> &sdf, const Shape &shape, const SDFTransformation &transformation, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
-void msdfErrorCorrection(const BitmapRef<float, 4> &sdf, const Shape &shape, const SDFTransformation &transformation, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
-void msdfErrorCorrection(const BitmapRef<float, 3> &sdf, const Shape &shape, const Projection &projection, Range range, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
-void msdfErrorCorrection(const BitmapRef<float, 4> &sdf, const Shape &shape, const Projection &projection, Range range, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+void msdfErrorCorrection(const BitmapSection<float, 3> &sdf, const Shape &shape, const SDFTransformation &transformation, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+void msdfErrorCorrection(const BitmapSection<float, 4> &sdf, const Shape &shape, const SDFTransformation &transformation, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+void msdfErrorCorrection(const BitmapSection<float, 3> &sdf, const Shape &shape, const Projection &projection, Range range, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+void msdfErrorCorrection(const BitmapSection<float, 4> &sdf, const Shape &shape, const Projection &projection, Range range, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
 
 /// Applies the simplified error correction to all discontiunous distances (INDISCRIMINATE mode). Does not need shape or translation.
-void msdfFastDistanceErrorCorrection(const BitmapRef<float, 3> &sdf, const SDFTransformation &transformation, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
-void msdfFastDistanceErrorCorrection(const BitmapRef<float, 4> &sdf, const SDFTransformation &transformation, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
-void msdfFastDistanceErrorCorrection(const BitmapRef<float, 3> &sdf, const Projection &projection, Range range, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
-void msdfFastDistanceErrorCorrection(const BitmapRef<float, 4> &sdf, const Projection &projection, Range range, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
-void msdfFastDistanceErrorCorrection(const BitmapRef<float, 3> &sdf, Range pxRange, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
-void msdfFastDistanceErrorCorrection(const BitmapRef<float, 4> &sdf, Range pxRange, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastDistanceErrorCorrection(const BitmapSection<float, 3> &sdf, const SDFTransformation &transformation, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastDistanceErrorCorrection(const BitmapSection<float, 4> &sdf, const SDFTransformation &transformation, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastDistanceErrorCorrection(const BitmapSection<float, 3> &sdf, const Projection &projection, Range range, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastDistanceErrorCorrection(const BitmapSection<float, 4> &sdf, const Projection &projection, Range range, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastDistanceErrorCorrection(const BitmapSection<float, 3> &sdf, Range pxRange, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastDistanceErrorCorrection(const BitmapSection<float, 4> &sdf, Range pxRange, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
 
 /// Applies the simplified error correction to edges only (EDGE_ONLY mode). Does not need shape or translation.
-void msdfFastEdgeErrorCorrection(const BitmapRef<float, 3> &sdf, const SDFTransformation &transformation, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
-void msdfFastEdgeErrorCorrection(const BitmapRef<float, 4> &sdf, const SDFTransformation &transformation, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
-void msdfFastEdgeErrorCorrection(const BitmapRef<float, 3> &sdf, const Projection &projection, Range range, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
-void msdfFastEdgeErrorCorrection(const BitmapRef<float, 4> &sdf, const Projection &projection, Range range, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
-void msdfFastEdgeErrorCorrection(const BitmapRef<float, 3> &sdf, Range pxRange, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
-void msdfFastEdgeErrorCorrection(const BitmapRef<float, 4> &sdf, Range pxRange, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastEdgeErrorCorrection(const BitmapSection<float, 3> &sdf, const SDFTransformation &transformation, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastEdgeErrorCorrection(const BitmapSection<float, 4> &sdf, const SDFTransformation &transformation, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastEdgeErrorCorrection(const BitmapSection<float, 3> &sdf, const Projection &projection, Range range, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastEdgeErrorCorrection(const BitmapSection<float, 4> &sdf, const Projection &projection, Range range, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastEdgeErrorCorrection(const BitmapSection<float, 3> &sdf, Range pxRange, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
+void msdfFastEdgeErrorCorrection(const BitmapSection<float, 4> &sdf, Range pxRange, double minDeviationRatio = ErrorCorrectionConfig::defaultMinDeviationRatio);
 
 /// The original version of the error correction algorithm.
-void msdfErrorCorrection_legacy(const BitmapRef<float, 3> &output, const Vector2 &threshold);
-void msdfErrorCorrection_legacy(const BitmapRef<float, 4> &output, const Vector2 &threshold);
+void msdfErrorCorrection_legacy(const BitmapSection<float, 3> &output, const Vector2 &threshold);
+void msdfErrorCorrection_legacy(const BitmapSection<float, 4> &output, const Vector2 &threshold);
 
 }
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/rasterization.h b/Source/ThirdParty/msdfgen/msdfgen/core/rasterization.h
index 8ba41cd64..876a87bdc 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/rasterization.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/rasterization.h
@@ -10,16 +10,19 @@
 namespace msdfgen {
 
 /// Rasterizes the shape into a monochrome bitmap.
-void rasterize(const BitmapRef<float, 1> &output, const Shape &shape, const Projection &projection, FillRule fillRule = FILL_NONZERO);
+void rasterize(BitmapSection<float, 1> output, const Shape &shape, const Projection &projection, FillRule fillRule = FILL_NONZERO);
 /// Fixes the sign of the input signed distance field, so that it matches the shape's rasterized fill.
-void distanceSignCorrection(const BitmapRef<float, 1> &sdf, const Shape &shape, const Projection &projection, FillRule fillRule = FILL_NONZERO);
-void distanceSignCorrection(const BitmapRef<float, 3> &sdf, const Shape &shape, const Projection &projection, FillRule fillRule = FILL_NONZERO);
-void distanceSignCorrection(const BitmapRef<float, 4> &sdf, const Shape &shape, const Projection &projection, FillRule fillRule = FILL_NONZERO);
+void distanceSignCorrection(BitmapSection<float, 1> sdf, const Shape &shape, const Projection &projection, float sdfZeroValue = .5f, FillRule fillRule = FILL_NONZERO);
+void distanceSignCorrection(BitmapSection<float, 3> sdf, const Shape &shape, const Projection &projection, float sdfZeroValue = .5f, FillRule fillRule = FILL_NONZERO);
+void distanceSignCorrection(BitmapSection<float, 4> sdf, const Shape &shape, const Projection &projection, float sdfZeroValue = .5f, FillRule fillRule = FILL_NONZERO);
 
-// Old version of the function API's kept for backwards compatibility
-void rasterize(const BitmapRef<float, 1> &output, const Shape &shape, const Vector2 &scale, const Vector2 &translate, FillRule fillRule = FILL_NONZERO);
-void distanceSignCorrection(const BitmapRef<float, 1> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, FillRule fillRule = FILL_NONZERO);
-void distanceSignCorrection(const BitmapRef<float, 3> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, FillRule fillRule = FILL_NONZERO);
-void distanceSignCorrection(const BitmapRef<float, 4> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, FillRule fillRule = FILL_NONZERO);
+// Old versions of the function API's kept for backwards compatibility
+void rasterize(const BitmapSection<float, 1> &output, const Shape &shape, const Vector2 &scale, const Vector2 &translate, FillRule fillRule = FILL_NONZERO);
+void distanceSignCorrection(BitmapSection<float, 1> sdf, const Shape &shape, const Projection &projection, FillRule fillRule);
+void distanceSignCorrection(BitmapSection<float, 3> sdf, const Shape &shape, const Projection &projection, FillRule fillRule);
+void distanceSignCorrection(BitmapSection<float, 4> sdf, const Shape &shape, const Projection &projection, FillRule fillRule);
+void distanceSignCorrection(const BitmapSection<float, 1> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, FillRule fillRule = FILL_NONZERO);
+void distanceSignCorrection(const BitmapSection<float, 3> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, FillRule fillRule = FILL_NONZERO);
+void distanceSignCorrection(const BitmapSection<float, 4> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, FillRule fillRule = FILL_NONZERO);
 
 }
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/render-sdf.h b/Source/ThirdParty/msdfgen/msdfgen/core/render-sdf.h
index e8ee46c55..b61823ad0 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/render-sdf.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/render-sdf.h
@@ -8,16 +8,16 @@
 namespace msdfgen {
 
 /// Reconstructs the shape's appearance into output from the distance field sdf.
-void renderSDF(const BitmapRef<float, 1> &output, const BitmapConstRef<float, 1> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
-void renderSDF(const BitmapRef<float, 3> &output, const BitmapConstRef<float, 1> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
-void renderSDF(const BitmapRef<float, 1> &output, const BitmapConstRef<float, 3> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
-void renderSDF(const BitmapRef<float, 3> &output, const BitmapConstRef<float, 3> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
-void renderSDF(const BitmapRef<float, 1> &output, const BitmapConstRef<float, 4> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
-void renderSDF(const BitmapRef<float, 4> &output, const BitmapConstRef<float, 4> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
+void renderSDF(const BitmapSection<float, 1> &output, const BitmapConstSection<float, 1> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
+void renderSDF(const BitmapSection<float, 3> &output, const BitmapConstSection<float, 1> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
+void renderSDF(const BitmapSection<float, 1> &output, const BitmapConstSection<float, 3> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
+void renderSDF(const BitmapSection<float, 3> &output, const BitmapConstSection<float, 3> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
+void renderSDF(const BitmapSection<float, 1> &output, const BitmapConstSection<float, 4> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
+void renderSDF(const BitmapSection<float, 4> &output, const BitmapConstSection<float, 4> &sdf, Range sdfPxRange = 0, float sdThreshold = .5f);
 
 /// Snaps the values of the floating-point bitmaps into one of the 256 values representable in a standard 8-bit bitmap.
-void simulate8bit(const BitmapRef<float, 1> &bitmap);
-void simulate8bit(const BitmapRef<float, 3> &bitmap);
-void simulate8bit(const BitmapRef<float, 4> &bitmap);
+void simulate8bit(const BitmapSection<float, 1> &bitmap);
+void simulate8bit(const BitmapSection<float, 3> &bitmap);
+void simulate8bit(const BitmapSection<float, 4> &bitmap);
 
 }
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/save-bmp.h b/Source/ThirdParty/msdfgen/msdfgen/core/save-bmp.h
index 98f852921..286727558 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/save-bmp.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/save-bmp.h
@@ -6,11 +6,11 @@
 namespace msdfgen {
 
 /// Saves the bitmap as a BMP file.
-bool saveBmp(const BitmapConstRef<byte, 1> &bitmap, const char *filename);
-bool saveBmp(const BitmapConstRef<byte, 3> &bitmap, const char *filename);
-bool saveBmp(const BitmapConstRef<byte, 4> &bitmap, const char *filename);
-bool saveBmp(const BitmapConstRef<float, 1> &bitmap, const char *filename);
-bool saveBmp(const BitmapConstRef<float, 3> &bitmap, const char *filename);
-bool saveBmp(const BitmapConstRef<float, 4> &bitmap, const char *filename);
+bool saveBmp(BitmapConstSection<byte, 1> bitmap, const char *filename);
+bool saveBmp(BitmapConstSection<byte, 3> bitmap, const char *filename);
+bool saveBmp(BitmapConstSection<byte, 4> bitmap, const char *filename);
+bool saveBmp(BitmapConstSection<float, 1> bitmap, const char *filename);
+bool saveBmp(BitmapConstSection<float, 3> bitmap, const char *filename);
+bool saveBmp(BitmapConstSection<float, 4> bitmap, const char *filename);
 
 }
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/save-fl32.h b/Source/ThirdParty/msdfgen/msdfgen/core/save-fl32.h
index eded7f336..473e0c04f 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/save-fl32.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/save-fl32.h
@@ -7,6 +7,6 @@ namespace msdfgen {
 
 /// Saves the bitmap as an uncompressed floating-point FL32 file, which can be decoded trivially.
 template <int N>
-bool saveFl32(const BitmapConstRef<float, N> &bitmap, const char *filename);
+bool saveFl32(BitmapConstSection<float, N> bitmap, const char *filename);
 
 }
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/save-rgba.h b/Source/ThirdParty/msdfgen/msdfgen/core/save-rgba.h
index 50e839645..45a6bb6ac 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/save-rgba.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/save-rgba.h
@@ -6,11 +6,11 @@
 namespace msdfgen {
 
 /// Saves the bitmap as a simple RGBA file, which can be decoded trivially.
-bool saveRgba(const BitmapConstRef<byte, 1> &bitmap, const char *filename);
-bool saveRgba(const BitmapConstRef<byte, 3> &bitmap, const char *filename);
-bool saveRgba(const BitmapConstRef<byte, 4> &bitmap, const char *filename);
-bool saveRgba(const BitmapConstRef<float, 1> &bitmap, const char *filename);
-bool saveRgba(const BitmapConstRef<float, 3> &bitmap, const char *filename);
-bool saveRgba(const BitmapConstRef<float, 4> &bitmap, const char *filename);
+bool saveRgba(BitmapConstSection<byte, 1> bitmap, const char *filename);
+bool saveRgba(BitmapConstSection<byte, 3> bitmap, const char *filename);
+bool saveRgba(BitmapConstSection<byte, 4> bitmap, const char *filename);
+bool saveRgba(BitmapConstSection<float, 1> bitmap, const char *filename);
+bool saveRgba(BitmapConstSection<float, 3> bitmap, const char *filename);
+bool saveRgba(BitmapConstSection<float, 4> bitmap, const char *filename);
 
 }
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/save-tiff.h b/Source/ThirdParty/msdfgen/msdfgen/core/save-tiff.h
index 072cd71d5..7884fc9a3 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/save-tiff.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/save-tiff.h
@@ -6,8 +6,8 @@
 namespace msdfgen {
 
 /// Saves the bitmap as an uncompressed floating-point TIFF file.
-bool saveTiff(const BitmapConstRef<float, 1> &bitmap, const char *filename);
-bool saveTiff(const BitmapConstRef<float, 3> &bitmap, const char *filename);
-bool saveTiff(const BitmapConstRef<float, 4> &bitmap, const char *filename);
+bool saveTiff(const BitmapConstSection<float, 1> &bitmap, const char *filename);
+bool saveTiff(const BitmapConstSection<float, 3> &bitmap, const char *filename);
+bool saveTiff(const BitmapConstSection<float, 4> &bitmap, const char *filename);
 
 }
diff --git a/Source/ThirdParty/msdfgen/msdfgen/core/sdf-error-estimation.h b/Source/ThirdParty/msdfgen/msdfgen/core/sdf-error-estimation.h
index f9008222a..a669c5955 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/core/sdf-error-estimation.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/core/sdf-error-estimation.h
@@ -10,21 +10,24 @@
 namespace msdfgen {
 
 /// Analytically constructs a scanline at y evaluating fill by linear interpolation of the SDF.
-void scanlineSDF(Scanline &line, const BitmapConstRef<float, 1> &sdf, const Projection &projection, double y, bool inverseYAxis = false);
-void scanlineSDF(Scanline &line, const BitmapConstRef<float, 3> &sdf, const Projection &projection, double y, bool inverseYAxis = false);
-void scanlineSDF(Scanline &line, const BitmapConstRef<float, 4> &sdf, const Projection &projection, double y, bool inverseYAxis = false);
+void scanlineSDF(Scanline &line, const BitmapConstSection<float, 1> &sdf, const Projection &projection, double y, YAxisOrientation yAxisOrientation = MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION);
+void scanlineSDF(Scanline &line, const BitmapConstSection<float, 3> &sdf, const Projection &projection, double y, YAxisOrientation yAxisOrientation = MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION);
+void scanlineSDF(Scanline &line, const BitmapConstSection<float, 4> &sdf, const Projection &projection, double y, YAxisOrientation yAxisOrientation = MSDFGEN_Y_AXIS_DEFAULT_ORIENTATION);
 
 /// Estimates the portion of the area that will be filled incorrectly when rendering using the SDF.
-double estimateSDFError(const BitmapConstRef<float, 1> &sdf, const Shape &shape, const Projection &projection, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
-double estimateSDFError(const BitmapConstRef<float, 3> &sdf, const Shape &shape, const Projection &projection, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
-double estimateSDFError(const BitmapConstRef<float, 4> &sdf, const Shape &shape, const Projection &projection, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
+double estimateSDFError(const BitmapConstSection<float, 1> &sdf, const Shape &shape, const Projection &projection, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
+double estimateSDFError(const BitmapConstSection<float, 3> &sdf, const Shape &shape, const Projection &projection, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
+double estimateSDFError(const BitmapConstSection<float, 4> &sdf, const Shape &shape, const Projection &projection, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
 
 // Old version of the function API's kept for backwards compatibility
-void scanlineSDF(Scanline &line, const BitmapConstRef<float, 1> &sdf, const Vector2 &scale, const Vector2 &translate, bool inverseYAxis, double y);
-void scanlineSDF(Scanline &line, const BitmapConstRef<float, 3> &sdf, const Vector2 &scale, const Vector2 &translate, bool inverseYAxis, double y);
-void scanlineSDF(Scanline &line, const BitmapConstRef<float, 4> &sdf, const Vector2 &scale, const Vector2 &translate, bool inverseYAxis, double y);
-double estimateSDFError(const BitmapConstRef<float, 1> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
-double estimateSDFError(const BitmapConstRef<float, 3> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
-double estimateSDFError(const BitmapConstRef<float, 4> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
+void scanlineSDF(Scanline &line, const BitmapConstSection<float, 1> &sdf, const Projection &projection, double y, bool inverseYAxis);
+void scanlineSDF(Scanline &line, const BitmapConstSection<float, 3> &sdf, const Projection &projection, double y, bool inverseYAxis);
+void scanlineSDF(Scanline &line, const BitmapConstSection<float, 4> &sdf, const Projection &projection, double y, bool inverseYAxis);
+void scanlineSDF(Scanline &line, const BitmapConstSection<float, 1> &sdf, const Vector2 &scale, const Vector2 &translate, bool inverseYAxis, double y);
+void scanlineSDF(Scanline &line, const BitmapConstSection<float, 3> &sdf, const Vector2 &scale, const Vector2 &translate, bool inverseYAxis, double y);
+void scanlineSDF(Scanline &line, const BitmapConstSection<float, 4> &sdf, const Vector2 &scale, const Vector2 &translate, bool inverseYAxis, double y);
+double estimateSDFError(const BitmapConstSection<float, 1> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
+double estimateSDFError(const BitmapConstSection<float, 3> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
+double estimateSDFError(const BitmapConstSection<float, 4> &sdf, const Shape &shape, const Vector2 &scale, const Vector2 &translate, int scanlinesPerRow, FillRule fillRule = FILL_NONZERO);
 
 }
diff --git a/Source/ThirdParty/msdfgen/msdfgen/msdfgen-config.h b/Source/ThirdParty/msdfgen/msdfgen/msdfgen-config.h
index ebcd5942f..ab36f7791 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/msdfgen-config.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/msdfgen-config.h
@@ -4,10 +4,10 @@
 #define MSDFGEN_PUBLIC
 #define MSDFGEN_EXT_PUBLIC
 
-#define MSDFGEN_VERSION 1.12.1
+#define MSDFGEN_VERSION 1.13.0
 #define MSDFGEN_VERSION_MAJOR 1
-#define MSDFGEN_VERSION_MINOR 12
-#define MSDFGEN_VERSION_REVISION 1
-#define MSDFGEN_COPYRIGHT_YEAR 2025
+#define MSDFGEN_VERSION_MINOR 13
+#define MSDFGEN_VERSION_REVISION 0
+#define MSDFGEN_COPYRIGHT_YEAR 2026
 
 #define MSDFGEN_USE_CPP11
diff --git a/Source/ThirdParty/msdfgen/msdfgen/msdfgen.h b/Source/ThirdParty/msdfgen/msdfgen/msdfgen.h
index e5dd67260..bf0ae2bad 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/msdfgen.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/msdfgen.h
@@ -44,35 +44,35 @@
 namespace msdfgen {
 
 /// Generates a conventional single-channel signed distance field.
-void generateSDF(const BitmapRef<float, 1> &output, const Shape &shape, const SDFTransformation &transformation, const GeneratorConfig &config = GeneratorConfig());
+void generateSDF(const BitmapSection<float, 1> &output, const Shape &shape, const SDFTransformation &transformation, const GeneratorConfig &config = GeneratorConfig());
 
 /// Generates a single-channel signed perpendicular distance field.
-void generatePSDF(const BitmapRef<float, 1> &output, const Shape &shape, const SDFTransformation &transformation, const GeneratorConfig &config = GeneratorConfig());
+void generatePSDF(const BitmapSection<float, 1> &output, const Shape &shape, const SDFTransformation &transformation, const GeneratorConfig &config = GeneratorConfig());
 
 /// Generates a multi-channel signed distance field. Edge colors must be assigned first! (See edgeColoringSimple)
-void generateMSDF(const BitmapRef<float, 3> &output, const Shape &shape, const SDFTransformation &transformation, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+void generateMSDF(const BitmapSection<float, 3> &output, const Shape &shape, const SDFTransformation &transformation, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
 
 /// Generates a multi-channel signed distance field with true distance in the alpha channel. Edge colors must be assigned first.
-void generateMTSDF(const BitmapRef<float, 4> &output, const Shape &shape, const SDFTransformation &transformation, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+void generateMTSDF(const BitmapSection<float, 4> &output, const Shape &shape, const SDFTransformation &transformation, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
 
 // Old version of the function API's kept for backwards compatibility
-void generateSDF(const BitmapRef<float, 1> &output, const Shape &shape, const Projection &projection, Range range, const GeneratorConfig &config = GeneratorConfig());
-void generatePSDF(const BitmapRef<float, 1> &output, const Shape &shape, const Projection &projection, Range range, const GeneratorConfig &config = GeneratorConfig());
-void generatePseudoSDF(const BitmapRef<float, 1> &output, const Shape &shape, const Projection &projection, Range range, const GeneratorConfig &config = GeneratorConfig());
-void generateMSDF(const BitmapRef<float, 3> &output, const Shape &shape, const Projection &projection, Range range, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
-void generateMTSDF(const BitmapRef<float, 4> &output, const Shape &shape, const Projection &projection, Range range, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+void generateSDF(const BitmapSection<float, 1> &output, const Shape &shape, const Projection &projection, Range range, const GeneratorConfig &config = GeneratorConfig());
+void generatePSDF(const BitmapSection<float, 1> &output, const Shape &shape, const Projection &projection, Range range, const GeneratorConfig &config = GeneratorConfig());
+void generatePseudoSDF(const BitmapSection<float, 1> &output, const Shape &shape, const Projection &projection, Range range, const GeneratorConfig &config = GeneratorConfig());
+void generateMSDF(const BitmapSection<float, 3> &output, const Shape &shape, const Projection &projection, Range range, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
+void generateMTSDF(const BitmapSection<float, 4> &output, const Shape &shape, const Projection &projection, Range range, const MSDFGeneratorConfig &config = MSDFGeneratorConfig());
 
-void generateSDF(const BitmapRef<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, bool overlapSupport = true);
-void generatePSDF(const BitmapRef<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, bool overlapSupport = true);
-void generatePseudoSDF(const BitmapRef<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, bool overlapSupport = true);
-void generateMSDF(const BitmapRef<float, 3> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, const ErrorCorrectionConfig &errorCorrectionConfig = ErrorCorrectionConfig(), bool overlapSupport = true);
-void generateMTSDF(const BitmapRef<float, 4> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, const ErrorCorrectionConfig &errorCorrectionConfig = ErrorCorrectionConfig(), bool overlapSupport = true);
+void generateSDF(const BitmapSection<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, bool overlapSupport = true);
+void generatePSDF(const BitmapSection<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, bool overlapSupport = true);
+void generatePseudoSDF(const BitmapSection<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, bool overlapSupport = true);
+void generateMSDF(const BitmapSection<float, 3> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, const ErrorCorrectionConfig &errorCorrectionConfig = ErrorCorrectionConfig(), bool overlapSupport = true);
+void generateMTSDF(const BitmapSection<float, 4> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, const ErrorCorrectionConfig &errorCorrectionConfig = ErrorCorrectionConfig(), bool overlapSupport = true);
 
 // Original simpler versions of the previous functions, which work well under normal circumstances, but cannot deal with overlapping contours.
-void generateSDF_legacy(const BitmapRef<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate);
-void generatePSDF_legacy(const BitmapRef<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate);
-void generatePseudoSDF_legacy(const BitmapRef<float, 1> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate);
-void generateMSDF_legacy(const BitmapRef<float, 3> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, ErrorCorrectionConfig errorCorrectionConfig = ErrorCorrectionConfig());
-void generateMTSDF_legacy(const BitmapRef<float, 4> &output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, ErrorCorrectionConfig errorCorrectionConfig = ErrorCorrectionConfig());
+void generateSDF_legacy(BitmapSection<float, 1> output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate);
+void generatePSDF_legacy(BitmapSection<float, 1> output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate);
+void generatePseudoSDF_legacy(BitmapSection<float, 1> output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate);
+void generateMSDF_legacy(BitmapSection<float, 3> output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, ErrorCorrectionConfig errorCorrectionConfig = ErrorCorrectionConfig());
+void generateMTSDF_legacy(BitmapSection<float, 4> output, const Shape &shape, Range range, const Vector2 &scale, const Vector2 &translate, ErrorCorrectionConfig errorCorrectionConfig = ErrorCorrectionConfig());
 
 }
diff --git a/Source/ThirdParty/msdfgen/msdfgen/msdfgen/msdfgen-config.h b/Source/ThirdParty/msdfgen/msdfgen/msdfgen/msdfgen-config.h
index ebcd5942f..ab36f7791 100644
--- a/Source/ThirdParty/msdfgen/msdfgen/msdfgen/msdfgen-config.h
+++ b/Source/ThirdParty/msdfgen/msdfgen/msdfgen/msdfgen-config.h
@@ -4,10 +4,10 @@
 #define MSDFGEN_PUBLIC
 #define MSDFGEN_EXT_PUBLIC
 
-#define MSDFGEN_VERSION 1.12.1
+#define MSDFGEN_VERSION 1.13.0
 #define MSDFGEN_VERSION_MAJOR 1
-#define MSDFGEN_VERSION_MINOR 12
-#define MSDFGEN_VERSION_REVISION 1
-#define MSDFGEN_COPYRIGHT_YEAR 2025
+#define MSDFGEN_VERSION_MINOR 13
+#define MSDFGEN_VERSION_REVISION 0
+#define MSDFGEN_COPYRIGHT_YEAR 2026
 
 #define MSDFGEN_USE_CPP11
diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs b/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
index 31f61d873..1829f9ff0 100644
--- a/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
@@ -90,7 +90,7 @@ namespace Flax.Deps.Dependencies
             var cmakeArgs = string.Join(" ", args);
 
             // Get the source
-            CloneGitRepoSingleBranch(root, "https://github.com/Chlumsky/msdfgen.git", "master", "a4dafbac1c29021613fbc89768963f3a7e2105aa");
+            CloneGitRepoSingleBranch(root, "https://github.com/Chlumsky/msdfgen.git", "master", "1874bcf7d9624ccc85b4bc9a85d78116f690f35b");
 
             foreach (var platform in options.Platforms)
             {

From 0612b923e16fc471b68332cbfa13621ae47ed09f Mon Sep 17 00:00:00 2001
From: fibref <fibref_233@outlook.com>
Date: Mon, 16 Feb 2026 19:52:12 +0800
Subject: [PATCH 085/203] fix msdf font layout issue

---
 Source/Engine/Render2D/FontManager.cpp | 7 +++++--
 Source/Engine/Render2D/MSDFGenerator.h | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Source/Engine/Render2D/FontManager.cpp b/Source/Engine/Render2D/FontManager.cpp
index 2c75a6f23..7376173f8 100644
--- a/Source/Engine/Render2D/FontManager.cpp
+++ b/Source/Engine/Render2D/FontManager.cpp
@@ -258,6 +258,10 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
     {
         // Generate bitmap for MSDF
         FT_GlyphSlot glyph = face->glyph;
+
+        // Set advance in advance
+        entry.AdvanceX = Convert26Dot6ToRoundedPixel<int16>(glyph->advance.x);
+
         int16 msdf_top = 0;
         int16 msdf_left = 0;
         MSDFGenerator::GenerateMSDF(glyph, GlyphImageData, glyphWidth, glyphHeight, msdf_top, msdf_left);
@@ -268,8 +272,7 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
             return false;
         }
 
-        // Fill the character data
-        entry.AdvanceX = Convert26Dot6ToRoundedPixel<int16>(glyph->advance.x);
+        // Fill the remaining character data
         entry.OffsetY = msdf_top;
         entry.OffsetX = msdf_left;
         entry.IsValid = true;
diff --git a/Source/Engine/Render2D/MSDFGenerator.h b/Source/Engine/Render2D/MSDFGenerator.h
index 4db941211..0ac431878 100644
--- a/Source/Engine/Render2D/MSDFGenerator.h
+++ b/Source/Engine/Render2D/MSDFGenerator.h
@@ -124,6 +124,6 @@ public:
         outputWidth = width;
         outputHeight = height;
         top = static_cast<int16>(Math::CeilToInt(bounds.t + pxRange / 2.0));
-        left = static_cast<int16>(Math::FloorToInt(bounds.l + pxRange / 2.0));
+        left = static_cast<int16>(Math::FloorToInt(bounds.l - pxRange / 2.0));
     }
 };

From be4e1edc3ee72838c0e9f304da14f36fd6317cc8 Mon Sep 17 00:00:00 2001
From: fibref <fibref_233@outlook.com>
Date: Thu, 19 Feb 2026 15:12:25 +0800
Subject: [PATCH 086/203] fix flipped color of MSDF fonts

---
 Source/Engine/Render2D/MSDFGenerator.h | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Source/Engine/Render2D/MSDFGenerator.h b/Source/Engine/Render2D/MSDFGenerator.h
index 0ac431878..5af337d1f 100644
--- a/Source/Engine/Render2D/MSDFGenerator.h
+++ b/Source/Engine/Render2D/MSDFGenerator.h
@@ -6,6 +6,7 @@
 #include "Engine/Core/Math/Math.h"
 #include <ThirdParty/freetype/ftoutln.h>
 #include <ThirdParty/msdfgen/msdfgen.h>
+#include <ThirdParty/msdfgen/msdfgen/core/ShapeDistanceFinder.h>
 
 class MSDFGenerator
 {
@@ -72,6 +73,17 @@ class MSDFGenerator
         return 0;
     }
 
+    static void correctWinding(Shape& shape, Shape::Bounds& bounds)
+    {
+        Point2 p(bounds.l - (bounds.r - bounds.l) - 1, bounds.b - (bounds.t - bounds.b) - 1);
+        double distance = msdfgen::SimpleTrueShapeDistanceFinder::oneShotDistance(shape, p);
+        if (distance > 0)
+        {
+            for (auto& contour : shape.contours)
+                contour.reverse();
+        }
+    }
+
 public:
     static void GenerateMSDF(FT_GlyphSlot glyph, Array<byte>& output, int32& outputWidth, int32& outputHeight, int16& top, int16& left)
     {
@@ -98,7 +110,7 @@ public:
         // Also hard-coded in material: MSDFFontMaterial
         const double pxRange = 4.0;
 
-        msdfgen::Shape::Bounds bounds = shape.getBounds();
+        Shape::Bounds bounds = shape.getBounds();
         int32 width = static_cast<int32>(Math::CeilToInt(bounds.r - bounds.l + pxRange));
         int32 height = static_cast<int32>(Math::CeilToInt(bounds.t - bounds.b + pxRange));
         msdfgen::Bitmap<float, 4> msdf(width, height);
@@ -106,6 +118,7 @@ public:
         msdfgen::SDFTransformation t(
             msdfgen::Projection(1.0, msdfgen::Vector2(-bounds.l + pxRange / 2.0, -bounds.b + pxRange / 2.0)), msdfgen::Range(pxRange)
         );
+        correctWinding(shape, bounds);
         generateMTSDF(msdf, shape, t);
 
         output.Resize(width * height * 4);

From 0f49503abd96bd24b5737ff335574c0d5425c2da Mon Sep 17 00:00:00 2001
From: fibref <fibref_233@outlook.com>
Date: Thu, 19 Feb 2026 15:41:48 +0800
Subject: [PATCH 087/203] add native MSDF font support for Render2D

---
 Source/Engine/Render2D/Render2D.cpp | 26 ++++++++++++++++++++++++--
 Source/Shaders/GUI.shader           | 24 ++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/Render2D/Render2D.cpp b/Source/Engine/Render2D/Render2D.cpp
index 5ae034bc5..21dc829ee 100644
--- a/Source/Engine/Render2D/Render2D.cpp
+++ b/Source/Engine/Render2D/Render2D.cpp
@@ -2,6 +2,7 @@
 
 #include "Render2D.h"
 #include "Font.h"
+#include "FontAsset.h"
 #include "FontManager.h"
 #include "FontTextureAtlas.h"
 #include "RotatedRectangle.h"
@@ -74,6 +75,7 @@ enum class DrawCallType : byte
     FillTexture,
     FillTexturePoint,
     DrawChar,
+    DrawCharMSDF,
     DrawCharMaterial,
     Custom,
     Material,
@@ -164,6 +166,7 @@ struct CachedPSO
     GPUPipelineState* PS_Color_NoAlpha;
 
     GPUPipelineState* PS_Font;
+    GPUPipelineState* PS_FontMSDF;
 
     GPUPipelineState* PS_BlurH;
     GPUPipelineState* PS_BlurV;
@@ -455,6 +458,7 @@ CanDrawCallCallback CanDrawCallBatch[] =
     CanDrawCallCallbackTexture, // FillTexture,
     CanDrawCallCallbackTexture, // FillTexturePoint,
     CanDrawCallCallbackChar, // DrawChar,
+    CanDrawCallCallbackChar, // DrawCharMSDF,
     CanDrawCallCallbackCharMaterial, // DrawCharMaterial,
     CanDrawCallCallbackFalse, // Custom,
     CanDrawCallCallbackMaterial, // Material,
@@ -517,6 +521,12 @@ bool CachedPSO::Init(GPUShader* shader, bool useDepth)
     if (PS_Font->Init(desc))
         return true;
     //
+    desc.BlendMode = BlendingMode::AlphaBlend;
+    desc.PS = shader->GetPS("PS_FontMSDF");
+    PS_FontMSDF = GPUDevice::Instance->CreatePipelineState();
+    if (PS_FontMSDF->Init(desc))
+        return true;
+    //
     desc.PS = shader->GetPS("PS_LineAA");
     PS_LineAA = GPUDevice::Instance->CreatePipelineState();
     if (PS_LineAA->Init(desc))
@@ -994,6 +1004,10 @@ void DrawBatch(int32 startIndex, int32 count)
         Context->BindSR(0, d.AsChar.Tex);
         Context->SetState(CurrentPso->PS_Font);
         break;
+    case DrawCallType::DrawCharMSDF:
+        Context->BindSR(0, d.AsChar.Tex);
+        Context->SetState(CurrentPso->PS_FontMSDF);
+        break;
     case DrawCallType::DrawCharMaterial:
     {
         // Apply and bind material
@@ -1176,6 +1190,10 @@ void Render2D::DrawText(Font* font, const StringView& text, const Color& color,
     float scale = 1.0f / FontManager::FontScale;
     const bool enableFallbackFonts = EnumHasAllFlags(Features, RenderingFeatures::FallbackFonts);
 
+    const FontAsset* asset = font->GetAsset();
+    const FontOptions& options = asset->GetOptions();
+    const bool useMSDF = options.RasterMode == FontRasterMode::MSDF;
+
     // Render all characters
     FontCharacterEntry entry;
     Render2DDrawCall drawCall;
@@ -1186,7 +1204,7 @@ void Render2D::DrawText(Font* font, const StringView& text, const Color& color,
     }
     else
     {
-        drawCall.Type = DrawCallType::DrawChar;
+        drawCall.Type = useMSDF ? DrawCallType::DrawCharMSDF : DrawCallType::DrawChar;
         drawCall.AsChar.Mat = nullptr;
     }
     Float2 pointer = location;
@@ -1291,6 +1309,10 @@ void Render2D::DrawText(Font* font, const StringView& text, const Color& color,
     float scale = layout.Scale / FontManager::FontScale;
     const bool enableFallbackFonts = EnumHasAllFlags(Features, RenderingFeatures::FallbackFonts);
 
+    const FontAsset* asset = font->GetAsset();
+    const FontOptions& options = asset->GetOptions();
+    const bool useMSDF = options.RasterMode == FontRasterMode::MSDF;
+
     // Process text to get lines
     Lines.Clear();
     font->ProcessText(text, Lines, layout);
@@ -1305,7 +1327,7 @@ void Render2D::DrawText(Font* font, const StringView& text, const Color& color,
     }
     else
     {
-        drawCall.Type = DrawCallType::DrawChar;
+        drawCall.Type = useMSDF ? DrawCallType::DrawCharMSDF : DrawCallType::DrawChar;
         drawCall.AsChar.Mat = nullptr;
     }
     for (int32 lineIndex = 0; lineIndex < Lines.Count(); lineIndex++)
diff --git a/Source/Shaders/GUI.shader b/Source/Shaders/GUI.shader
index e9eedd4a6..b09a3474d 100644
--- a/Source/Shaders/GUI.shader
+++ b/Source/Shaders/GUI.shader
@@ -96,6 +96,30 @@ float4 PS_Font(VS2PS input) : SV_Target0
 	return color;
 }
 
+META_PS(true, FEATURE_LEVEL_ES2)
+float4 PS_FontMSDF(VS2PS input) : SV_Target0
+{
+	PerformClipping(input);
+
+	float4 color = input.Color;
+	float3 msd = Image.Sample(SamplerLinearClamp, input.TexCoord).rgb;
+    float sd = max(min(msd.r, msd.g), min(max(msd.r, msd.g), msd.b));
+
+    uint width, height;
+    Image.GetDimensions(width, height);
+    float pxRange = 4.0f; // Must match C++ code
+    float unitRange = float2(pxRange, pxRange) / float2(width, height);
+
+    float2 dx = ddx(input.TexCoord);
+    float2 dy = ddy(input.TexCoord);
+    float2 screenTexSize = rsqrt(dx * dx + dy * dy);
+    float screenPxRange = max(0.5f * dot(screenTexSize, unitRange), 1.0f);
+    float screenPxDist = screenPxRange * (sd - 0.5f);
+
+    float opacity = saturate(screenPxDist + 0.5f);
+	return float4(color.rgb, opacity);
+}
+
 float4 GetSample(float weight, float offset, float2 uv)
 {
 #if BLUR_V

From 83bd1deafdd63f9c6968fe8bb90b3aa90cf7a82b Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Mon, 23 Feb 2026 16:53:17 +0100
Subject: [PATCH 088/203] Optimize shadow maps rendering by using new
 `Graphics.Shadows.MinObjectPixelSize` to skip sub-pixel objects

---
 Source/Engine/Foliage/Foliage.cpp     | 153 +++++++++++++++-----------
 Source/Engine/Foliage/Foliage.h       |  20 +++-
 Source/Engine/Foliage/FoliageType.h   |   1 +
 Source/Engine/Graphics/Graphics.cpp   |   1 +
 Source/Engine/Graphics/Graphics.h     |  11 +-
 Source/Engine/Renderer/RenderList.cpp |   4 +-
 6 files changed, 117 insertions(+), 73 deletions(-)

diff --git a/Source/Engine/Foliage/Foliage.cpp b/Source/Engine/Foliage/Foliage.cpp
index 116866848..efe89bf5c 100644
--- a/Source/Engine/Foliage/Foliage.cpp
+++ b/Source/Engine/Foliage/Foliage.cpp
@@ -6,14 +6,13 @@
 #include "Engine/Core/Log.h"
 #include "Engine/Core/Random.h"
 #include "Engine/Engine/Engine.h"
+#include "Engine/Graphics/Graphics.h"
 #include "Engine/Graphics/RenderTask.h"
+#include "Engine/Graphics/RenderTools.h"
 #include "Engine/Graphics/GPUDevice.h"
 #include "Engine/Content/Deprecated.h"
 #if !FOLIAGE_USE_SINGLE_QUAD_TREE
 #include "Engine/Threading/JobSystem.h"
-#if FOLIAGE_USE_DRAW_CALLS_BATCHING
-#include "Engine/Graphics/RenderTools.h"
-#endif
 #endif
 #include "Engine/Level/SceneQuery.h"
 #include "Engine/Profiler/ProfilerCPU.h"
@@ -125,7 +124,7 @@ void Foliage::AddToCluster(ChunkedArray<FoliageCluster, FOLIAGE_CLUSTER_CHUNKS_S
 
 #if !FOLIAGE_USE_SINGLE_QUAD_TREE && FOLIAGE_USE_DRAW_CALLS_BATCHING
 
-void Foliage::DrawInstance(RenderContext& renderContext, FoliageInstance& instance, const FoliageType& type, Model* model, int32 lod, float lodDitherFactor, DrawCallsList* drawCallsLists, BatchedDrawCalls& result) const
+void Foliage::DrawInstance(DrawContext& context, FoliageInstance& instance, Model* model, int32 lod, float lodDitherFactor, DrawCallsList* drawCallsLists, BatchedDrawCalls& result) const
 {
     const auto& meshes = model->LODs.Get()[lod].Meshes;
     for (int32 meshIndex = 0; meshIndex < meshes.Count(); meshIndex++)
@@ -141,7 +140,7 @@ void Foliage::DrawInstance(RenderContext& renderContext, FoliageInstance& instan
         auto* e = result.TryGet(key);
         if (!e)
         {
-            e = &result.Add(key, BatchedDrawCall(renderContext.List))->Value;
+            e = &result.Add(key, BatchedDrawCall(context.RenderContext.List))->Value;
             ASSERT_LOW_LAYER(key.Mat);
             e->DrawCall.Material = key.Mat;
             e->DrawCall.Surface.Lightmap = EnumHasAnyFlags(_staticFlags, StaticFlags::Lightmap) && _scene ? _scene->LightmapsData.GetReadyLightmap(key.Lightmap) : nullptr;
@@ -152,21 +151,18 @@ void Foliage::DrawInstance(RenderContext& renderContext, FoliageInstance& instan
         auto& instanceData = e->Instances.AddOne();
         Matrix world;
         const Transform transform = _transform.LocalToWorld(instance.Transform);
-        const Float3 translation = transform.Translation - renderContext.View.Origin;
+        const Float3 translation = transform.Translation - context.ViewOrigin;
         Matrix::Transformation(transform.Scale, transform.Orientation, translation, world);
         constexpr float worldDeterminantSign = 1.0f;
         instanceData.Store(world, world, instance.Lightmap.UVsArea, drawCall.Surface.GeometrySize, instance.Random, worldDeterminantSign, lodDitherFactor);
     }
 }
 
-void Foliage::DrawCluster(RenderContext& renderContext, FoliageCluster* cluster, const FoliageType& type, DrawCallsList* drawCallsLists, BatchedDrawCalls& result) const
+void Foliage::DrawCluster(DrawContext& context, FoliageCluster* cluster, DrawCallsList* drawCallsLists, BatchedDrawCalls& result) const
 {
     // Skip clusters that around too far from view
-    const auto lodView = (renderContext.LodProxyView ? renderContext.LodProxyView : &renderContext.View);
-    if (Float3::Distance(lodView->Position, cluster->TotalBoundsSphere.Center - lodView->Origin) - (float)cluster->TotalBoundsSphere.Radius > cluster->MaxCullDistance)
+    if (Float3::Distance(context.LodView.Position, cluster->TotalBoundsSphere.Center - context.LodView.Origin) - (float)cluster->TotalBoundsSphere.Radius > cluster->MaxCullDistance)
         return;
-    const Vector3 viewOrigin = renderContext.View.Origin;
-
     //DebugDraw::DrawBox(cluster->Bounds, Color::Red);
 
     // Draw visible children
@@ -178,10 +174,10 @@ void Foliage::DrawCluster(RenderContext& renderContext, FoliageCluster* cluster,
         BoundingBox box;
 #define DRAW_CLUSTER(idx) \
         box = cluster->Children[idx]->TotalBounds; \
-        box.Minimum -= viewOrigin; \
-        box.Maximum -= viewOrigin; \
-		if (renderContext.View.CullingFrustum.Intersects(box)) \
-			DrawCluster(renderContext, cluster->Children[idx], type, drawCallsLists, result)
+        box.Minimum -= context.ViewOrigin; \
+        box.Maximum -= context.ViewOrigin; \
+		if (context.RenderContext.View.CullingFrustum.Intersects(box)) \
+			DrawCluster(context, cluster->Children[idx], drawCallsLists, result)
         DRAW_CLUSTER(0);
         DRAW_CLUSTER(1);
         DRAW_CLUSTER(2);
@@ -192,21 +188,22 @@ void Foliage::DrawCluster(RenderContext& renderContext, FoliageCluster* cluster,
     {
         // Draw visible instances
         const auto frame = Engine::FrameCount;
-        const auto model = type.Model.Get();
-        const auto transitionLOD = renderContext.View.Pass != DrawPass::Depth; // Let the main view pass update LOD transitions
+        const auto model = context.FoliageType.Model.Get();
+        const auto transitionLOD = context.RenderContext.View.Pass != DrawPass::Depth; // Let the main view pass update LOD transitions
         // TODO: move DrawState to be stored per-view (so shadows can fade objects on their own)
         for (int32 i = 0; i < cluster->Instances.Count(); i++)
         {
             auto& instance = *cluster->Instances.Get()[i];
             BoundingSphere sphere = instance.Bounds;
-            sphere.Center -= viewOrigin;
-            if (Float3::Distance(lodView->Position, sphere.Center) - (float)sphere.Radius < instance.CullDistance &&
-                renderContext.View.CullingFrustum.Intersects(sphere))
+            sphere.Center -= context.ViewOrigin;
+            if (Float3::Distance(context.LodView.Position, sphere.Center) - (float)sphere.Radius < instance.CullDistance &&
+                context.RenderContext.View.CullingFrustum.Intersects(sphere) &&
+                RenderTools::ComputeBoundsScreenRadiusSquared(sphere.Center, sphere.Radius, context.RenderContext.View) * context.ViewScreenSizeSq >= context.MinObjectPixelSizeSq)
             {
                 const auto modelFrame = instance.DrawState.PrevFrame + 1;
 
                 // Select a proper LOD index (model may be culled)
-                int32 lodIndex = RenderTools::ComputeModelLOD(model, sphere.Center, (float)sphere.Radius, renderContext);
+                int32 lodIndex = RenderTools::ComputeModelLOD(model, sphere.Center, (float)sphere.Radius, context.RenderContext);
                 if (lodIndex == -1)
                 {
                     // Handling model fade-out transition
@@ -231,20 +228,20 @@ void Foliage::DrawCluster(RenderContext& renderContext, FoliageCluster* cluster,
                             {
                                 const auto prevLOD = model->ClampLODIndex(instance.DrawState.PrevLOD);
                                 const float normalizedProgress = static_cast<float>(instance.DrawState.LODTransition) * (1.0f / 255.0f);
-                                DrawInstance(renderContext, instance, type, model, prevLOD, normalizedProgress, drawCallsLists, result);
+                                DrawInstance(context, instance, model, prevLOD, normalizedProgress, drawCallsLists, result);
                             }
                         }
                         else if (instance.DrawState.LODTransition < 255)
                         {
                             const auto prevLOD = model->ClampLODIndex(instance.DrawState.PrevLOD);
                             const float normalizedProgress = static_cast<float>(instance.DrawState.LODTransition) * (1.0f / 255.0f);
-                            DrawInstance(renderContext, instance, type, model, prevLOD, normalizedProgress, drawCallsLists, result);
+                            DrawInstance(context, instance, model, prevLOD, normalizedProgress, drawCallsLists, result);
                         }
                     }
                     instance.DrawState.PrevFrame = frame;
                     continue;
                 }
-                lodIndex += renderContext.View.ModelLODBias;
+                lodIndex += context.RenderContext.View.ModelLODBias;
                 lodIndex = model->ClampLODIndex(lodIndex);
 
                 if (transitionLOD)
@@ -278,19 +275,19 @@ void Foliage::DrawCluster(RenderContext& renderContext, FoliageCluster* cluster,
                 // Draw
                 if (instance.DrawState.PrevLOD == lodIndex)
                 {
-                    DrawInstance(renderContext, instance, type, model, lodIndex, 0.0f, drawCallsLists, result);
+                    DrawInstance(context, instance, model, lodIndex, 0.0f, drawCallsLists, result);
                 }
                 else if (instance.DrawState.PrevLOD == -1)
                 {
                     const float normalizedProgress = static_cast<float>(instance.DrawState.LODTransition) * (1.0f / 255.0f);
-                    DrawInstance(renderContext, instance, type, model, lodIndex, 1.0f - normalizedProgress, drawCallsLists, result);
+                    DrawInstance(context, instance, model, lodIndex, 1.0f - normalizedProgress, drawCallsLists, result);
                 }
                 else
                 {
                     const auto prevLOD = model->ClampLODIndex(instance.DrawState.PrevLOD);
                     const float normalizedProgress = static_cast<float>(instance.DrawState.LODTransition) * (1.0f / 255.0f);
-                    DrawInstance(renderContext, instance, type, model, prevLOD, normalizedProgress, drawCallsLists, result);
-                    DrawInstance(renderContext, instance, type, model, lodIndex, normalizedProgress - 1.0f, drawCallsLists, result);
+                    DrawInstance(context, instance, model, prevLOD, normalizedProgress, drawCallsLists, result);
+                    DrawInstance(context, instance, model, lodIndex, normalizedProgress - 1.0f, drawCallsLists, result);
                 }
 
                 //DebugDraw::DrawSphere(instance.Bounds, Color::YellowGreen);
@@ -304,14 +301,11 @@ void Foliage::DrawCluster(RenderContext& renderContext, FoliageCluster* cluster,
 
 #else
 
-void Foliage::DrawCluster(RenderContext& renderContext, FoliageCluster* cluster, Mesh::DrawInfo& draw)
+void Foliage::DrawCluster(DrawContext& context, FoliageCluster* cluster, Mesh::DrawInfo& draw)
 {
     // Skip clusters that around too far from view
-    const auto lodView = (renderContext.LodProxyView ? renderContext.LodProxyView : &renderContext.View);
-    if (Float3::Distance(lodView->Position, cluster->TotalBoundsSphere.Center - lodView->Origin) - (float)cluster->TotalBoundsSphere.Radius > cluster->MaxCullDistance)
+    if (Float3::Distance(context.LodView.Position, cluster->TotalBoundsSphere.Center - context.LodView.Origin) - (float)cluster->TotalBoundsSphere.Radius > cluster->MaxCullDistance)
         return;
-    const Vector3 viewOrigin = renderContext.View.Origin;
-
     //DebugDraw::DrawBox(cluster->Bounds, Color::Red);
 
     // Draw visible children
@@ -323,10 +317,10 @@ void Foliage::DrawCluster(RenderContext& renderContext, FoliageCluster* cluster,
         BoundingBox box;
 #define DRAW_CLUSTER(idx) \
         box = cluster->Children[idx]->TotalBounds; \
-        box.Minimum -= viewOrigin; \
-        box.Maximum -= viewOrigin; \
-		if (renderContext.View.CullingFrustum.Intersects(box)) \
-			DrawCluster(renderContext, cluster->Children[idx], draw)
+        box.Minimum -= context.ViewOrigin; \
+        box.Maximum -= context.ViewOrigin; \
+		if (context.RenderContext.View.CullingFrustum.Intersects(box)) \
+			DrawCluster(context, cluster->Children[idx], draw)
         DRAW_CLUSTER(0);
         DRAW_CLUSTER(1);
         DRAW_CLUSTER(2);
@@ -342,16 +336,17 @@ void Foliage::DrawCluster(RenderContext& renderContext, FoliageCluster* cluster,
             auto& instance = *cluster->Instances[i];
             auto& type = FoliageTypes[instance.Type];
             BoundingSphere sphere = instance.Bounds;
-            sphere.Center -= viewOrigin;
+            sphere.Center -= context.ViewOrigin;
 
             // Check if can draw this instance
             if (type._canDraw &&
-                Float3::Distance(lodView->Position, sphere.Center) - (float)sphere.Radius < instance.CullDistance &&
-                renderContext.View.CullingFrustum.Intersects(sphere))
+                Float3::Distance(context.LodView.Position, sphere.Center) - (float)sphere.Radius < instance.CullDistance &&
+                context.RenderContext.View.CullingFrustum.Intersects(sphere) &&
+                RenderTools::ComputeBoundsScreenRadiusSquared(sphere.Center, sphere.Radius, context.RenderContext.View) * context.ViewScreenSizeSq >= context.MinObjectPixelSizeSq)
             {
                 Matrix world;
                 const Transform transform = _transform.LocalToWorld(instance.Transform);
-                const Float3 translation = transform.Translation - renderContext.View.Origin;
+                const Float3 translation = transform.Translation - context.ViewOrigin;
                 Matrix::Transformation(transform.Scale, transform.Orientation, translation, world);
 
                 // Disable motion blur
@@ -367,7 +362,7 @@ void Foliage::DrawCluster(RenderContext& renderContext, FoliageCluster* cluster,
                 draw.PerInstanceRandom = instance.Random;
                 draw.DrawModes = type.DrawModes;
                 draw.SetStencilValue(_layer);
-                type.Model->Draw(renderContext, draw);
+                type.Model->Draw(context.RenderContext, draw);
 
                 //DebugDraw::DrawSphere(instance.Bounds, Color::YellowGreen);
 
@@ -446,22 +441,50 @@ void Foliage::DrawFoliageJob(int32 i)
     PROFILE_CPU();
     PROFILE_MEM(Graphics);
     const FoliageType& type = FoliageTypes[i];
-    if (type.IsReady() && type.Model->CanBeRendered())
+    if (type._canDraw)
     {
         DrawCallsList drawCallsLists[MODEL_MAX_LODS];
         for (RenderContext& renderContext : _renderContextBatch->Contexts)
+        {
+#if !FOLIAGE_USE_SINGLE_QUAD_TREE && FOLIAGE_USE_DRAW_CALLS_BATCHING
             DrawType(renderContext, type, drawCallsLists);
+#else
+            Mesh::DrawInfo draw;
+            draw.Flags = GetStaticFlags();
+            draw.DrawModes = (DrawPass)(DrawPass::Default & renderContext.View.Pass);
+            draw.LODBias = 0;
+            draw.ForcedLOD = -1;
+            draw.VertexColors = nullptr;
+            draw.Deformation = nullptr;
+            DrawType(renderContext, type, draw);
+#endif
+        }
     }
 }
 
 #endif
 
+#if !FOLIAGE_USE_SINGLE_QUAD_TREE && FOLIAGE_USE_DRAW_CALLS_BATCHING
 void Foliage::DrawType(RenderContext& renderContext, const FoliageType& type, DrawCallsList* drawCallsLists)
+#else
+void Foliage::DrawType(RenderContext& renderContext, const FoliageType& type, Mesh::DrawInfo& draw)
+#endif
 {
     if (!type.Root || !FOLIAGE_CAN_DRAW(renderContext, type))
         return;
     const DrawPass typeDrawModes = FOLIAGE_GET_DRAW_MODES(renderContext, type);
     PROFILE_CPU_ASSET(type.Model);
+    DrawContext context
+    {
+        renderContext,
+        renderContext.LodProxyView ? *renderContext.LodProxyView : renderContext.View,
+        type,
+        renderContext.View.Origin,
+        Math::Square(Graphics::Shadows::MinObjectPixelSize),
+        renderContext.View.ScreenSize.X * renderContext.View.ScreenSize.Y,
+    };
+    if (context.RenderContext.View.Pass != DrawPass::Depth)
+        context.MinObjectPixelSizeSq = 0.0f; // Don't use it in main view
 #if FOLIAGE_USE_DRAW_CALLS_BATCHING
     // Initialize draw calls for foliage type all LODs meshes
     for (int32 lod = 0; lod < type.Model->LODs.Count(); lod++)
@@ -506,7 +529,7 @@ void Foliage::DrawType(RenderContext& renderContext, const FoliageType& type, Dr
 
     // Draw instances of the foliage type
     BatchedDrawCalls result(&renderContext.List->Memory);
-    DrawCluster(renderContext, type.Root, type, drawCallsLists, result);
+    DrawCluster(context, type.Root, drawCallsLists, result);
 
     // Submit draw calls with valid instances added
     for (auto& e : result)
@@ -568,10 +591,22 @@ void Foliage::DrawType(RenderContext& renderContext, const FoliageType& type, Dr
         }
     }
 #else
-    DrawCluster(renderContext, type.Root, draw);
+    DrawCluster(context, type.Root, draw);
 #endif
 }
 
+void Foliage::InitType(const RenderView& view, FoliageType& type)
+{
+    const DrawPass drawModes = type.DrawModes & view.Pass & view.GetShadowsDrawPassMask(type.ShadowsMode);
+    type._canDraw = type.IsReady() && drawModes != DrawPass::None && type.Model && type.Model->CanBeRendered();
+    for (int32 j = 0; j < type.Entries.Count(); j++)
+    {
+        auto& e = type.Entries[j];
+        e.ReceiveDecals = type.ReceiveDecals != 0;
+        e.ShadowsMode = type.ShadowsMode;
+    }
+}
+
 int32 Foliage::GetInstancesCount() const
 {
     return Instances.Count();
@@ -1131,12 +1166,7 @@ void Foliage::Draw(RenderContext& renderContext)
     // Cache data per foliage instance type
     for (auto& type : FoliageTypes)
     {
-        for (int32 j = 0; j < type.Entries.Count(); j++)
-        {
-            auto& e = type.Entries[j];
-            e.ReceiveDecals = type.ReceiveDecals != 0;
-            e.ShadowsMode = type.ShadowsMode;
-        }
+        InitType(renderContext.View, type);
     }
 
     if (renderContext.View.Pass == DrawPass::GlobalSDF)
@@ -1202,12 +1232,7 @@ void Foliage::Draw(RenderContext& renderContext)
         // Draw single foliage instance projection into Global Surface Atlas
         auto& instance = *(FoliageInstance*)GlobalSurfaceAtlasPass::Instance()->GetCurrentActorObject();
         auto& type = FoliageTypes[instance.Type];
-        for (int32 i = 0; i < type.Entries.Count(); i++)
-        {
-            auto& e = type.Entries[i];
-            e.ReceiveDecals = type.ReceiveDecals != 0;
-            e.ShadowsMode = type.ShadowsMode;
-        }
+        InitType(renderContext.View, type);
         Matrix world;
         const Transform transform = _transform.LocalToWorld(instance.Transform);
         renderContext.View.GetWorldMatrix(transform, world);
@@ -1239,8 +1264,9 @@ void Foliage::Draw(RenderContext& renderContext)
     draw.LODBias = 0;
     draw.ForcedLOD = -1;
     draw.VertexColors = nullptr;
+    draw.Deformation = nullptr;
 #else
-    DrawCallsList drawCallsLists[MODEL_MAX_LODS];
+    DrawCallsList draw[MODEL_MAX_LODS];
 #endif
 #if FOLIAGE_USE_SINGLE_QUAD_TREE
     if (Root)
@@ -1248,7 +1274,7 @@ void Foliage::Draw(RenderContext& renderContext)
 #else
     for (auto& type : FoliageTypes)
     {
-        DrawType(renderContext, type, drawCallsLists);
+        DrawType(renderContext, type, draw);
     }
 #endif
 }
@@ -1265,14 +1291,7 @@ void Foliage::Draw(RenderContextBatch& renderContextBatch)
     {
         // Cache data per foliage instance type
         for (FoliageType& type : FoliageTypes)
-        {
-            for (int32 j = 0; j < type.Entries.Count(); j++)
-            {
-                auto& e = type.Entries[j];
-                e.ReceiveDecals = type.ReceiveDecals != 0;
-                e.ShadowsMode = type.ShadowsMode;
-            }
-        }
+            InitType(view, type);
 
         // Run async job for each foliage type
         _renderContextBatch = &renderContextBatch;
diff --git a/Source/Engine/Foliage/Foliage.h b/Source/Engine/Foliage/Foliage.h
index 6f8b36cf4..83ab6206c 100644
--- a/Source/Engine/Foliage/Foliage.h
+++ b/Source/Engine/Foliage/Foliage.h
@@ -158,6 +158,15 @@ public:
 
 private:
     void AddToCluster(ChunkedArray<FoliageCluster, FOLIAGE_CLUSTER_CHUNKS_SIZE>& clusters, FoliageCluster* cluster, FoliageInstance& instance);
+    struct DrawContext
+    {
+        RenderContext& RenderContext;
+        const RenderView& LodView;
+        const FoliageType& FoliageType;
+        Vector3 ViewOrigin;
+        float MinObjectPixelSizeSq;
+        float ViewScreenSizeSq;
+    };
 #if !FOLIAGE_USE_SINGLE_QUAD_TREE && FOLIAGE_USE_DRAW_CALLS_BATCHING
     struct DrawKey
     {
@@ -181,10 +190,12 @@ private:
 
     typedef Array<struct DrawCall, InlinedAllocation<8>> DrawCallsList;
     typedef Dictionary<DrawKey, struct BatchedDrawCall, ConcurrentArenaAllocation> BatchedDrawCalls;
-    void DrawInstance(RenderContext& renderContext, FoliageInstance& instance, const FoliageType& type, Model* model, int32 lod, float lodDitherFactor, DrawCallsList* drawCallsLists, BatchedDrawCalls& result) const;
-    void DrawCluster(RenderContext& renderContext, FoliageCluster* cluster, const FoliageType& type, DrawCallsList* drawCallsLists, BatchedDrawCalls& result) const;
+    void DrawInstance(DrawContext& context, FoliageInstance& instance, Model* model, int32 lod, float lodDitherFactor, DrawCallsList* drawCallsLists, BatchedDrawCalls& result) const;
+    void DrawCluster(DrawContext& context, FoliageCluster* cluster, DrawCallsList* drawCallsLists, BatchedDrawCalls& result) const;
+    void DrawType(RenderContext& renderContext, const FoliageType& type, DrawCallsList* drawCallsLists);
 #else
-    void DrawCluster(RenderContext& renderContext, FoliageCluster* cluster, Mesh::DrawInfo& draw);
+    void DrawCluster(DrawContext& context, FoliageCluster* cluster, Mesh::DrawInfo& draw);
+    void DrawType(RenderContext& renderContext, const FoliageType& type, Mesh::DrawInfo& draw);
 #endif
 #if !FOLIAGE_USE_SINGLE_QUAD_TREE
     void DrawClusterGlobalSDF(class GlobalSignDistanceFieldPass* globalSDF, const BoundingBox& globalSDFBounds, FoliageCluster* cluster, const FoliageType& type);
@@ -192,7 +203,8 @@ private:
     void DrawFoliageJob(int32 i);
     RenderContextBatch* _renderContextBatch;
 #endif
-    void DrawType(RenderContext& renderContext, const FoliageType& type, DrawCallsList* drawCallsLists);
+
+    void InitType(const RenderView& view, FoliageType& type);
 
 public:
     /// <summary>
diff --git a/Source/Engine/Foliage/FoliageType.h b/Source/Engine/Foliage/FoliageType.h
index bbe7e7739..224ed0bd8 100644
--- a/Source/Engine/Foliage/FoliageType.h
+++ b/Source/Engine/Foliage/FoliageType.h
@@ -47,6 +47,7 @@ API_CLASS(Sealed, NoSpawn) class FLAXENGINE_API FoliageType : public ScriptingOb
     friend Foliage;
 private:
     uint8 _isReady : 1;
+    uint8 _canDraw : 1;
 
 public:
     /// <summary>
diff --git a/Source/Engine/Graphics/Graphics.cpp b/Source/Engine/Graphics/Graphics.cpp
index dd3344f5d..97af4f089 100644
--- a/Source/Engine/Graphics/Graphics.cpp
+++ b/Source/Engine/Graphics/Graphics.cpp
@@ -28,6 +28,7 @@ Quality Graphics::GIQuality = Quality::High;
 bool Graphics::GICascadesBlending = false;
 PostProcessSettings Graphics::PostProcessSettings;
 bool Graphics::SpreadWorkload = true;
+float Graphics::Shadows::MinObjectPixelSize = 2.0f;
 bool Graphics::PostProcessing::ColorGradingVolumeLUT = true;
 
 #if GRAPHICS_API_NULL
diff --git a/Source/Engine/Graphics/Graphics.h b/Source/Engine/Graphics/Graphics.h
index d328431b0..571a7f086 100644
--- a/Source/Engine/Graphics/Graphics.h
+++ b/Source/Engine/Graphics/Graphics.h
@@ -85,8 +85,17 @@ public:
     API_FIELD() static bool SpreadWorkload;
 
 public:
+    // Shadows rendering configuration.
+    API_CLASS(Static, Attributes="DebugCommand") class FLAXENGINE_API Shadows
+    {
+        DECLARE_SCRIPTING_TYPE_MINIMAL(Shadows);
+
+        // The minimum size in pixels of objects to cast shadows. Improves performance by skipping too small objects (eg. sub-pixel) from rendering into shadow maps.
+        API_FIELD() static float MinObjectPixelSize;
+    };
+
     // Post Processing effects rendering configuration.
-    API_CLASS(Static, Attributes = "DebugCommand") class FLAXENGINE_API PostProcessing
+    API_CLASS(Static, Attributes="DebugCommand") class FLAXENGINE_API PostProcessing
     {
         DECLARE_SCRIPTING_TYPE_MINIMAL(PostProcessing);
 
diff --git a/Source/Engine/Renderer/RenderList.cpp b/Source/Engine/Renderer/RenderList.cpp
index ac643b4e8..2bb206d6e 100644
--- a/Source/Engine/Renderer/RenderList.cpp
+++ b/Source/Engine/Renderer/RenderList.cpp
@@ -695,6 +695,7 @@ void RenderList::AddDrawCall(const RenderContextBatch& renderContextBatch, DrawP
             DrawCallsLists[(int32)DrawCallsListType::MotionVectors].Indices.Add(index);
         }
     }
+    float minObjectPixelSizeSq = Math::Square(Graphics::Shadows::MinObjectPixelSize);
     for (int32 i = 1; i < renderContextBatch.Contexts.Count(); i++)
     {
         const RenderContext& renderContext = renderContextBatch.Contexts.Get()[i];
@@ -702,7 +703,8 @@ void RenderList::AddDrawCall(const RenderContextBatch& renderContextBatch, DrawP
         drawModes = modes & renderContext.View.Pass;
         if (drawModes != DrawPass::None &&
             (staticFlags & renderContext.View.StaticFlagsMask) == renderContext.View.StaticFlagsCompare &&
-            renderContext.View.CullingFrustum.Intersects(bounds))
+            renderContext.View.CullingFrustum.Intersects(bounds) &&
+            RenderTools::ComputeBoundsScreenRadiusSquared(bounds.Center, bounds.Radius, renderContext.View) * (renderContext.View.ScreenSize.X * renderContext.View.ScreenSize.Y) >= minObjectPixelSizeSq)
         {
             renderContext.List->ShadowDepthDrawCallsList.Indices.Add(index);
         }

From 78582255659e2d7d9fbf9330606da3c3e5bade6f Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Mon, 23 Feb 2026 17:19:14 +0100
Subject: [PATCH 089/203] Update docs for #3948

---
 Source/Engine/Audio/AudioSource.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Engine/Audio/AudioSource.h b/Source/Engine/Audio/AudioSource.h
index 58903912c..07762be2f 100644
--- a/Source/Engine/Audio/AudioSource.h
+++ b/Source/Engine/Audio/AudioSource.h
@@ -207,16 +207,16 @@ public:
     API_PROPERTY() void SetAttenuation(float value);
 
     /// <summary>
-    /// Gets the doppler effect factor. Scale for source velocity. Default is 1.
+    /// Gets the doppler effect factor. Scale for source velocity. Default is 1. Used by spatial sources only. Cannot scale the effect up (only dim it).
     /// </summary>
-    API_PROPERTY(Attributes="EditorOrder(75), DefaultValue(1.0f), Limit(0, float.MaxValue, 0.1f), EditorDisplay(\"Audio Source\")")
+    API_PROPERTY(Attributes="EditorOrder(75), DefaultValue(1.0f), Limit(0, 1.0f, 0.1f), EditorDisplay(\"Audio Source\")")
     FORCE_INLINE float GetDopplerFactor() const
     {
         return _dopplerFactor;
     }
 
     /// <summary>
-    /// Sets the doppler effect factor. Scale for source velocity. Default is 1.
+    /// Sets the doppler effect factor. Scale for source velocity. Default is 1. Used by spatial sources only. Cannot scale the effect up (only dim it).
     /// </summary>
     API_PROPERTY() void SetDopplerFactor(float value);
 

From ff81d339ef856b3190396dbbb26e1e42cd41cc71 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Mon, 23 Feb 2026 17:24:59 +0100
Subject: [PATCH 090/203] Fix missing doppler factor in cooked game with OpenAL
 backend

#3959
---
 Source/Engine/Audio/OpenAL/AudioBackendOAL.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Engine/Audio/OpenAL/AudioBackendOAL.cpp b/Source/Engine/Audio/OpenAL/AudioBackendOAL.cpp
index 715ede74f..8795cc6f9 100644
--- a/Source/Engine/Audio/OpenAL/AudioBackendOAL.cpp
+++ b/Source/Engine/Audio/OpenAL/AudioBackendOAL.cpp
@@ -829,7 +829,6 @@ bool AudioBackendOAL::Base_Init()
     }
 
     // Init
-    Base_SetDopplerFactor(AudioSettings::Get()->DopplerFactor);
     alDistanceModel(AL_INVERSE_DISTANCE_CLAMPED); // Default attenuation model
     int32 clampedIndex = Math::Clamp(activeDeviceIndex, -1, Audio::Devices.Count() - 1);
     if (clampedIndex == Audio::GetActiveDeviceIndex())
@@ -841,6 +840,7 @@ bool AudioBackendOAL::Base_Init()
     if (ALC::IsExtensionSupported("AL_SOFT_source_spatialize"))
         ALC::Features = EnumAddFlags(ALC::Features, FeatureFlags::SpatialMultiChannel);
 #endif
+    Base_SetDopplerFactor(AudioSettings::Get()->DopplerFactor);
     ALC::Inited = true;
 
     // Log service info

From 1cf69361a13d620602c71f0b5d5d26f9176f0cb2 Mon Sep 17 00:00:00 2001
From: fibref <fibref_233@outlook.com>
Date: Sun, 22 Feb 2026 14:29:10 +0800
Subject: [PATCH 091/203] fix MSDF font alignment

---
 Source/Engine/Render2D/MSDFGenerator.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/Engine/Render2D/MSDFGenerator.h b/Source/Engine/Render2D/MSDFGenerator.h
index 5af337d1f..e1add4dfd 100644
--- a/Source/Engine/Render2D/MSDFGenerator.h
+++ b/Source/Engine/Render2D/MSDFGenerator.h
@@ -114,10 +114,10 @@ public:
         int32 width = static_cast<int32>(Math::CeilToInt(bounds.r - bounds.l + pxRange));
         int32 height = static_cast<int32>(Math::CeilToInt(bounds.t - bounds.b + pxRange));
         msdfgen::Bitmap<float, 4> msdf(width, height);
+
+        auto transform = msdfgen::Vector2(Math::Ceil(-bounds.l + pxRange / 2.0), Math::Ceil(-bounds.b + pxRange / 2.0));
         
-        msdfgen::SDFTransformation t(
-            msdfgen::Projection(1.0, msdfgen::Vector2(-bounds.l + pxRange / 2.0, -bounds.b + pxRange / 2.0)), msdfgen::Range(pxRange)
-        );
+        msdfgen::SDFTransformation t(msdfgen::Projection(1.0, transform), msdfgen::Range(pxRange));
         correctWinding(shape, bounds);
         generateMTSDF(msdf, shape, t);
 
@@ -136,7 +136,7 @@ public:
         }
         outputWidth = width;
         outputHeight = height;
-        top = static_cast<int16>(Math::CeilToInt(bounds.t + pxRange / 2.0));
-        left = static_cast<int16>(Math::FloorToInt(bounds.l - pxRange / 2.0));
+        top = height - static_cast<int16>(transform.y);
+        left = -static_cast<int16>(transform.x);
     }
 };

From db46050b16814cd983a003a66adc87c729d48afb Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Sun, 1 Mar 2026 11:01:55 +0100
Subject: [PATCH 092/203] tweak caret blink speed

---
 Source/Engine/UI/GUI/Common/RichTextBoxBase.cs | 4 ++--
 Source/Engine/UI/GUI/Common/TextBox.cs         | 4 ++--
 Source/Engine/UI/GUI/Common/TextBoxBase.cs     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/Engine/UI/GUI/Common/RichTextBoxBase.cs b/Source/Engine/UI/GUI/Common/RichTextBoxBase.cs
index 2fc2ef4b3..7722fc94b 100644
--- a/Source/Engine/UI/GUI/Common/RichTextBoxBase.cs
+++ b/Source/Engine/UI/GUI/Common/RichTextBoxBase.cs
@@ -437,8 +437,8 @@ namespace FlaxEngine.GUI
             // Caret
             if (IsFocused && CaretPosition > -1)
             {
-                float alpha = Mathf.Saturate(Mathf.Cos(_animateTime * CaretFlashSpeed) * 0.5f + 0.7f);
-                alpha = alpha * alpha * alpha * alpha * alpha * alpha;
+                float alpha = Mathf.Saturate(Mathf.Cos(_animateTime * CaretFlashSpeed) * 0.5f + 0.8f);
+                alpha = alpha * alpha;
                 Render2D.FillRectangle(CaretBounds, CaretColor * alpha);
             }
 
diff --git a/Source/Engine/UI/GUI/Common/TextBox.cs b/Source/Engine/UI/GUI/Common/TextBox.cs
index 1dfd9facc..3d7099db6 100644
--- a/Source/Engine/UI/GUI/Common/TextBox.cs
+++ b/Source/Engine/UI/GUI/Common/TextBox.cs
@@ -310,8 +310,8 @@ namespace FlaxEngine.GUI
             // Caret
             if (IsFocused && CaretPosition > -1)
             {
-                float alpha = Mathf.Saturate(Mathf.Cos(_animateTime * CaretFlashSpeed) * 0.5f + 0.7f);
-                alpha = alpha * alpha * alpha * alpha * alpha * alpha;
+                float alpha = Mathf.Saturate(Mathf.Cos(_animateTime * CaretFlashSpeed) * 0.5f + 0.8f);
+                alpha = alpha * alpha;
                 Render2D.FillRectangle(CaretBounds, CaretColor * alpha);
             }
 
diff --git a/Source/Engine/UI/GUI/Common/TextBoxBase.cs b/Source/Engine/UI/GUI/Common/TextBoxBase.cs
index 243e4786e..7deb9a367 100644
--- a/Source/Engine/UI/GUI/Common/TextBoxBase.cs
+++ b/Source/Engine/UI/GUI/Common/TextBoxBase.cs
@@ -275,7 +275,7 @@ namespace FlaxEngine.GUI
         /// Gets or sets the speed of the caret flashing animation.
         /// </summary>
         [EditorDisplay("Caret Style"), EditorOrder(2021), Tooltip("The speed of the caret flashing animation.")]
-        public float CaretFlashSpeed { get; set; } = 6.0f;
+        public float CaretFlashSpeed { get; set; } = 6.5f;
 
         /// <summary>
         /// Gets or sets the speed of the selection background flashing animation.

From 5f9e8dedec6d32c298197a32a643b956d2f75b71 Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Mon, 2 Mar 2026 23:40:41 +0200
Subject: [PATCH 093/203] Pass String reference values via temporary values

---
 Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
index 3bdb16815..f1c4c6be8 100644
--- a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
+++ b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
@@ -1300,10 +1300,10 @@ namespace Flax.Build.Bindings
                 else if (parameterInfo.Type.IsRef && !parameterInfo.Type.IsConst)
                 {
                     // Non-const lvalue reference parameters needs to be passed via temporary value
-                    if (parameterInfo.IsOut || parameterInfo.IsRef)
-                        contents.Append(indent).AppendFormat("{2}& {0}Temp = {1};", parameterInfo.Name, param, parameterInfo.Type.ToString(false)).AppendLine();
-                    else
+                    if (parameterInfo.Type.Type is "String" or "StringView" or "StringAnsi" or "StringAnsiView" && parameterInfo.Type.GenericArgs == null)
                         contents.Append(indent).AppendFormat("{2} {0}Temp = {1};", parameterInfo.Name, param, parameterInfo.Type.ToString(false)).AppendLine();
+                    else
+                        contents.Append(indent).AppendFormat("{2}& {0}Temp = {1};", parameterInfo.Name, param, parameterInfo.Type.ToString(false)).AppendLine();
                     callParams += parameterInfo.Name;
                     callParams += "Temp";
                 }

From f7e2f3a4d5a39bcc1511f5174011f767224064c6 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Mon, 2 Mar 2026 19:20:15 -0600
Subject: [PATCH 094/203] Only set kinematic target if rigid body has kinematic
 flag.

---
 Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
index 8c3d3610e..b5efa9d73 100644
--- a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
+++ b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
@@ -2450,7 +2450,7 @@ void PhysicsBackend::SetRigidActorPose(void* actor, const Vector3& position, con
     if (kinematic)
     {
         auto actorPhysX = (PxRigidDynamic*)actor;
-        if (actorPhysX->getActorFlags() & PxActorFlag::eDISABLE_SIMULATION)
+        if (actorPhysX->getActorFlags() & PxActorFlag::eDISABLE_SIMULATION || !(actorPhysX->getRigidBodyFlags() & PxRigidBodyFlag::eKINEMATIC))
         {
             // Ensures the disabled kinematic actor ends up in the correct pose after enabling simulation
             actorPhysX->setGlobalPose(trans, wakeUp);

From 10bcf9c9a330b14609a352f71b6f428db998c96c Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 3 Mar 2026 23:29:10 +0100
Subject: [PATCH 095/203] Fix Vulkan timeout to be larger (5s)

#3967
---
 .../GraphicsDevice/Vulkan/CmdBufferVulkan.cpp | 23 +++++++++----------
 .../GraphicsDevice/Vulkan/CmdBufferVulkan.h   |  2 +-
 Source/Engine/GraphicsDevice/Vulkan/Config.h  |  5 ++++
 .../GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp |  9 ++++----
 .../GraphicsDevice/Vulkan/GPUDeviceVulkan.h   |  4 ++--
 .../GraphicsDevice/Vulkan/QueueVulkan.cpp     |  6 +----
 6 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.cpp b/Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.cpp
index 36eacccf9..737c147d9 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.cpp
+++ b/Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.cpp
@@ -136,6 +136,15 @@ void CmdBufferVulkan::EndEvent()
 
 #endif
 
+void CmdBufferVulkan::Wait(float timeoutSeconds)
+{
+    PROFILE_CPU();
+    ASSERT(IsSubmitted());
+    const bool failed = _device->FenceManager.WaitForFence(GetFence(), timeoutSeconds);
+    ASSERT(!failed);
+    RefreshFenceStatus();
+}
+
 void CmdBufferVulkan::RefreshFenceStatus()
 {
     if (_state == State::Submitted)
@@ -186,9 +195,8 @@ CmdBufferVulkan::~CmdBufferVulkan()
     auto& fenceManager = _device->FenceManager;
     if (_state == State::Submitted)
     {
-        // Wait 60ms
-        const uint64 waitForCmdBufferInNanoSeconds = 60 * 1000 * 1000LL;
-        fenceManager.WaitAndReleaseFence(_fence, waitForCmdBufferInNanoSeconds);
+        // Wait
+        fenceManager.WaitAndReleaseFence(_fence);
     }
     else
     {
@@ -281,15 +289,6 @@ void CmdBufferManagerVulkan::SubmitActiveCmdBuffer(SemaphoreVulkan* signalSemaph
     _activeCmdBuffer = nullptr;
 }
 
-void CmdBufferManagerVulkan::WaitForCmdBuffer(CmdBufferVulkan* cmdBuffer, float timeInSecondsToWait)
-{
-    PROFILE_CPU();
-    ASSERT(cmdBuffer->IsSubmitted());
-    const bool failed = _device->FenceManager.WaitForFence(cmdBuffer->GetFence(), (uint64)(timeInSecondsToWait * 1e9));
-    ASSERT(!failed);
-    cmdBuffer->RefreshFenceStatus();
-}
-
 void CmdBufferManagerVulkan::PrepareForNewActiveCommandBuffer()
 {
     PROFILE_CPU();
diff --git a/Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.h b/Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.h
index 7cb3ee104..c8e096cdd 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.h
+++ b/Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.h
@@ -136,6 +136,7 @@ public:
     void EndEvent();
 #endif
 
+    void Wait(float timeoutSeconds = VULKAN_WAIT_TIMEOUT);
     void RefreshFenceStatus();
 };
 
@@ -206,7 +207,6 @@ public:
 
 public:
     void SubmitActiveCmdBuffer(SemaphoreVulkan* signalSemaphore = nullptr);
-    void WaitForCmdBuffer(CmdBufferVulkan* cmdBuffer, float timeInSecondsToWait = 1.0f);
     void RefreshFenceStatus(CmdBufferVulkan* skipCmdBuffer = nullptr)
     {
         _pool.RefreshFenceStatus(skipCmdBuffer);
diff --git a/Source/Engine/GraphicsDevice/Vulkan/Config.h b/Source/Engine/GraphicsDevice/Vulkan/Config.h
index 1f30c301a..7b4e54137 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/Config.h
+++ b/Source/Engine/GraphicsDevice/Vulkan/Config.h
@@ -49,4 +49,9 @@
 #define VULKAN_USE_QUERIES 1
 #endif
 
+// Fence wait operation timeout in seconds
+#ifndef VULKAN_WAIT_TIMEOUT
+#define VULKAN_WAIT_TIMEOUT 5.0f
+#endif
+
 #endif
diff --git a/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp b/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp
index e96f7b3b3..71ef42005 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp
+++ b/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp
@@ -2184,11 +2184,12 @@ FenceVulkan* FenceManagerVulkan::AllocateFence(bool createSignaled)
     return fence;
 }
 
-bool FenceManagerVulkan::WaitForFence(FenceVulkan* fence, uint64 timeInNanoseconds) const
+bool FenceManagerVulkan::WaitForFence(FenceVulkan* fence, float timeoutSeconds) const
 {
     ASSERT(_usedFences.Contains(fence));
     ASSERT(!fence->IsSignaled);
-    const VkResult result = vkWaitForFences(_device->Device, 1, &fence->Handle, true, timeInNanoseconds);
+    uint64 timeNanoseconds = (uint64)((double)timeoutSeconds * 1000000000.0);
+    const VkResult result = vkWaitForFences(_device->Device, 1, &fence->Handle, true, timeNanoseconds);
     LOG_VULKAN_RESULT(result);
     if (result == VK_SUCCESS)
     {
@@ -2216,11 +2217,11 @@ void FenceManagerVulkan::ReleaseFence(FenceVulkan*& fence)
     fence = nullptr;
 }
 
-void FenceManagerVulkan::WaitAndReleaseFence(FenceVulkan*& fence, uint64 timeInNanoseconds)
+void FenceManagerVulkan::WaitAndReleaseFence(FenceVulkan*& fence, float timeoutSeconds)
 {
     ScopeLock lock(_device->_fenceLock);
     if (!fence->IsSignaled)
-        WaitForFence(fence, timeInNanoseconds);
+        WaitForFence(fence, timeoutSeconds);
     ResetFence(fence);
     _usedFences.Remove(fence);
     _freeFences.Add(fence);
diff --git a/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.h b/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.h
index 09fa93f3e..a22cd9cc6 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.h
+++ b/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.h
@@ -88,7 +88,7 @@ public:
     }
 
     // Returns true if waiting timed out or failed, false otherwise.
-    bool WaitForFence(FenceVulkan* fence, uint64 timeInNanoseconds) const;
+    bool WaitForFence(FenceVulkan* fence, float timeoutSeconds = VULKAN_WAIT_TIMEOUT) const;
 
     void ResetFence(FenceVulkan* fence) const;
 
@@ -96,7 +96,7 @@ public:
     void ReleaseFence(FenceVulkan*& fence);
 
     // Sets the fence handle to null
-    void WaitAndReleaseFence(FenceVulkan*& fence, uint64 timeInNanoseconds);
+    void WaitAndReleaseFence(FenceVulkan*& fence, float timeoutSeconds = VULKAN_WAIT_TIMEOUT);
 
 private:
     // Returns true if fence was signaled, otherwise false.
diff --git a/Source/Engine/GraphicsDevice/Vulkan/QueueVulkan.cpp b/Source/Engine/GraphicsDevice/Vulkan/QueueVulkan.cpp
index f2d2521d0..39b0d2691 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/QueueVulkan.cpp
+++ b/Source/Engine/GraphicsDevice/Vulkan/QueueVulkan.cpp
@@ -62,11 +62,7 @@ void QueueVulkan::Submit(CmdBufferVulkan* cmdBuffer, uint32 signalSemaphoresCoun
 	const bool WaitForIdleOnSubmit = false;
 	if (WaitForIdleOnSubmit)
 	{
-		// Use 200ms timeout
-		bool success = _device->FenceManager.WaitForFence(fence, 200 * 1000 * 1000);
-		ASSERT(success);
-		ASSERT(_device->FenceManager.IsFenceSignaled(fence));
-		cmdBuffer->GetOwner()->RefreshFenceStatus();
+        cmdBuffer->Wait();
 	}
 #endif
 

From feca1c7994886dec467491c51cd42f9064126c52 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Tue, 3 Mar 2026 23:44:24 +0100
Subject: [PATCH 096/203] replace HW with material instead of sprite

---
 Source/Editor/EditorAssets.cs              |  5 +++++
 Source/Editor/EditorIcons.cs               |  1 -
 Source/Editor/GUI/Dialogs/ColorSelector.cs | 12 +++++++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Source/Editor/EditorAssets.cs b/Source/Editor/EditorAssets.cs
index d9b3d7f18..447dc3375 100644
--- a/Source/Editor/EditorAssets.cs
+++ b/Source/Editor/EditorAssets.cs
@@ -69,6 +69,11 @@ namespace FlaxEditor
         /// </summary>
         public static string WindowIcon = "Editor/EditorIcon";
 
+        /// <summary>
+        /// The material used for the HS color wheel.
+        /// </summary>
+        public static string HSWheelMaterial = "Editor/HSWheel";
+
         /// <summary>
         /// The window icons font.
         /// </summary>
diff --git a/Source/Editor/EditorIcons.cs b/Source/Editor/EditorIcons.cs
index 8688c502a..7da1d6fb3 100644
--- a/Source/Editor/EditorIcons.cs
+++ b/Source/Editor/EditorIcons.cs
@@ -134,7 +134,6 @@ namespace FlaxEditor
         public SpriteHandle Document128;
         public SpriteHandle XBoxOne128;
         public SpriteHandle UWPStore128;
-        public SpriteHandle ColorWheel128;
         public SpriteHandle LinuxSettings128;
         public SpriteHandle NavigationSettings128;
         public SpriteHandle AudioSettings128;
diff --git a/Source/Editor/GUI/Dialogs/ColorSelector.cs b/Source/Editor/GUI/Dialogs/ColorSelector.cs
index f556e8cd6..79e4029f5 100644
--- a/Source/Editor/GUI/Dialogs/ColorSelector.cs
+++ b/Source/Editor/GUI/Dialogs/ColorSelector.cs
@@ -12,6 +12,8 @@ namespace FlaxEditor.GUI.Dialogs
     /// <seealso cref="FlaxEngine.GUI.ContainerControl" />
     public class ColorSelector : ContainerControl
     {
+        private const String GrayedOutParamName = "GrayedOut";
+
         /// <summary>
         /// The color.
         /// </summary>
@@ -22,7 +24,7 @@ namespace FlaxEditor.GUI.Dialogs
         /// </summary>
         protected Rectangle _wheelRect;
 
-        private readonly SpriteHandle _colorWheelSprite;
+        private readonly MaterialBase _hsWheelMaterial;
         private bool _isMouseDownWheel;
 
         /// <summary>
@@ -78,7 +80,8 @@ namespace FlaxEditor.GUI.Dialogs
         {
             AutoFocus = true;
 
-            _colorWheelSprite = Editor.Instance.Icons.ColorWheel128;
+            _hsWheelMaterial = FlaxEngine.Content.LoadAsyncInternal<MaterialBase>(EditorAssets.HSWheelMaterial);
+            _hsWheelMaterial = _hsWheelMaterial.CreateVirtualInstance();
             _wheelRect = new Rectangle(0, 0, wheelSize, wheelSize);
         }
 
@@ -168,9 +171,12 @@ namespace FlaxEditor.GUI.Dialogs
             var hsv = _color.ToHSV();
             bool enabled = EnabledInHierarchy;
 
+            _hsWheelMaterial.SetParameterValue(GrayedOutParamName, enabled ? 1.0f : 0.5f);
+            Render2D.DrawMaterial(_hsWheelMaterial, _wheelRect, enabled ? Color.White : Color.Gray);
+
             // Wheel
             float boxExpand = (2.0f * 4.0f / 128.0f) * _wheelRect.Width;
-            Render2D.DrawSprite(_colorWheelSprite, _wheelRect.MakeExpanded(boxExpand), enabled ? Color.White : Color.Gray);
+            Render2D.DrawMaterial(_hsWheelMaterial, _wheelRect, enabled ? Color.White : Color.Gray);
             float hAngle = hsv.X * Mathf.DegreesToRadians;
             float hRadius = hsv.Y * _wheelRect.Width * 0.5f;
             var hsPos = new Float2(hRadius * Mathf.Cos(hAngle), -hRadius * Mathf.Sin(hAngle));

From b9b11b3c2a967f91dc03645bf2db5ce12e664261 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Tue, 3 Mar 2026 23:49:16 +0100
Subject: [PATCH 097/203] loop Hue value box

---
 Source/Editor/GUI/Dialogs/ColorPickerDialog.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
index 2d6a3882b..46970c50e 100644
--- a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
+++ b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
@@ -160,7 +160,7 @@ namespace FlaxEditor.GUI.Dialogs
             _cAlpha.ValueChanged += OnRGBAChanged;
 
             // Hue
-            _cHue = new FloatValueBox(0, PickerMargin + HSVMargin + ChannelTextWidth, _cSelector.Bottom + PickerMargin, 100, 0, 360)
+            _cHue = new FloatValueBox(0, PickerMargin + HSVMargin + ChannelTextWidth, _cSelector.Bottom + PickerMargin, 100)
             {
                 Parent = this
             };
@@ -306,6 +306,7 @@ namespace FlaxEditor.GUI.Dialogs
             if (_disableEvents)
                 return;
 
+            _cHue.Value = Mathf.Wrap(_cHue.Value, 0f, 360f);
             SelectedColor = Color.FromHSV(_cHue.Value, _cSaturation.Value / 100.0f, _cValue.Value / 100.0f, _cAlpha.Value);
         }
 

From cee1b72f2fcfd9e21387760e63c45ba800ffea26 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 4 Mar 2026 00:02:06 +0100
Subject: [PATCH 098/203] Fix regression from
 7b7a92758ff1a6f040c535b8e5a8858dd36d7380

#3932
---
 Source/Engine/Core/Types/Variant.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Engine/Core/Types/Variant.cpp b/Source/Engine/Core/Types/Variant.cpp
index dcabe8e48..96db06656 100644
--- a/Source/Engine/Core/Types/Variant.cpp
+++ b/Source/Engine/Core/Types/Variant.cpp
@@ -247,7 +247,7 @@ VariantType::VariantType(VariantType&& other) noexcept
 VariantType& VariantType::operator=(const Types& type)
 {
     Type = type;
-    if (StaticName)
+    if (!StaticName)
         Allocator::Free(TypeName);
     TypeName = nullptr;
     StaticName = 0;
@@ -266,7 +266,7 @@ VariantType& VariantType::operator=(const VariantType& other)
 {
     ASSERT(this != &other);
     Type = other.Type;
-    if (StaticName)
+    if (!StaticName)
         Allocator::Free(TypeName);
     StaticName = other.StaticName;
     if (StaticName)
@@ -316,7 +316,7 @@ void VariantType::SetTypeName(const StringView& typeName)
 {
     if (StringUtils::Length(TypeName) != typeName.Length())
     {
-        if (StaticName)
+        if (!StaticName)
             Allocator::Free(TypeName);
         StaticName = 0;
         TypeName = static_cast<char*>(Allocator::Allocate(typeName.Length() + 1));
@@ -329,7 +329,7 @@ void VariantType::SetTypeName(const StringAnsiView& typeName, bool staticName)
 {
     if (StringUtils::Length(TypeName) != typeName.Length() || StaticName != staticName)
     {
-        if (StaticName)
+        if (!StaticName)
             Allocator::Free(TypeName);
         StaticName = staticName;
         if (staticName)

From 66b4c64f989802ee6e599dbd0d5f8df4415a3cb6 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 4 Mar 2026 15:17:47 +0100
Subject: [PATCH 099/203] polish sliders and wheel

- Hide mouse cursor when clicking on wheel or sliders
- Move mouse position to knob position when letting go of slider or wheel
- Show mouse again when letting go of slider or wheel (obviously)
- Provide some visual feedback when the clicks on the wheel or sliders
- Make sliders wider
- Add alpha grid background to alpha slider
---
 .../Editor/GUI/Dialogs/ColorPickerDialog.cs   |   4 +-
 Source/Editor/GUI/Dialogs/ColorSelector.cs    | 146 ++++++++++++------
 2 files changed, 103 insertions(+), 47 deletions(-)

diff --git a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
index 46970c50e..f528710cd 100644
--- a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
+++ b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
@@ -124,7 +124,7 @@ namespace FlaxEditor.GUI.Dialogs
                 _savedColors = JsonSerializer.Deserialize<List<Color>>(savedColors);
 
             // Selector
-            _cSelector = new ColorSelectorWithSliders(180, 18)
+            _cSelector = new ColorSelectorWithSliders(180, 21)
             {
                 Location = new Float2(PickerMargin, PickerMargin),
                 Parent = this
@@ -421,9 +421,7 @@ namespace FlaxEditor.GUI.Dialogs
         public override bool OnMouseUp(Float2 location, MouseButton button)
         {
             if (base.OnMouseUp(location, button))
-            {
                 return true;
-            }
 
             var child = GetChildAtRecursive(location);
             if (button == MouseButton.Right && child is Button b && b.Tag is Color c)
diff --git a/Source/Editor/GUI/Dialogs/ColorSelector.cs b/Source/Editor/GUI/Dialogs/ColorSelector.cs
index 79e4029f5..392a8d934 100644
--- a/Source/Editor/GUI/Dialogs/ColorSelector.cs
+++ b/Source/Editor/GUI/Dialogs/ColorSelector.cs
@@ -14,6 +14,11 @@ namespace FlaxEditor.GUI.Dialogs
     {
         private const String GrayedOutParamName = "GrayedOut";
 
+        /// <summary>
+        /// Offset value applied to mouse cursor position when the user lets go of wheel or sliders.
+        /// </summary>
+        protected const float MouseCursorOffset = 6.0f;
+
         /// <summary>
         /// The color.
         /// </summary>
@@ -27,6 +32,19 @@ namespace FlaxEditor.GUI.Dialogs
         private readonly MaterialBase _hsWheelMaterial;
         private bool _isMouseDownWheel;
 
+        private Rectangle wheelDragRect
+        {
+            get
+            {
+                var hsv = _color.ToHSV();
+                float hAngle = hsv.X * Mathf.DegreesToRadians;
+                float hRadius = hsv.Y * _wheelRect.Width * 0.5f;
+                var hsPos = new Float2(hRadius * Mathf.Cos(hAngle), -hRadius * Mathf.Sin(hAngle));
+                float wheelBoxSize = IsSliding ? 9.0f : 5.0f;
+                return new Rectangle(hsPos - (wheelBoxSize * 0.5f) + _wheelRect.Center, new Float2(wheelBoxSize));
+            }
+        }
+
         /// <summary>
         /// Occurs when selected color gets changed.
         /// </summary>
@@ -168,7 +186,6 @@ namespace FlaxEditor.GUI.Dialogs
         {
             base.Draw();
 
-            var hsv = _color.ToHSV();
             bool enabled = EnabledInHierarchy;
 
             _hsWheelMaterial.SetParameterValue(GrayedOutParamName, enabled ? 1.0f : 0.5f);
@@ -177,11 +194,10 @@ namespace FlaxEditor.GUI.Dialogs
             // Wheel
             float boxExpand = (2.0f * 4.0f / 128.0f) * _wheelRect.Width;
             Render2D.DrawMaterial(_hsWheelMaterial, _wheelRect, enabled ? Color.White : Color.Gray);
-            float hAngle = hsv.X * Mathf.DegreesToRadians;
-            float hRadius = hsv.Y * _wheelRect.Width * 0.5f;
-            var hsPos = new Float2(hRadius * Mathf.Cos(hAngle), -hRadius * Mathf.Sin(hAngle));
-            const float wheelBoxSize = 4.0f;
-            Render2D.DrawRectangle(new Rectangle(hsPos - (wheelBoxSize * 0.5f) + _wheelRect.Center, new Float2(wheelBoxSize)), _isMouseDownWheel ? Color.Gray : Color.Black);
+            Color hsColor = Color.FromHSV(new Float3(Color.ToHSV().X, 1, 1));
+            Rectangle wheelRect = wheelDragRect;
+            Render2D.FillRectangle(wheelRect, hsColor);
+            Render2D.DrawRectangle(wheelRect, _isMouseDownWheel ? Color.Gray : Color.Black, _isMouseDownWheel ? 3.0f : 1.0f);
         }
 
         /// <inheritdoc />
@@ -208,6 +224,7 @@ namespace FlaxEditor.GUI.Dialogs
                 if (!_isMouseDownWheel)
                 {
                     _isMouseDownWheel = true;
+                    Cursor = CursorType.Hidden;
                     StartMouseCapture();
                     SlidingStart?.Invoke();
                 }
@@ -224,6 +241,10 @@ namespace FlaxEditor.GUI.Dialogs
             if (button == MouseButton.Left && _isMouseDownWheel)
             {
                 EndMouseCapture();
+                // Make the cursor appear where the user expects it to be (position of selection rectangle)
+                Rectangle dragRect = wheelDragRect;
+                Root.MousePosition = dragRect.Center + MouseCursorOffset;
+                Cursor = CursorType.Default;
                 EndSliding();
                 return true;
             }
@@ -252,10 +273,10 @@ namespace FlaxEditor.GUI.Dialogs
     /// <seealso cref="ColorSelector" />
     public class ColorSelectorWithSliders : ColorSelector
     {
-        private Rectangle _slider1Rect;
-        private Rectangle _slider2Rect;
-        private bool _isMouseDownSlider1;
-        private bool _isMouseDownSlider2;
+        private Rectangle _valueSliderRect;
+        private Rectangle _alphaSliderRect;
+        private bool _isMouseDownValueSlider;
+        private bool _isMouseDownAlphaSlider;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ColorSelectorWithSliders"/> class.
@@ -266,26 +287,26 @@ namespace FlaxEditor.GUI.Dialogs
         : base(wheelSize)
         {
             // Setup dimensions
-            const float slidersMargin = 8.0f;
-            _slider1Rect = new Rectangle(wheelSize + slidersMargin, 0, slidersThickness, wheelSize);
-            _slider2Rect = new Rectangle(_slider1Rect.Right + slidersMargin, _slider1Rect.Y, slidersThickness, _slider1Rect.Height);
-            Size = new Float2(_slider2Rect.Right, wheelSize);
+            const float slidersMargin = 10.0f;
+            _valueSliderRect = new Rectangle(wheelSize + slidersMargin, 0, slidersThickness, wheelSize);
+            _alphaSliderRect = new Rectangle(_valueSliderRect.Right + slidersMargin * 1.5f, _valueSliderRect.Y, slidersThickness, _valueSliderRect.Height);
+            Size = new Float2(_alphaSliderRect.Right, wheelSize);
         }
 
         /// <inheritdoc />
         protected override void UpdateMouse(ref Float2 location)
         {
-            if (_isMouseDownSlider1)
+            if (_isMouseDownValueSlider)
             {
                 var hsv = _color.ToHSV();
-                hsv.Z = 1.0f - Mathf.Saturate((location.Y - _slider1Rect.Y) / _slider1Rect.Height);
+                hsv.Z = 1.0f - Mathf.Saturate((location.Y - _valueSliderRect.Y) / _valueSliderRect.Height);
 
                 Color = Color.FromHSV(hsv, _color.A);
             }
-            else if (_isMouseDownSlider2)
+            else if (_isMouseDownAlphaSlider)
             {
                 var color = _color;
-                color.A = 1.0f - Mathf.Saturate((location.Y - _slider2Rect.Y) / _slider2Rect.Height);
+                color.A = 1.0f - Mathf.Saturate((location.Y - _alphaSliderRect.Y) / _alphaSliderRect.Height);
 
                 Color = color;
             }
@@ -306,32 +327,61 @@ namespace FlaxEditor.GUI.Dialogs
             var hs = hsv;
             hs.Z = 1.0f;
             Color hsC = Color.FromHSV(hs);
-            const float slidersOffset = 3.0f;
-            const float slidersThickness = 4.0f;
 
-            // Value
-            float valueY = _slider2Rect.Height * (1 - hsv.Z);
-            var valueR = new Rectangle(_slider1Rect.X - slidersOffset, _slider1Rect.Y + valueY - slidersThickness / 2, _slider1Rect.Width + slidersOffset * 2, slidersThickness);
-            Render2D.FillRectangle(_slider1Rect, hsC, hsC, Color.Black, Color.Black);
-            Render2D.DrawRectangle(_slider1Rect, _isMouseDownSlider1 ? style.BackgroundSelected : Color.Black);
-            Render2D.DrawRectangle(valueR, _isMouseDownSlider1 ? Color.White : Color.Gray);
+            // Value slider
+            float valueKnobExpand = _isMouseDownValueSlider ? 10.0f : 4.0f;
+            float valueY = _valueSliderRect.Height * (1 - hsv.Z);
+            float valueKnobWidth = _valueSliderRect.Width + valueKnobExpand;
+            float valueKnobHeight = _isMouseDownValueSlider ? 7.0f : 4.0f;
+            float valueKnobX = _valueSliderRect.X - valueKnobExpand * 0.5f;
+            float valueKnobY = _valueSliderRect.Y + valueY - valueKnobHeight * 0.5f;
+            Rectangle valueKnobRect = new Rectangle(valueKnobX, valueKnobY, valueKnobWidth, valueKnobHeight);
+            Render2D.FillRectangle(_valueSliderRect, hsC, hsC, Color.Black, Color.Black);
+            // Draw one black and one white border to make the knob visible at any saturation level
+            Render2D.DrawRectangle(valueKnobRect, Color.White, _isMouseDownValueSlider ? 3.0f : 2.0f);
+            Render2D.DrawRectangle(valueKnobRect, Color.Black, _isMouseDownValueSlider ? 2.0f : 1.0f);
 
-            // Alpha
-            float alphaY = _slider2Rect.Height * (1 - _color.A);
-            var alphaR = new Rectangle(_slider2Rect.X - slidersOffset, _slider2Rect.Y + alphaY - slidersThickness / 2, _slider2Rect.Width + slidersOffset * 2, slidersThickness);
+            // Draw checkerboard pattern as background of alpha slider
+            Render2D.FillRectangle(_alphaSliderRect, Color.White);
+            var smallRectSize = _alphaSliderRect.Width / 2.0f;
+            var numHor = Mathf.CeilToInt(_alphaSliderRect.Width / smallRectSize);
+            var numVer = Mathf.CeilToInt(_alphaSliderRect.Height / smallRectSize);
+            Render2D.PushClip(_alphaSliderRect);
+            for (int i = 0; i < numHor; i++)
+            {
+                for (int j = 0; j < numVer; j++)
+                {
+                    if ((i + j) % 2 == 0)
+                    {
+                        var rect = new Rectangle(_alphaSliderRect.X + smallRectSize * i, _alphaSliderRect.Y + smallRectSize * j, new Float2(smallRectSize));
+                        Render2D.FillRectangle(rect, Color.Gray);
+                    }
+                }
+            }
+            Render2D.PopClip();
+
+            // Alpha slider
+            float alphaKnobExpand = _isMouseDownAlphaSlider ? 10.0f : 4.0f;
+            float alphaY = _alphaSliderRect.Height * (1 - _color.A);
+            float alphaKnobWidth = _alphaSliderRect.Width + alphaKnobExpand;
+            float alphaKnobHeight = _isMouseDownAlphaSlider ? 7.0f : 4.0f;
+            float alphaKnobX = _alphaSliderRect.X - alphaKnobExpand * 0.5f;
+            float alphaKnobY = _alphaSliderRect.Y + alphaY - alphaKnobExpand * 0.5f;
+            Rectangle alphaKnobRect = new Rectangle(alphaKnobX, alphaKnobY, alphaKnobWidth, alphaKnobHeight);
             var color = _color;
-            color.A = 1; // Keep slider 2 fill rect from changing color alpha while selecting.
-            Render2D.FillRectangle(_slider2Rect, color, color, Color.Transparent, Color.Transparent);
-            Render2D.DrawRectangle(_slider2Rect, _isMouseDownSlider2 ? style.BackgroundSelected : Color.Black);
-            Render2D.DrawRectangle(alphaR, _isMouseDownSlider2 ? Color.White : Color.Gray);
+            color.A = 1; // Prevent alpha slider fill from becoming transparent
+            Render2D.FillRectangle(_alphaSliderRect, color, color, Color.Transparent, Color.Transparent);
+            // Draw one black and one white border to make the knob visible at any saturation level
+            Render2D.DrawRectangle(alphaKnobRect, Color.White, _isMouseDownAlphaSlider ? 3.0f : 2.0f);
+            Render2D.DrawRectangle(alphaKnobRect, Color.Black, _isMouseDownAlphaSlider ? 2.0f : 1.0f);
         }
 
         /// <inheritdoc />
         public override void OnLostFocus()
         {
             // Clear flags
-            _isMouseDownSlider1 = false;
-            _isMouseDownSlider2 = false;
+            _isMouseDownValueSlider = false;
+            _isMouseDownAlphaSlider = false;
 
             base.OnLostFocus();
         }
@@ -339,15 +389,17 @@ namespace FlaxEditor.GUI.Dialogs
         /// <inheritdoc />
         public override bool OnMouseDown(Float2 location, MouseButton button)
         {
-            if (button == MouseButton.Left && _slider1Rect.Contains(location))
+            if (button == MouseButton.Left && _valueSliderRect.Contains(location))
             {
-                _isMouseDownSlider1 = true;
+                _isMouseDownValueSlider = true;
+                Cursor = CursorType.Hidden;
                 StartMouseCapture();
                 UpdateMouse(ref location);
             }
-            if (button == MouseButton.Left && _slider2Rect.Contains(location))
+            if (button == MouseButton.Left && _alphaSliderRect.Contains(location))
             {
-                _isMouseDownSlider2 = true;
+                _isMouseDownAlphaSlider = true;
+                Cursor = CursorType.Hidden;
                 StartMouseCapture();
                 UpdateMouse(ref location);
             }
@@ -358,10 +410,16 @@ namespace FlaxEditor.GUI.Dialogs
         /// <inheritdoc />
         public override bool OnMouseUp(Float2 location, MouseButton button)
         {
-            if (button == MouseButton.Left && (_isMouseDownSlider1 || _isMouseDownSlider2))
+            if (button == MouseButton.Left && (_isMouseDownValueSlider || _isMouseDownAlphaSlider))
             {
-                _isMouseDownSlider1 = false;
-                _isMouseDownSlider2 = false;
+                // Make the cursor appear where the user expects it to be (center of slider horizontally and slider knob position vertically)
+                float sliderCenter = _isMouseDownValueSlider ? _valueSliderRect.Center.X : _alphaSliderRect.Center.X;
+                // Calculate y position based on the slider knob to avoid incrementing value by a small amount when the user repeatedly clicks the slider (f.e. when moving in small steps)
+                float mouseSliderPosition = _isMouseDownValueSlider ? _valueSliderRect.Y + _valueSliderRect.Height * (1 - _color.ToHSV().Z) + MouseCursorOffset : _alphaSliderRect.Y + _alphaSliderRect.Height * (1 - _color.A) + MouseCursorOffset;
+                Root.MousePosition = new Float2(sliderCenter + MouseCursorOffset, Mathf.Clamp(mouseSliderPosition, _valueSliderRect.Top, _valueSliderRect.Bottom));
+                Cursor = CursorType.Default;
+                _isMouseDownValueSlider = false;
+                _isMouseDownAlphaSlider = false;
                 EndMouseCapture();
                 return true;
             }
@@ -373,8 +431,8 @@ namespace FlaxEditor.GUI.Dialogs
         public override void OnEndMouseCapture()
         {
             // Clear flags
-            _isMouseDownSlider1 = false;
-            _isMouseDownSlider2 = false;
+            _isMouseDownValueSlider = false;
+            _isMouseDownAlphaSlider = false;
 
             base.OnEndMouseCapture();
         }

From c62b3f7624b248eb64a2366809e33ad0f813169b Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 4 Mar 2026 17:53:27 +0100
Subject: [PATCH 100/203] improve color picker layout and accept color
 behaviour

- Color will accept on close dialog or focus loss
- Color will cancel on ESC press
- Increased saved colors count from 8 to 10
- Moved RGB and HSV into tabbed interface
- Moved eyedropper icon
- Removed "Auto Accept Color Picker Change" option since there are no "Cancel" or "OK" button anymore
- Made sure to reset cursor type when the color picker is closed
---
 .../Editor/GUI/Dialogs/ColorPickerDialog.cs   | 257 ++++++++++--------
 Source/Editor/Options/InterfaceOptions.cs     |   7 -
 2 files changed, 150 insertions(+), 114 deletions(-)

diff --git a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
index f528710cd..ab002505f 100644
--- a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
+++ b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
@@ -1,10 +1,11 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
+using System.Collections.Generic;
 using FlaxEditor.GUI.Input;
+using FlaxEditor.GUI.Tabs;
 using FlaxEngine;
 using FlaxEngine.GUI;
 using FlaxEngine.Json;
-using System.Collections.Generic;
 
 namespace FlaxEditor.GUI.Dialogs
 {
@@ -25,15 +26,16 @@ namespace FlaxEditor.GUI.Dialogs
     /// <seealso cref="FlaxEditor.GUI.Dialogs.Dialog" />
     public class ColorPickerDialog : Dialog, IColorPickerDialog
     {
-        private const float ButtonsWidth = 60.0f;
         private const float PickerMargin = 6.0f;
-        private const float EyedropperMargin = 8.0f;
-        private const float RGBAMargin = 12.0f;
-        private const float HSVMargin = 0.0f;
         private const float ChannelsMargin = 4.0f;
         private const float ChannelTextWidth = 12.0f;
         private const float SavedColorButtonWidth = 20.0f;
         private const float SavedColorButtonHeight = 20.0f;
+        private const float TabHeight = 20;
+        private const float ValueBoxesWidth = 100.0f;
+        private const float HSVRGBTextWidth = 15.0f;
+        private const float ColorPreviewHeight = 50.0f;
+        private const int SavedColorsAmount = 10;
 
         private Color _initialValue;
         private Color _value;
@@ -45,16 +47,19 @@ namespace FlaxEditor.GUI.Dialogs
         private ColorValueBox.ColorPickerClosedEvent _onClosed;
 
         private ColorSelectorWithSliders _cSelector;
+        private Tabs.Tabs _hsvRGBTabs;
+        private Tab _RGBTab;
+        private Panel _rgbPanel;
         private FloatValueBox _cRed;
         private FloatValueBox _cGreen;
         private FloatValueBox _cBlue;
-        private FloatValueBox _cAlpha;
+        private Tab _hsvTab;
+        private Panel _hsvPanel;
         private FloatValueBox _cHue;
         private FloatValueBox _cSaturation;
         private FloatValueBox _cValue;
         private TextBox _cHex;
-        private Button _cCancel;
-        private Button _cOK;
+        private FloatValueBox _cAlpha;
         private Button _cEyedropper;
 
         private List<Color> _savedColors = new List<Color>();
@@ -131,90 +136,103 @@ namespace FlaxEditor.GUI.Dialogs
             };
             _cSelector.ColorChanged += x => SelectedColor = x;
 
-            // Red
-            _cRed = new FloatValueBox(0, _cSelector.Right + PickerMargin + RGBAMargin + ChannelTextWidth, PickerMargin, 100, 0, float.MaxValue, 0.001f)
+            _hsvRGBTabs = new Tabs.Tabs
             {
-                Parent = this
+                Location = new Float2(_cSelector.Right + 30.0f, PickerMargin),
+                TabsTextHorizontalAlignment = TextAlignment.Center,
+                Width = ValueBoxesWidth + HSVRGBTextWidth * 2.0f + ChannelsMargin * 2.0f,
+                Height = (FloatValueBox.DefaultHeight + ChannelsMargin) * 4 + ChannelsMargin,
+                Parent = this,
+            };
+            _hsvRGBTabs.TabsSize = new Float2(_hsvRGBTabs.Width * 0.5f, TabHeight);
+            _hsvRGBTabs.SelectedTabChanged += SelectedTabChanged;
+
+            // RGB Tab
+            _RGBTab = _hsvRGBTabs.AddTab(new Tab("RGB"));
+            _rgbPanel = new Panel(ScrollBars.Vertical)
+            {
+                AnchorPreset = AnchorPresets.StretchAll,
+                Offsets = Margin.Zero,
+                Parent = _RGBTab,
+            };
+
+            // HSV Tab
+            _hsvTab = _hsvRGBTabs.AddTab(new Tab("HSV"));
+            _hsvPanel = new Panel(ScrollBars.Vertical)
+            {
+                AnchorPreset = AnchorPresets.StretchAll,
+                Offsets = Margin.Zero,
+                Parent = _hsvTab,
+            };
+
+            // Red
+            _cRed = new FloatValueBox(0, HSVRGBTextWidth + ChannelsMargin, PickerMargin, ValueBoxesWidth, 0, float.MaxValue, 0.001f)
+            {
+                Parent = _rgbPanel,
             };
             _cRed.ValueChanged += OnRGBAChanged;
 
             // Green
             _cGreen = new FloatValueBox(0, _cRed.X, _cRed.Bottom + ChannelsMargin, _cRed.Width, 0, float.MaxValue, 0.001f)
             {
-                Parent = this
+                Parent = _rgbPanel,
             };
             _cGreen.ValueChanged += OnRGBAChanged;
 
             // Blue
             _cBlue = new FloatValueBox(0, _cRed.X, _cGreen.Bottom + ChannelsMargin, _cRed.Width, 0, float.MaxValue, 0.001f)
             {
-                Parent = this
+                Parent = _rgbPanel,
             };
             _cBlue.ValueChanged += OnRGBAChanged;
 
-            // Alpha
-            _cAlpha = new FloatValueBox(0, _cRed.X, _cBlue.Bottom + ChannelsMargin, _cRed.Width, 0, float.MaxValue, 0.001f)
-            {
-                Parent = this
-            };
-            _cAlpha.ValueChanged += OnRGBAChanged;
-
             // Hue
-            _cHue = new FloatValueBox(0, PickerMargin + HSVMargin + ChannelTextWidth, _cSelector.Bottom + PickerMargin, 100)
+            _cHue = new FloatValueBox(0, HSVRGBTextWidth + ChannelsMargin, PickerMargin, ValueBoxesWidth)
             {
-                Parent = this
+                Parent = _hsvPanel,
+                Category = Utils.ValueCategory.Angle,
             };
             _cHue.ValueChanged += OnHSVChanged;
 
             // Saturation
             _cSaturation = new FloatValueBox(0, _cHue.X, _cHue.Bottom + ChannelsMargin, _cHue.Width, 0, 100.0f, 0.1f)
             {
-                Parent = this
+                Parent = _hsvPanel,
             };
             _cSaturation.ValueChanged += OnHSVChanged;
 
             // Value
             _cValue = new FloatValueBox(0, _cHue.X, _cSaturation.Bottom + ChannelsMargin, _cHue.Width, 0, float.MaxValue, 0.1f)
             {
-                Parent = this
+                Parent = _hsvPanel,
             };
             _cValue.ValueChanged += OnHSVChanged;
 
-            // Set valid dialog size based on UI content
-            _dialogSize = Size = new Float2(_cRed.Right + PickerMargin, 300);
+            // Alpha
+            _cAlpha = new FloatValueBox(0, _hsvRGBTabs.Left + HSVRGBTextWidth + ChannelsMargin, _hsvRGBTabs.Bottom + ChannelsMargin * 4.0f, ValueBoxesWidth, 0, float.MaxValue, 0.001f)
+            {
+                Parent = this,
+            };
+            _cAlpha.ValueChanged += OnRGBAChanged;
 
             // Hex
-            const float hexTextBoxWidth = 80;
-            _cHex = new TextBox(false, Width - hexTextBoxWidth - PickerMargin, _cSelector.Bottom + PickerMargin, hexTextBoxWidth)
+            _cHex = new TextBox(false, _hsvRGBTabs.Left + HSVRGBTextWidth + ChannelsMargin, _cAlpha.Bottom + ChannelsMargin * 2.0f, ValueBoxesWidth)
             {
-                Parent = this
+                Parent = this,
             };
             _cHex.EditEnd += OnHexChanged;
 
-            // Cancel
-            _cCancel = new Button(Width - ButtonsWidth - PickerMargin, Height - Button.DefaultHeight - PickerMargin, ButtonsWidth)
-            {
-                Text = "Cancel",
-                Parent = this
-            };
-            _cCancel.Clicked += OnCancel;
-
-            // OK
-            _cOK = new Button(_cCancel.Left - ButtonsWidth - PickerMargin, _cCancel.Y, ButtonsWidth)
-            {
-                Text = "Ok",
-                Parent = this
-            };
-            _cOK.Clicked += OnSubmit;
+            // Set valid dialog size based on UI content
+            _dialogSize = Size = new Float2(_hsvRGBTabs.Right + PickerMargin, _cHex.Bottom + 40.0f + ColorPreviewHeight + PickerMargin);
 
             // Create saved color buttons
-            CreateAllSaveButtons();
+            CreateAllSavedColorsButtons();
 
             // Eyedropper button
             var style = Style.Current;
-            _cEyedropper = new Button(_cOK.X - EyedropperMargin, _cHex.Bottom + PickerMargin)
+            _cEyedropper = new Button(_cSelector.BottomLeft.X, _cSelector.BottomLeft.Y - 25.0f, 25.0f, 25.0f)
             {
-                TooltipText = "Eyedropper tool to pick a color directly from the screen",
+                TooltipText = "Eyedropper tool to pick a color directly from the screen.",
                 BackgroundBrush = new SpriteBrush(Editor.Instance.Icons.Search32),
                 BackgroundColor = style.Foreground,
                 BackgroundColorHighlighted = style.Foreground.RGBMultiplied(0.9f),
@@ -223,9 +241,6 @@ namespace FlaxEditor.GUI.Dialogs
                 Parent = this,
             };
             _cEyedropper.Clicked += OnEyedropStart;
-            _cEyedropper.Height = (_cValue.Bottom - _cEyedropper.Y) * 0.5f;
-            _cEyedropper.Width = _cEyedropper.Height;
-            _cEyedropper.X -= _cEyedropper.Width;
 
             // Set initial color
             SelectedColor = initialValue;
@@ -244,7 +259,7 @@ namespace FlaxEditor.GUI.Dialogs
                     }
                 }
 
-                // Set color of button to current value;
+                // Set color of button to current value
                 button.BackgroundColor = _value;
                 button.BackgroundColorHighlighted = _value;
                 button.BackgroundColorSelected = _value.RGBMultiplied(0.8f);
@@ -256,10 +271,10 @@ namespace FlaxEditor.GUI.Dialogs
                 var savedColors = JsonSerializer.Serialize(_savedColors, typeof(List<Color>));
                 Editor.Instance.ProjectCache.SetCustomData("ColorPickerSavedColors", savedColors);
 
-                // create new + button
-                if (_savedColorButtons.Count < 8)
+                // Create new + button
+                if (_savedColorButtons.Count < SavedColorsAmount)
                 {
-                    var savedColorButton = new Button(PickerMargin * (_savedColorButtons.Count + 1) + SavedColorButtonWidth * _savedColorButtons.Count, Height - SavedColorButtonHeight - PickerMargin, SavedColorButtonWidth, SavedColorButtonHeight)
+                    var savedColorButton = new Button(PickerMargin * (_savedColorButtons.Count + 1) + SavedColorButtonWidth * _savedColorButtons.Count, _cHex.Bottom + 40.0f + ColorPreviewHeight * 0.5f, SavedColorButtonWidth, SavedColorButtonHeight)
                     {
                         Text = "+",
                         Parent = this,
@@ -276,11 +291,32 @@ namespace FlaxEditor.GUI.Dialogs
             }
         }
 
+        private void SelectedTabChanged(Tabs.Tabs tabs)
+        {
+            if (_rgbPanel == null || _hsvPanel == null)
+                return;
+
+            switch (tabs.SelectedTabIndex)
+            {
+                // RGB
+                case 0:
+                    _rgbPanel.Visible = true;
+                    _hsvPanel.Visible = false;
+                    break;
+                // HSV
+                case 1:
+                    _rgbPanel.Visible = false;
+                    _hsvPanel.Visible = true;
+                    break;
+            }
+        }
+
         private void OnColorPicked(Color32 colorPicked)
         {
             if (_activeEyedropper)
             {
                 _activeEyedropper = false;
+                _cEyedropper.BackgroundColor = _cEyedropper.BackgroundColorHighlighted = Style.Current.Foreground;
                 SelectedColor = colorPicked;
                 ScreenUtilities.PickColorDone -= OnColorPicked;
             }
@@ -289,6 +325,7 @@ namespace FlaxEditor.GUI.Dialogs
         private void OnEyedropStart()
         {
             _activeEyedropper = true;
+            _cEyedropper.BackgroundColor = _cEyedropper.BackgroundColorHighlighted = Style.Current.BackgroundHighlighted;
             ScreenUtilities.PickColor();
             ScreenUtilities.PickColorDone += OnColorPicked;
         }
@@ -340,64 +377,76 @@ namespace FlaxEditor.GUI.Dialogs
 
             base.Draw();
 
-            // RGBA
-            var rgbaR = new Rectangle(_cRed.Left - ChannelTextWidth, _cRed.Y, 10000, _cRed.Height);
-            Render2D.DrawText(style.FontMedium, "R", rgbaR, textColor, TextAlignment.Near, TextAlignment.Center);
-            rgbaR.Location.Y = _cGreen.Y;
-            Render2D.DrawText(style.FontMedium, "G", rgbaR, textColor, TextAlignment.Near, TextAlignment.Center);
-            rgbaR.Location.Y = _cBlue.Y;
-            Render2D.DrawText(style.FontMedium, "B", rgbaR, textColor, TextAlignment.Near, TextAlignment.Center);
-            rgbaR.Location.Y = _cAlpha.Y;
-            Render2D.DrawText(style.FontMedium, "A", rgbaR, textColor, TextAlignment.Near, TextAlignment.Center);
+            switch (_hsvRGBTabs.SelectedTabIndex)
+            {
+                // RGB
+                case 0:
+                    var rgbRect = new Rectangle(_hsvRGBTabs.Left + PickerMargin, _hsvRGBTabs.Top + TabHeight + PickerMargin, 10000, _cRed.Height);
+                    Render2D.DrawText(style.FontMedium, "R", rgbRect, textColor, TextAlignment.Near, TextAlignment.Center);
+                    rgbRect.Location.Y += _cRed.Height + ChannelsMargin;
+                    Render2D.DrawText(style.FontMedium, "G", rgbRect, textColor, TextAlignment.Near, TextAlignment.Center);
+                    rgbRect.Location.Y += _cRed.Height + ChannelsMargin;
+                    Render2D.DrawText(style.FontMedium, "B", rgbRect, textColor, TextAlignment.Near, TextAlignment.Center);
+                    break;
+                // HSV
+                case 1:
+                    // Left
+                    var hsvLeftRect = new Rectangle(_hsvRGBTabs.Left + PickerMargin, _hsvRGBTabs.Top + TabHeight + PickerMargin, 10000, _cHue.Height);
+                    Render2D.DrawText(style.FontMedium, "H", hsvLeftRect, textColor, TextAlignment.Near, TextAlignment.Center);
+                    hsvLeftRect.Location.Y += _cHue.Height + ChannelsMargin;
+                    Render2D.DrawText(style.FontMedium, "S", hsvLeftRect, textColor, TextAlignment.Near, TextAlignment.Center);
+                    hsvLeftRect.Location.Y += _cHue.Height + ChannelsMargin;
+                    Render2D.DrawText(style.FontMedium, "V", hsvLeftRect, textColor, TextAlignment.Near, TextAlignment.Center);
 
-            // HSV left
-            var hsvHl = new Rectangle(_cHue.Left - ChannelTextWidth, _cHue.Y, 10000, _cHue.Height);
-            Render2D.DrawText(style.FontMedium, "H", hsvHl, textColor, TextAlignment.Near, TextAlignment.Center);
-            hsvHl.Location.Y = _cSaturation.Y;
-            Render2D.DrawText(style.FontMedium, "S", hsvHl, textColor, TextAlignment.Near, TextAlignment.Center);
-            hsvHl.Location.Y = _cValue.Y;
-            Render2D.DrawText(style.FontMedium, "V", hsvHl, textColor, TextAlignment.Near, TextAlignment.Center);
+                    // Right
+                    var hsvRightRect = new Rectangle(_hsvRGBTabs.Right - HSVRGBTextWidth, _hsvRGBTabs.Top + TabHeight + PickerMargin, ChannelTextWidth, _cHue.Height);
+                    Render2D.DrawText(style.FontMedium, "°", hsvRightRect, textColor, TextAlignment.Near, TextAlignment.Center);
+                    hsvRightRect.Location.Y += _cHue.Height + ChannelsMargin;
+                    Render2D.DrawText(style.FontMedium, "%", hsvRightRect, textColor, TextAlignment.Near, TextAlignment.Center);
+                    hsvRightRect.Location.Y += _cHue.Height + ChannelsMargin;
+                    Render2D.DrawText(style.FontMedium, "%", hsvRightRect, textColor, TextAlignment.Near, TextAlignment.Center);
+                    break;
+            }
 
-            // HSV right
-            var hsvHr = new Rectangle(_cHue.Right + 2, _cHue.Y, 10000, _cHue.Height);
-            Render2D.DrawText(style.FontMedium, "°", hsvHr, textColor, TextAlignment.Near, TextAlignment.Center);
-            hsvHr.Location.Y = _cSaturation.Y;
-            Render2D.DrawText(style.FontMedium, "%", hsvHr, textColor, TextAlignment.Near, TextAlignment.Center);
-            hsvHr.Location.Y = _cValue.Y;
-            Render2D.DrawText(style.FontMedium, "%", hsvHr, textColor, TextAlignment.Near, TextAlignment.Center);
+            // A
+            var alphaHexRect = new Rectangle(_hsvRGBTabs.Left + PickerMargin, _cAlpha.Top, ChannelTextWidth, _cAlpha.Height);
+            Render2D.DrawText(style.FontMedium, "A", alphaHexRect, textColor, TextAlignment.Near, TextAlignment.Center);
 
             // Hex
-            var hex = new Rectangle(_cHex.Left - 26, _cHex.Y, 10000, _cHex.Height);
-            Render2D.DrawText(style.FontMedium, "Hex", hex, textColor, TextAlignment.Near, TextAlignment.Center);
+            alphaHexRect.Y += _cAlpha.Height + ChannelsMargin * 2.0f;
+            alphaHexRect.X -= 5.0f; // "Hex" is two characters wider than the other labels so we need to adjust for that
+            Render2D.DrawText(style.FontMedium, "Hex", alphaHexRect, textColor, TextAlignment.Far, TextAlignment.Center);
 
             // Color difference
-            var newRect = new Rectangle(_cOK.X - 3, _cHex.Bottom + PickerMargin, 130, 0);
-            newRect.Size.Y = 50;
-            Render2D.FillRectangle(newRect, Color.White);
-            var smallRectSize = 10;
-            var numHor = Mathf.FloorToInt(newRect.Width / smallRectSize);
-            var numVer = Mathf.FloorToInt(newRect.Height / smallRectSize);
+            var differenceRect = new Rectangle(_hsvRGBTabs.Left, _cHex.Bottom + 40.0f, _hsvRGBTabs.Width, ColorPreviewHeight);
+
             // Draw checkerboard for background of color to help with transparency
+            Render2D.FillRectangle(differenceRect, Color.White);
+            var smallRectSize = 10;
+            var numHor = Mathf.CeilToInt(differenceRect.Width / smallRectSize);
+            var numVer = Mathf.CeilToInt(differenceRect.Height / smallRectSize);
+            Render2D.PushClip(differenceRect);
             for (int i = 0; i < numHor; i++)
             {
                 for (int j = 0; j < numVer; j++)
                 {
                     if ((i + j) % 2 == 0)
                     {
-                        var rect = new Rectangle(newRect.X + smallRectSize * i, newRect.Y + smallRectSize * j, new Float2(smallRectSize));
+                        var rect = new Rectangle(differenceRect.X + smallRectSize * i, differenceRect.Y + smallRectSize * j, new Float2(smallRectSize));
                         Render2D.FillRectangle(rect, Color.Gray);
                     }
                 }
             }
-            Render2D.FillRectangle(newRect, _value);
+            Render2D.PopClip();
+            Render2D.FillRectangle(differenceRect, _value);
         }
 
         /// <inheritdoc />
         protected override void OnShow()
         {
-            // Auto cancel on lost focus
+            // Apply changes on lost focus
 #if !PLATFORM_LINUX
-            ((WindowRootControl)Root).Window.LostFocus += OnWindowLostFocus;
+            ((WindowRootControl)Root).Window.LostFocus += OnSubmit;
 #endif
 
             base.OnShow();
@@ -410,6 +459,7 @@ namespace FlaxEditor.GUI.Dialogs
             {
                 // Cancel eye dropping
                 _activeEyedropper = false;
+                _cEyedropper.BackgroundColor = _cEyedropper.BackgroundColorHighlighted = Style.Current.Foreground;
                 ScreenUtilities.PickColorDone -= OnColorPicked;
                 return true;
             }
@@ -483,20 +533,20 @@ namespace FlaxEditor.GUI.Dialogs
             }
             _savedColorButtons.Clear();
 
-            CreateAllSaveButtons();
+            CreateAllSavedColorsButtons();
 
             // Save new colors
             var savedColors = JsonSerializer.Serialize(_savedColors, typeof(List<Color>));
             Editor.Instance.ProjectCache.SetCustomData("ColorPickerSavedColors", savedColors);
         }
 
-        private void CreateAllSaveButtons()
+        private void CreateAllSavedColorsButtons()
         {
             // Create saved color buttons
             for (int i = 0; i < _savedColors.Count; i++)
             {
                 var savedColor = _savedColors[i];
-                var savedColorButton = new Button(PickerMargin * (i + 1) + SavedColorButtonWidth * i, Height - SavedColorButtonHeight - PickerMargin, SavedColorButtonWidth, SavedColorButtonHeight)
+                var savedColorButton = new Button(PickerMargin * (i + 1) + SavedColorButtonWidth * i, _cHex.Bottom + 40.0f + ColorPreviewHeight * 0.5f, SavedColorButtonWidth, SavedColorButtonHeight)
                 {
                     Parent = this,
                     Tag = savedColor,
@@ -507,9 +557,9 @@ namespace FlaxEditor.GUI.Dialogs
                 savedColorButton.ButtonClicked += OnSavedColorButtonClicked;
                 _savedColorButtons.Add(savedColorButton);
             }
-            if (_savedColors.Count < 8)
+            if (_savedColors.Count < SavedColorsAmount)
             {
-                var savedColorButton = new Button(PickerMargin * (_savedColors.Count + 1) + SavedColorButtonWidth * _savedColors.Count, Height - SavedColorButtonHeight - PickerMargin, SavedColorButtonWidth, SavedColorButtonHeight)
+                var savedColorButton = new Button(PickerMargin * (_savedColors.Count + 1) + SavedColorButtonWidth * _savedColors.Count, _cHex.Bottom + 40.0f + ColorPreviewHeight * 0.5f, SavedColorButtonWidth, SavedColorButtonHeight)
                 {
                     Text = "+",
                     Parent = this,
@@ -521,19 +571,6 @@ namespace FlaxEditor.GUI.Dialogs
             }
         }
 
-        private void OnWindowLostFocus()
-        {
-            // Auto apply color on defocus
-            var autoAcceptColorPickerChange = Editor.Instance.Options.Options.Interface.AutoAcceptColorPickerChange;
-            if (_useDynamicEditing && _initialValue != _value && _canPassLastChangeEvent && autoAcceptColorPickerChange)
-            {
-                _canPassLastChangeEvent = false;
-                _onChanged?.Invoke(_value, false);
-            }
-
-            OnCancel();
-        }
-
         /// <inheritdoc />
         public override void OnSubmit()
         {
@@ -541,6 +578,9 @@ namespace FlaxEditor.GUI.Dialogs
                 return;
             _disableEvents = true;
 
+            // Ensure the cursor is restored
+            Cursor = CursorType.Default;
+
             // Send color event if modified
             if (_value != _initialValue)
             {
@@ -557,6 +597,9 @@ namespace FlaxEditor.GUI.Dialogs
                 return;
             _disableEvents = true;
 
+            // Ensure the cursor is restored
+            Cursor = CursorType.Default;
+
             // Restore color if modified
             if (_useDynamicEditing && _initialValue != _value && _canPassLastChangeEvent)
             {
diff --git a/Source/Editor/Options/InterfaceOptions.cs b/Source/Editor/Options/InterfaceOptions.cs
index f26506c74..50f7c6f04 100644
--- a/Source/Editor/Options/InterfaceOptions.cs
+++ b/Source/Editor/Options/InterfaceOptions.cs
@@ -207,13 +207,6 @@ namespace FlaxEditor.Options
         [EditorDisplay("Interface"), EditorOrder(280), Tooltip("Editor content window orientation.")]
         public FlaxEngine.GUI.Orientation ContentWindowOrientation { get; set; } = FlaxEngine.GUI.Orientation.Horizontal;
 
-        /// <summary>
-        /// If checked, color pickers will always modify the color unless 'Cancel' if pressed, otherwise color won't change unless 'Ok' is pressed.
-        /// </summary>
-        [DefaultValue(true)]
-        [EditorDisplay("Interface"), EditorOrder(290)]
-        public bool AutoAcceptColorPickerChange { get; set; } = true;
-
         /// <summary>
         /// Gets or sets the formatting option for numeric values in the editor.
         /// </summary>

From 1ef35c3f94a33af292cb17e6ab9004459195fed1 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 4 Mar 2026 23:57:21 +0100
Subject: [PATCH 101/203] clear up naming of "Pre-skinning Local Vertex Pos"

---
 Source/Editor/Surface/Archetypes/Material.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/Editor/Surface/Archetypes/Material.cs b/Source/Editor/Surface/Archetypes/Material.cs
index 9ac43082e..bed6b7737 100644
--- a/Source/Editor/Surface/Archetypes/Material.cs
+++ b/Source/Editor/Surface/Archetypes/Material.cs
@@ -584,10 +584,11 @@ namespace FlaxEditor.Surface.Archetypes
             new NodeArchetype
             {
                 TypeID = 13,
-                Title = "Pre-skinned Local Position",
+                Title = "Pre-skinning Local Vertex Pos",
                 Description = "Per vertex local position (before skinning)",
+                AlternativeTitles = new[] { "Vertex Position", "Pre skinning Local Vertex Pos" },
                 Flags = NodeFlags.MaterialGraph,
-                Size = new Float2(230, 40),
+                Size = new Float2(270, 40),
                 Elements = new[]
                 {
                     NodeElementArchetype.Factory.Output(0, string.Empty, typeof(Float3), 0),
@@ -596,10 +597,11 @@ namespace FlaxEditor.Surface.Archetypes
             new NodeArchetype
             {
                 TypeID = 14,
-                Title = "Pre-skinned Local Normal",
+                Title = "Pre-skinning Local Normal",
                 Description = "Per vertex local normal (before skinning)",
+                AlternativeTitles = new[] { "Pre skinning Local Normal" },
                 Flags = NodeFlags.MaterialGraph,
-                Size = new Float2(230, 40),
+                Size = new Float2(270, 40),
                 Elements = new[]
                 {
                     NodeElementArchetype.Factory.Output(0, string.Empty, typeof(Float3), 0),

From 64c2d64d84575e62bf1b0a70093d45c90a5acb96 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Thu, 5 Mar 2026 20:14:48 +0100
Subject: [PATCH 102/203] increase distante for slot into connection feature

---
 Source/Editor/Surface/Elements/OutputBox.cs   | 12 ++++-------
 Source/Editor/Surface/VisjectSurface.Input.cs | 20 ++++++++++++++-----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Source/Editor/Surface/Elements/OutputBox.cs b/Source/Editor/Surface/Elements/OutputBox.cs
index 7e271fef0..8836dc0dc 100644
--- a/Source/Editor/Surface/Elements/OutputBox.cs
+++ b/Source/Editor/Surface/Elements/OutputBox.cs
@@ -34,11 +34,6 @@ namespace FlaxEditor.Surface.Elements
         /// </summary>
         public const float DefaultConnectionOffset = 24f;
 
-        /// <summary>
-        /// Distance for the mouse to be considered above the connection
-        /// </summary>
-        public float MouseOverConnectionDistance => 100f / Surface.ViewScale;
-
         /// <inheritdoc />
         public OutputBox(SurfaceNode parentNode, NodeElementArchetype archetype)
         : base(parentNode, archetype, archetype.Position + new Float2(parentNode.Archetype.Size.X, 0))
@@ -109,12 +104,13 @@ namespace FlaxEditor.Surface.Elements
         /// </summary>
         /// <param name="targetBox">The other box.</param>
         /// <param name="mousePosition">The mouse position</param>
-        public bool IntersectsConnection(Box targetBox, ref Float2 mousePosition)
+        /// <param name="distance">Distance at which its an intersection</param>
+        public bool IntersectsConnection(Box targetBox, ref Float2 mousePosition, float distance)
         {
             float connectionOffset = Mathf.Max(0f, DefaultConnectionOffset * (1 - Editor.Instance.Options.Options.Interface.ConnectionCurvature));
             Float2 start = new Float2(ConnectionOrigin.X + connectionOffset, ConnectionOrigin.Y);
             Float2 end = new Float2(targetBox.ConnectionOrigin.X - connectionOffset, targetBox.ConnectionOrigin.Y);
-            return IntersectsConnection(ref start, ref end, ref mousePosition, MouseOverConnectionDistance);
+            return IntersectsConnection(ref start, ref end, ref mousePosition, distance);
         }
 
         /// <summary>
@@ -182,7 +178,7 @@ namespace FlaxEditor.Surface.Elements
         {
             // Draw all the connections
             var style = Surface.Style;
-            var mouseOverDistance = MouseOverConnectionDistance;
+            var mouseOverDistance = Surface.MouseOverConnectionDistance;
             var startPos = ConnectionOrigin;
             var startHighlight = ConnectionsHighlightIntensity;
             for (int i = 0; i < Connections.Count; i++)
diff --git a/Source/Editor/Surface/VisjectSurface.Input.cs b/Source/Editor/Surface/VisjectSurface.Input.cs
index 74eaa3e04..01c78ccb1 100644
--- a/Source/Editor/Surface/VisjectSurface.Input.cs
+++ b/Source/Editor/Surface/VisjectSurface.Input.cs
@@ -24,6 +24,16 @@ namespace FlaxEditor.Surface
         /// </summary>
         public bool PanWithMiddleMouse = false;
 
+        /// <summary>
+        /// Distance for the mouse to be considered above the connection.
+        /// </summary>
+        public float MouseOverConnectionDistance => 100f / ViewScale;
+
+        /// <summary>
+        /// Distance of a node from which it is able to be slotted into an existing connection.
+        /// </summary>
+        public float SlotNodeIntoConnectionDistance => 250f / ViewScale;
+
         private string _currentInputText = string.Empty;
         private Float2 _movingNodesDelta;
         private Float2 _gridRoundingDelta;
@@ -456,7 +466,7 @@ namespace FlaxEditor.Surface
             if (!handled && CanEdit && CanUseNodeType(7, 29))
             {
                 var mousePos = _rootControl.PointFromParent(ref _mousePos);
-                if (IntersectsConnection(mousePos, out InputBox inputBox, out OutputBox outputBox) && GetControlUnderMouse() == null)
+                if (IntersectsConnection(mousePos, out InputBox inputBox, out OutputBox outputBox, MouseOverConnectionDistance) && GetControlUnderMouse() == null)
                 {
                     if (Undo != null)
                     {
@@ -653,7 +663,7 @@ namespace FlaxEditor.Surface
                             var mousePos = _rootControl.PointFromParent(ref _mousePos);
                             InputBox intersectedConnectionInputBox;
                             OutputBox intersectedConnectionOutputBox;
-                            if (IntersectsConnection(mousePos, out intersectedConnectionInputBox, out intersectedConnectionOutputBox))
+                            if (IntersectsConnection(mousePos, out intersectedConnectionInputBox, out intersectedConnectionOutputBox, SlotNodeIntoConnectionDistance))
                             {
                                 SurfaceNode node = _movingNodes.First();
                                 InputBox nodeInputBox = (InputBox)node.GetBoxes().First(b => !b.IsOutput);
@@ -783,7 +793,7 @@ namespace FlaxEditor.Surface
                 {
                     // Surface was not moved with MMB so try to remove connection underneath
                     var mousePos = _rootControl.PointFromParent(ref location);
-                    if (IntersectsConnection(mousePos, out InputBox inputBox, out OutputBox outputBox))
+                    if (IntersectsConnection(mousePos, out InputBox inputBox, out OutputBox outputBox, MouseOverConnectionDistance))
                     {
                         var action = new EditNodeConnections(inputBox.ParentNode.Context, inputBox.ParentNode);
                         inputBox.BreakConnection(outputBox);
@@ -1180,7 +1190,7 @@ namespace FlaxEditor.Surface
             return new Float2(xLocation, yLocation);
         }
 
-        private bool IntersectsConnection(Float2 mousePosition, out InputBox inputBox, out OutputBox outputBox)
+        private bool IntersectsConnection(Float2 mousePosition, out InputBox inputBox, out OutputBox outputBox, float distance)
         {
             for (int i = 0; i < Nodes.Count; i++)
             {
@@ -1190,7 +1200,7 @@ namespace FlaxEditor.Surface
                     {
                         for (int k = 0; k < ob.Connections.Count; k++)
                         {
-                            if (ob.IntersectsConnection(ob.Connections[k], ref mousePosition))
+                            if (ob.IntersectsConnection(ob.Connections[k], ref mousePosition, distance))
                             {
                                 outputBox = ob;
                                 inputBox = ob.Connections[k] as InputBox;

From d163064f958efdc8a9ccb10e922971daf024af48 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Thu, 5 Mar 2026 20:33:18 +0100
Subject: [PATCH 103/203] fix hv wheel selector

---
 Source/Editor/GUI/Dialogs/ColorSelector.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/Editor/GUI/Dialogs/ColorSelector.cs b/Source/Editor/GUI/Dialogs/ColorSelector.cs
index 392a8d934..3d781a8ec 100644
--- a/Source/Editor/GUI/Dialogs/ColorSelector.cs
+++ b/Source/Editor/GUI/Dialogs/ColorSelector.cs
@@ -194,10 +194,11 @@ namespace FlaxEditor.GUI.Dialogs
             // Wheel
             float boxExpand = (2.0f * 4.0f / 128.0f) * _wheelRect.Width;
             Render2D.DrawMaterial(_hsWheelMaterial, _wheelRect, enabled ? Color.White : Color.Gray);
-            Color hsColor = Color.FromHSV(new Float3(Color.ToHSV().X, 1, 1));
+            Float3 hsv = _color.ToHSV();
+            Color hsColor = Color.FromHSV(new Float3(hsv.X, hsv.Y, 1));
             Rectangle wheelRect = wheelDragRect;
             Render2D.FillRectangle(wheelRect, hsColor);
-            Render2D.DrawRectangle(wheelRect, _isMouseDownWheel ? Color.Gray : Color.Black, _isMouseDownWheel ? 3.0f : 1.0f);
+            Render2D.DrawRectangle(wheelRect, Color.Black, _isMouseDownWheel ? 2.0f : 1.0f);
         }
 
         /// <inheritdoc />

From 4d4571ee55e5ceeba8e4c032ddac63677b4a1fc2 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Fri, 6 Mar 2026 20:02:24 -0600
Subject: [PATCH 104/203] Allow -1 for Max textbox length

Allow -1 to be "no" length or max length. add bottom limit of -1.
---
 Source/Engine/UI/GUI/Common/TextBoxBase.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Source/Engine/UI/GUI/Common/TextBoxBase.cs b/Source/Engine/UI/GUI/Common/TextBoxBase.cs
index 7deb9a367..489e4c93d 100644
--- a/Source/Engine/UI/GUI/Common/TextBoxBase.cs
+++ b/Source/Engine/UI/GUI/Common/TextBoxBase.cs
@@ -191,14 +191,18 @@ namespace FlaxEngine.GUI
         /// <summary>
         /// Gets or sets the maximum number of characters the user can type into the text box control.
         /// </summary>
-        [EditorOrder(50), Tooltip("The maximum number of characters the user can type into the text box control.")]
+        [EditorOrder(50), Limit(-1), Tooltip("The maximum number of characters the user can type into the text box control.")]
         public int MaxLength
         {
             get => _maxLength;
             set
             {
-                if (_maxLength <= 0)
-                    throw new ArgumentOutOfRangeException(nameof(MaxLength));
+                // Cap at min of -1 for no max length
+                if (value <= 0)
+                {
+                    _maxLength = -1;
+                    return;
+                }
 
                 if (_maxLength != value)
                 {
@@ -381,7 +385,7 @@ namespace FlaxEngine.GUI
                 value = value.Replace(DelChar.ToString(), "");
 
             // Clamp length
-            if (value.Length > MaxLength)
+            if (value.Length > MaxLength && MaxLength != -1)
                 value = value.Substring(0, MaxLength);
 
             // Ensure to use only single line
@@ -514,7 +518,7 @@ namespace FlaxEngine.GUI
             AutoFocus = true;
 
             _isMultiline = isMultiline;
-            _maxLength = 2147483646;
+            _maxLength = -1;
             _selectionStart = _selectionEnd = -1;
 
             var style = Style.Current;
@@ -710,7 +714,7 @@ namespace FlaxEngine.GUI
                 str = str.Replace("\n", "");
 
             int selectionLength = SelectionLength;
-            int charactersLeft = MaxLength - _text.Length + selectionLength;
+            int charactersLeft = (MaxLength != -1 ? MaxLength : int.MaxValue) - _text.Length + selectionLength;
             Assert.IsTrue(charactersLeft >= 0);
             if (charactersLeft == 0)
                 return;

From e710a6e2d181688142aed928dd46a91fce8429f4 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sun, 8 Mar 2026 22:13:31 +0100
Subject: [PATCH 105/203] Adjust naming

---
 Source/Editor/Surface/Archetypes/Material.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Editor/Surface/Archetypes/Material.cs b/Source/Editor/Surface/Archetypes/Material.cs
index bed6b7737..df89dfc94 100644
--- a/Source/Editor/Surface/Archetypes/Material.cs
+++ b/Source/Editor/Surface/Archetypes/Material.cs
@@ -584,9 +584,9 @@ namespace FlaxEditor.Surface.Archetypes
             new NodeArchetype
             {
                 TypeID = 13,
-                Title = "Pre-skinning Local Vertex Pos",
+                Title = "Pre-skinned Local Position",
                 Description = "Per vertex local position (before skinning)",
-                AlternativeTitles = new[] { "Vertex Position", "Pre skinning Local Vertex Pos" },
+                AlternativeTitles = new[] { "Vertex Position", "Pre skinning Local Vertex Position" },
                 Flags = NodeFlags.MaterialGraph,
                 Size = new Float2(270, 40),
                 Elements = new[]
@@ -597,9 +597,9 @@ namespace FlaxEditor.Surface.Archetypes
             new NodeArchetype
             {
                 TypeID = 14,
-                Title = "Pre-skinning Local Normal",
+                Title = "Pre-skinned Local Normal",
                 Description = "Per vertex local normal (before skinning)",
-                AlternativeTitles = new[] { "Pre skinning Local Normal" },
+                AlternativeTitles = new[] { "Vertex Normal", "Pre skinning Local Normal" },
                 Flags = NodeFlags.MaterialGraph,
                 Size = new Float2(270, 40),
                 Elements = new[]

From 57489abc3a2bc195b599f84c77aa572385fc8779 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sun, 8 Mar 2026 22:37:17 +0100
Subject: [PATCH 106/203] Minor adjustment to #3934

---
 Source/Editor/Surface/VisjectSurfaceWindow.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Editor/Surface/VisjectSurfaceWindow.cs b/Source/Editor/Surface/VisjectSurfaceWindow.cs
index 109499c35..3151f9b17 100644
--- a/Source/Editor/Surface/VisjectSurfaceWindow.cs
+++ b/Source/Editor/Surface/VisjectSurfaceWindow.cs
@@ -709,7 +709,8 @@ namespace FlaxEditor.Surface
             var index = (int)label.Tag;
             menu.AddSeparator();
             menu.AddButton("Copy name", () => Clipboard.Text = ((IVisjectSurfaceWindow)Values[0]).VisjectSurface.Parameters[index].Name);
-            menu.AddButton("Copy all names", () => Clipboard.Text = GetAllParamterNamesAsConstantCSharpCode());
+            // TODO: move 'Copy all names' to context menu of the Properties category (as it's not item-specific)
+            menu.AddButton("Copy all names", CopyAllParameterNamesAsConstantCSharpCode);
             menu.AddSeparator();
             menu.AddButton("Rename", () => StartParameterRenaming(index, label));
             menu.AddButton("Edit attributes...", () => EditAttributesParameter(index, label));
@@ -717,7 +718,7 @@ namespace FlaxEditor.Surface
             OnParamContextMenu(index, menu);
         }
 
-        private string GetAllParamterNamesAsConstantCSharpCode()
+        private void CopyAllParameterNamesAsConstantCSharpCode()
         {
             string allParamNames = "";
             foreach (var param in ((IVisjectSurfaceWindow)Values[0]).VisjectSurface.Parameters)
@@ -728,8 +729,7 @@ namespace FlaxEditor.Surface
                     continue;
                 allParamNames += $"private const string {cleanParamName}ParameterName = \"{param.Name}\";\n";
             }
-
-            return allParamNames;
+            Clipboard.Text = allParamNames;
         }
 
         private void StartParameterRenaming(int index, Control label)

From c376f220ca155040e89c01ea55797b7d3cb630a0 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sun, 8 Mar 2026 22:46:53 +0100
Subject: [PATCH 107/203] Minor adjustments to #3846

---
 .../CustomEditors/Dedicated/ScriptsEditor.cs  | 41 ++++++-------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
index 29c8e889e..1a308e08a 100644
--- a/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
@@ -739,7 +739,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
         /// <inheritdoc />
         public override void Initialize(LayoutElementsContainer layout)
         {
-            var _style = FlaxEngine.GUI.Style.Current;
+            var style = FlaxEngine.GUI.Style.Current;
 
             // Area for drag&drop scripts
             var dragArea = layout.CustomContainer<DragAreaControl>();
@@ -802,17 +802,10 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 bool hasAllRequirements = true;
                 if (scriptType.HasAttribute(typeof(RequireScriptAttribute), false))
                 {
-                    RequireScriptAttribute scriptAttribute = null;
-                    foreach (var e in scriptType.GetAttributes(false))
+                    var attribute = (RequireScriptAttribute)scriptType.GetAttributes(false).FirstOrDefault(x => x is RequireScriptAttribute);
+                    if (attribute != null)
                     {
-                        if (e is not RequireScriptAttribute requireScriptAttribute)
-                            continue;
-                        scriptAttribute = requireScriptAttribute;
-                    }
-
-                    if (scriptAttribute != null)
-                    {
-                        foreach (var type in scriptAttribute.RequiredTypes)
+                        foreach (var type in attribute.RequiredTypes)
                         {
                             if (!type.IsSubclassOf(typeof(Script)))
                                 continue;
@@ -827,15 +820,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 }
                 if (scriptType.HasAttribute(typeof(RequireActorAttribute), false))
                 {
-                    RequireActorAttribute attribute = null;
-                    foreach (var e in scriptType.GetAttributes(false))
-                    {
-                        if (e is not RequireActorAttribute requireActorAttribute)
-                            continue;
-                        attribute = requireActorAttribute;
-                        break;
-                    }
-
+                    var attribute = (RequireActorAttribute)scriptType.GetAttributes(false).FirstOrDefault(x => x is RequireActorAttribute);
                     if (attribute != null)
                     {
                         var actor = script.Actor;
@@ -852,7 +837,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 var title = Utilities.Utils.GetPropertyNameUI(scriptType.Name);
                 var group = layout.Group(title, editor);
                 if (!hasAllRequirements)
-                    group.Panel.HeaderTextColor = _style.Statusbar.Failed;
+                    group.Panel.HeaderTextColor = style.Statusbar.Failed;
                 if ((Presenter.Features & FeatureFlags.CacheExpandedGroups) != 0)
                 {
                     if (Editor.Instance.ProjectCache.IsGroupToggled(title))
@@ -868,7 +853,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 float totalHeaderButtonsOffset = 0f;
                 group.Panel.TooltipText = Editor.Instance.CodeDocs.GetTooltip(scriptType);
                 if (script.HasPrefabLink)
-                    group.Panel.HeaderTextColor = _style.ProgressNormal;
+                    group.Panel.HeaderTextColor = style.ProgressNormal;
 
                 // Add toggle button to the group
                 var headerHeight = group.Panel.HeaderHeight;
@@ -892,7 +877,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     TooltipText = "Script reference.",
                     AutoFocus = true,
                     IsScrollable = false,
-                    Color = _style.ForegroundGrey,
+                    Color = style.ForegroundGrey,
                     Parent = group.Panel,
                     Bounds = new Rectangle(scriptToggle.Right, 0.5f, headerHeight, headerHeight),
                     Margin = new Margin(1),
@@ -916,9 +901,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 // Add script obsolete icon to the group
                 if (scriptType.HasAttribute(typeof(ObsoleteAttribute), false))
                 {
-                    ObsoleteAttribute attribute = (ObsoleteAttribute)scriptType.GetAttributes(false).First(x => x is ObsoleteAttribute);
-
-                    string tooltip = "Script marked as obsolete." +
+                    var attribute = (ObsoleteAttribute)scriptType.GetAttributes(false).First(x => x is ObsoleteAttribute);
+                    var tooltip = "Script marked as obsolete." +
                         (string.IsNullOrEmpty(attribute.Message) ? "" : $"\n{attribute.Message}") +
                         (string.IsNullOrEmpty(attribute.DiagnosticId) ? "" : $"\n{attribute.DiagnosticId}");
                     var obsoleteButton = group.AddHeaderButton(tooltip, totalHeaderButtonsOffset, Editor.Instance.Icons.Info32);
@@ -932,14 +916,15 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 if (isPrefabActor && script.PrefabID == Guid.Empty)
                 {
                     var prefabInstanceButton = group.AddHeaderButton("Script only exists in this prefab instance.", totalHeaderButtonsOffset, Editor.Instance.Icons.Add32);
-                    prefabInstanceButton.Color = _style.ProgressNormal;
-                    prefabInstanceButton.MouseOverColor = _style.ProgressNormal * 0.9f;
+                    prefabInstanceButton.Color = style.ProgressNormal;
+                    prefabInstanceButton.MouseOverColor = style.ProgressNormal * 0.9f;
                     totalHeaderButtonsOffset += prefabInstanceButton.Width;
                 }
 
                 // Adjust margin to not overlap with other ui elements in the header
                 group.Panel.HeaderTextMargin = group.Panel.HeaderTextMargin with { Left = scriptDrag.Right - 12, Right = settingsButton.Width + Utilities.Constants.UIMargin };
                 group.Object(values, editor);
+
                 // Remove drop down arrows and containment lines if no objects in the group
                 if (group.Children.Count == 0)
                 {

From 5509bc4989dd454a33402ff68fff11348cbfa3ab Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 10 Mar 2026 16:29:39 +0100
Subject: [PATCH 108/203] Add option to render `Canvas` into `GPUTexture`

#3601
---
 Source/Engine/Renderer/GBufferPass.cpp    |  1 +
 Source/Engine/UI/GUI/CanvasRootControl.cs |  4 +-
 Source/Engine/UI/GUI/CanvasScaler.cs      |  1 +
 Source/Engine/UI/UICanvas.cs              | 52 ++++++++++++++++++++++-
 4 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/Source/Engine/Renderer/GBufferPass.cpp b/Source/Engine/Renderer/GBufferPass.cpp
index 1881aac3b..e62970f83 100644
--- a/Source/Engine/Renderer/GBufferPass.cpp
+++ b/Source/Engine/Renderer/GBufferPass.cpp
@@ -158,6 +158,7 @@ void GBufferPass::Fill(RenderContext& renderContext, GPUTexture* lightBuffer)
         renderContext.Buffers->GBuffer3->View(),
     };
     renderContext.View.Pass = DrawPass::GBuffer;
+    context->SetViewportAndScissors(renderContext.Buffers->GetViewport());
 
     // Clear GBuffer
     {
diff --git a/Source/Engine/UI/GUI/CanvasRootControl.cs b/Source/Engine/UI/GUI/CanvasRootControl.cs
index 4697c5051..db6722090 100644
--- a/Source/Engine/UI/GUI/CanvasRootControl.cs
+++ b/Source/Engine/UI/GUI/CanvasRootControl.cs
@@ -25,12 +25,12 @@ namespace FlaxEngine.GUI
         /// <summary>
         /// Gets a value indicating whether canvas is 2D (screen-space).
         /// </summary>
-        public bool Is2D => _canvas.RenderMode == CanvasRenderMode.ScreenSpace;
+        public bool Is2D => _canvas.Is2D;
 
         /// <summary>
         /// Gets a value indicating whether canvas is 3D (world-space or camera-space).
         /// </summary>
-        public bool Is3D => _canvas.RenderMode != CanvasRenderMode.ScreenSpace;
+        public bool Is3D => _canvas.Is3D;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CanvasRootControl"/> class.
diff --git a/Source/Engine/UI/GUI/CanvasScaler.cs b/Source/Engine/UI/GUI/CanvasScaler.cs
index 1e30fd22f..8dc1fcd4d 100644
--- a/Source/Engine/UI/GUI/CanvasScaler.cs
+++ b/Source/Engine/UI/GUI/CanvasScaler.cs
@@ -298,6 +298,7 @@ namespace FlaxEngine.GUI
                 {
                 case CanvasRenderMode.WorldSpace:
                 case CanvasRenderMode.WorldSpaceFaceCamera:
+                case CanvasRenderMode.GPUTexture:
                     scale = 1.0f;
                     break;
                 default:
diff --git a/Source/Engine/UI/UICanvas.cs b/Source/Engine/UI/UICanvas.cs
index 20c81ce1c..df542aacf 100644
--- a/Source/Engine/UI/UICanvas.cs
+++ b/Source/Engine/UI/UICanvas.cs
@@ -33,6 +33,11 @@ namespace FlaxEngine
         /// The world space rendering mode that places Canvas as any other object in the scene and orients it to face the camera. The size of the Canvas can be set manually using its Transform, and UI elements will render in front of or behind other objects in the scene based on 3D placement. This is useful for UIs that are meant to be a part of the world. This is also known as a 'diegetic interface'.
         /// </summary>
         WorldSpaceFaceCamera = 3,
+
+        /// <summary>
+        /// The off-screen rendering mode that draws the contents of the canvas into a GPU texture that can be used in the scene or by other systems. The size of the canvas is automatically set to the size of the texture.
+        /// </summary>
+        GPUTexture = 4,
     }
 
     /// <summary>
@@ -105,7 +110,7 @@ namespace FlaxEngine
         private CanvasRenderMode _renderMode;
         private readonly CanvasRootControl _guiRoot;
         private CanvasRenderer _renderer;
-        private bool _isLoading, _isRegisteredForTick;
+        private bool _isLoading, _isRegisteredForTick, _isRegisteredForOnDraw;
 
         /// <summary>
         /// Gets or sets the canvas rendering mode.
@@ -169,6 +174,8 @@ namespace FlaxEngine
 
         private bool Editor_IsCameraSpace => _renderMode == CanvasRenderMode.CameraSpace;
 
+        private bool Editor_IsGPUTexture => _renderMode == CanvasRenderMode.GPUTexture;
+
         private bool Editor_UseRenderCamera => _renderMode == CanvasRenderMode.CameraSpace || _renderMode == CanvasRenderMode.WorldSpaceFaceCamera;
 #endif
 
@@ -206,6 +213,12 @@ namespace FlaxEngine
         [EditorOrder(60), Limit(0.01f), EditorDisplay("Canvas"), VisibleIf("Editor_IsCameraSpace"), Tooltip("Distance from the RenderCamera to place the plane with GUI. If the screen is resized, changes resolution, or the camera frustum changes, the Canvas will automatically change size to match as well.")]
         public float Distance { get; set; } = 500;
 
+        /// <summary>
+        /// Gets or sets the output texture for the canvas when render mode is set to <see cref="CanvasRenderMode.GPUTexture"/>. The size of the canvas will be automatically set to the size of the texture. The canvas will render its content into this texture.
+        /// </summary>
+        [EditorOrder(70), NoSerialize, EditorDisplay("Canvas"), VisibleIf("Editor_IsGPUTexture")]
+        public GPUTexture OutputTexture { get; set; }
+
         /// <summary>
         /// Gets the canvas GUI root control.
         /// </summary>
@@ -329,6 +342,11 @@ namespace FlaxEngine
                 _isRegisteredForTick = false;
                 Scripting.Update -= OnUpdate;
             }
+            if (_isRegisteredForOnDraw)
+            {
+                _isRegisteredForOnDraw = false;
+                Scripting.Draw -= OnDraw;
+            }
         }
 
         /// <summary>
@@ -358,7 +376,7 @@ namespace FlaxEngine
         /// <summary>
         /// Gets a value indicating whether canvas is 3D (world-space or camera-space).
         /// </summary>
-        public bool Is3D => _renderMode != CanvasRenderMode.ScreenSpace;
+        public bool Is3D => _renderMode != CanvasRenderMode.ScreenSpace && _renderMode != CanvasRenderMode.GPUTexture;
 
         /// <summary>
         /// Gets the world matrix used to transform the GUI from the local space to the world space. Handles canvas rendering mode
@@ -491,6 +509,11 @@ namespace FlaxEngine
         {
             if (_isLoading)
                 return;
+            if (_isRegisteredForOnDraw)
+            {
+                _isRegisteredForOnDraw = false;
+                Scripting.Draw -= OnDraw;
+            }
 
             switch (_renderMode)
             {
@@ -563,7 +586,32 @@ namespace FlaxEngine
                 }
                 break;
             }
+            case CanvasRenderMode.GPUTexture:
+            {
+                if (!_isRegisteredForOnDraw)
+                {
+                    _isRegisteredForOnDraw = true;
+                    Scripting.Draw += OnDraw;
+                }
+                break;
             }
+            }
+        }
+
+        private void OnDraw()
+        {
+            var outputTexture = OutputTexture;
+            if (!outputTexture || !outputTexture.IsAllocated)
+                return;
+            var context = GPUDevice.Instance.MainContext;
+            _guiRoot.Size = outputTexture.Size;
+
+            Profiler.BeginEvent("UI Canvas");
+            Profiler.BeginEventGPU("UI Canvas");
+            context.Clear(outputTexture.View(), Color.Transparent);
+            Render2D.CallDrawing(GUI, context, outputTexture);
+            Profiler.EndEvent();
+            Profiler.EndEventGPU();
         }
 
         private void OnUpdate()

From 3bbaa7025a29858c3cbc3c7bbc101990acd29bc7 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 10 Mar 2026 17:01:57 +0100
Subject: [PATCH 109/203] Fix crash when destroying actor that was left in
 enabled state

#3880
---
 Source/Engine/Level/Actor.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/Source/Engine/Level/Actor.cpp b/Source/Engine/Level/Actor.cpp
index f52fab600..abf62aef0 100644
--- a/Source/Engine/Level/Actor.cpp
+++ b/Source/Engine/Level/Actor.cpp
@@ -178,21 +178,20 @@ void Actor::OnDeleteObject()
             _scene = nullptr;
         }
     }
-    else if (_parent)
+    else
     {
-        // Unlink from the parent
-        _parent->Children.RemoveKeepOrder(this);
-        _parent->_isHierarchyDirty = true;
-        _parent = nullptr;
-        _scene = nullptr;
+        if (_isEnabled)
+            OnDisable();
+        if (_parent)
+        {
+            // Unlink from the parent
+            _parent->Children.RemoveKeepOrder(this);
+            _parent->_isHierarchyDirty = true;
+            _parent = nullptr;
+            _scene = nullptr;
+        }
     }
 
-    // Ensure to exit gameplay in a valid way
-    ASSERT(!IsDuringPlay());
-#if BUILD_DEBUG || BUILD_DEVELOPMENT
-    ASSERT(!_isEnabled);
-#endif
-
     // Fire event
     Deleted(this);
 

From afc4d0f3d394a3c3454ff9b96e2c34a51be4e51f Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 10 Mar 2026 19:58:50 +0100
Subject: [PATCH 110/203] Add Dead Zone to virtual input action for better
 usage with gamepad sticks/triggers

#3660
---
 Source/Engine/Input/Gamepad.cpp    | 80 ++++++++++++++++++++++++++++++
 Source/Engine/Input/Gamepad.h      | 28 ++++-------
 Source/Engine/Input/Input.cpp      | 43 ++++++++--------
 Source/Engine/Input/Input.h        | 18 ++++---
 Source/Engine/Input/VirtualInput.h |  6 +++
 5 files changed, 131 insertions(+), 44 deletions(-)

diff --git a/Source/Engine/Input/Gamepad.cpp b/Source/Engine/Input/Gamepad.cpp
index f4a2ef4ab..32856839b 100644
--- a/Source/Engine/Input/Gamepad.cpp
+++ b/Source/Engine/Input/Gamepad.cpp
@@ -2,6 +2,71 @@
 
 #include "Gamepad.h"
 
+namespace
+{
+    GamepadAxis GetButtonAxis(GamepadButton button, bool& positive)
+    {
+        positive = true;
+        switch (button)
+        {
+        case GamepadButton::LeftTrigger:
+            return GamepadAxis::LeftTrigger;
+        case GamepadButton::RightTrigger:
+            return GamepadAxis::RightTrigger;
+        case GamepadButton::LeftStickUp:
+            return GamepadAxis::LeftStickY;
+        case GamepadButton::LeftStickDown:
+            positive = false;
+            return GamepadAxis::LeftStickY;
+        case GamepadButton::LeftStickLeft:
+            positive = false;
+            return GamepadAxis::LeftStickX;
+        case GamepadButton::LeftStickRight:
+            return GamepadAxis::LeftStickX;
+        case GamepadButton::RightStickUp:
+            return GamepadAxis::RightStickY;
+        case GamepadButton::RightStickDown:
+            positive = false;
+            return GamepadAxis::RightStickY;
+        case GamepadButton::RightStickLeft:
+            positive = false;
+            return GamepadAxis::RightStickX;
+        case GamepadButton::RightStickRight:
+            return GamepadAxis::RightStickX;
+        default:
+            return GamepadAxis::None;
+        }
+    }
+
+    bool GetButtonState(const Gamepad::State& state, GamepadButton button, float deadZone)
+    {
+        if (deadZone > 0.01f)
+        {
+            switch (button)
+            {
+            case GamepadButton::LeftTrigger:
+            case GamepadButton::RightTrigger:
+            case GamepadButton::LeftStickUp:
+            case GamepadButton::LeftStickDown:
+            case GamepadButton::LeftStickLeft:
+            case GamepadButton::LeftStickRight:
+            case GamepadButton::RightStickUp:
+            case GamepadButton::RightStickDown:
+            case GamepadButton::RightStickLeft:
+            case GamepadButton::RightStickRight:
+            {
+                bool positive;
+                float axis = state.Axis[(int32)GetButtonAxis(button, positive)];
+                return positive ? axis >= deadZone : axis <= -deadZone;
+            }
+            default:
+                break;
+            }
+        }
+        return state.Buttons[(int32)button];
+    }
+}
+
 void GamepadLayout::Init()
 {
     for (int32 i = 0; i < (int32)GamepadButton::MAX; i++)
@@ -31,6 +96,21 @@ void Gamepad::ResetState()
     _mappedPrevState.Clear();
 }
 
+bool Gamepad::GetButton(GamepadButton button, float deadZone) const
+{
+    return GetButtonState(_mappedState, button, deadZone);
+}
+
+bool Gamepad::GetButtonDown(GamepadButton button, float deadZone) const
+{
+    return GetButtonState(_mappedState, button, deadZone) && !GetButtonState(_mappedPrevState, button, deadZone);
+}
+
+bool Gamepad::GetButtonUp(GamepadButton button, float deadZone) const
+{
+    return !GetButtonState(_mappedState, button, deadZone) && GetButtonState(_mappedPrevState, button, deadZone);
+}
+
 bool Gamepad::IsAnyButtonDown() const
 {
     // TODO: optimize with SIMD
diff --git a/Source/Engine/Input/Gamepad.h b/Source/Engine/Input/Gamepad.h
index 20994d85a..dc95c67ae 100644
--- a/Source/Engine/Input/Gamepad.h
+++ b/Source/Engine/Input/Gamepad.h
@@ -148,36 +148,30 @@ public:
     /// Gets the gamepad button state (true if being pressed during the current frame).
     /// </summary>
     /// <param name="button">Gamepad button to check</param>
+    /// <param name="deadZone">Custom dead-zone value to detect gamepad button usage for non-binary buttons such as left/right thumbs that can move freely. By default, any movement is registered.</param>
     /// <returns>True if user holds down the button, otherwise false.</returns>
-    API_FUNCTION() FORCE_INLINE bool GetButton(const GamepadButton button) const
-    {
-        return _mappedState.Buttons[static_cast<int32>(button)];
-    }
+    API_FUNCTION() bool GetButton(GamepadButton button, float deadZone = 0.0f) const;
 
     /// <summary>
     /// Gets the gamepad button down state (true if was pressed during the current frame).
     /// </summary>
     /// <param name="button">Gamepad button to check</param>
+    /// <param name="deadZone">Custom dead-zone value to detect gamepad button usage for non-binary buttons such as left/right thumbs that can move freely. By default, any movement is registered.</param>
     /// <returns>True if user starts pressing down the button, otherwise false.</returns>
-    API_FUNCTION() FORCE_INLINE bool GetButtonDown(const GamepadButton button) const
-    {
-        return _mappedState.Buttons[static_cast<int32>(button)] && !_mappedPrevState.Buttons[static_cast<int32>(button)];
-    }
-
-    /// <summary>
-    /// Checks if any gamepad button is currently pressed.
-    /// </summary>
-    API_PROPERTY() bool IsAnyButtonDown() const;
+    API_FUNCTION() bool GetButtonDown(GamepadButton button, float deadZone = 0.0f) const;
 
     /// <summary>
     /// Gets the gamepad button up state (true if was released during the current frame).
     /// </summary>
     /// <param name="button">Gamepad button to check</param>
+    /// <param name="deadZone">Custom dead-zone value to detect gamepad button usage for non-binary buttons such as left/right thumbs that can move freely. By default, any movement is registered.</param>
     /// <returns>True if user releases the button, otherwise false.</returns>
-    API_FUNCTION() FORCE_INLINE bool GetButtonUp(const GamepadButton button) const
-    {
-        return !_mappedState.Buttons[static_cast<int32>(button)] && _mappedPrevState.Buttons[static_cast<int32>(button)];
-    }
+    API_FUNCTION() bool GetButtonUp(GamepadButton button, float deadZone = 0.0f) const;
+
+    /// <summary>
+    /// Checks if any gamepad button is currently pressed.
+    /// </summary>
+    API_PROPERTY() bool IsAnyButtonDown() const;
 
 public:
     /// <summary>
diff --git a/Source/Engine/Input/Input.cpp b/Source/Engine/Input/Input.cpp
index 7048140ef..c95d7b03e 100644
--- a/Source/Engine/Input/Input.cpp
+++ b/Source/Engine/Input/Input.cpp
@@ -120,6 +120,7 @@ void InputSettings::Deserialize(DeserializeStream& stream, ISerializeModifier* m
                 config.MouseButton = JsonTools::GetEnum(v, "MouseButton", MouseButton::None);
                 config.GamepadButton = JsonTools::GetEnum(v, "GamepadButton", GamepadButton::None);
                 config.Gamepad = JsonTools::GetEnum(v, "Gamepad", InputGamepadIndex::All);
+                config.DeadZone = JsonTools::GetFloat(v, "DeadZone", 0.5f);
             }
         }
         else
@@ -499,24 +500,24 @@ float Input::GetGamepadAxis(int32 gamepadIndex, GamepadAxis axis)
     return 0.0f;
 }
 
-bool Input::GetGamepadButton(int32 gamepadIndex, GamepadButton button)
+bool Input::GetGamepadButton(int32 gamepadIndex, GamepadButton button, float deadZone)
 {
     if (gamepadIndex >= 0 && gamepadIndex < Gamepads.Count())
-        return Gamepads[gamepadIndex]->GetButton(button);
+        return Gamepads[gamepadIndex]->GetButton(button, deadZone);
     return false;
 }
 
-bool Input::GetGamepadButtonDown(int32 gamepadIndex, GamepadButton button)
+bool Input::GetGamepadButtonDown(int32 gamepadIndex, GamepadButton button, float deadZone)
 {
     if (gamepadIndex >= 0 && gamepadIndex < Gamepads.Count())
-        return Gamepads[gamepadIndex]->GetButtonDown(button);
+        return Gamepads[gamepadIndex]->GetButtonDown(button, deadZone);
     return false;
 }
 
-bool Input::GetGamepadButtonUp(int32 gamepadIndex, GamepadButton button)
+bool Input::GetGamepadButtonUp(int32 gamepadIndex, GamepadButton button, float deadZone)
 {
     if (gamepadIndex >= 0 && gamepadIndex < Gamepads.Count())
-        return Gamepads[gamepadIndex]->GetButtonUp(button);
+        return Gamepads[gamepadIndex]->GetButtonUp(button, deadZone);
     return false;
 }
 
@@ -542,13 +543,13 @@ float Input::GetGamepadAxis(InputGamepadIndex gamepad, GamepadAxis axis)
     return false;
 }
 
-bool Input::GetGamepadButton(InputGamepadIndex gamepad, GamepadButton button)
+bool Input::GetGamepadButton(InputGamepadIndex gamepad, GamepadButton button, float deadZone)
 {
     if (gamepad == InputGamepadIndex::All)
     {
         for (auto g : Gamepads)
         {
-            if (g->GetButton(button))
+            if (g->GetButton(button, deadZone))
                 return true;
         }
     }
@@ -556,18 +557,18 @@ bool Input::GetGamepadButton(InputGamepadIndex gamepad, GamepadButton button)
     {
         const auto index = static_cast<int32>(gamepad);
         if (index < Gamepads.Count())
-            return Gamepads[index]->GetButton(button);
+            return Gamepads[index]->GetButton(button, deadZone);
     }
     return false;
 }
 
-bool Input::GetGamepadButtonDown(InputGamepadIndex gamepad, GamepadButton button)
+bool Input::GetGamepadButtonDown(InputGamepadIndex gamepad, GamepadButton button, float deadZone)
 {
     if (gamepad == InputGamepadIndex::All)
     {
         for (auto g : Gamepads)
         {
-            if (g->GetButtonDown(button))
+            if (g->GetButtonDown(button, deadZone))
                 return true;
         }
     }
@@ -575,18 +576,18 @@ bool Input::GetGamepadButtonDown(InputGamepadIndex gamepad, GamepadButton button
     {
         const auto index = static_cast<int32>(gamepad);
         if (index < Gamepads.Count())
-            return Gamepads[index]->GetButtonDown(button);
+            return Gamepads[index]->GetButtonDown(button, deadZone);
     }
     return false;
 }
 
-bool Input::GetGamepadButtonUp(InputGamepadIndex gamepad, GamepadButton button)
+bool Input::GetGamepadButtonUp(InputGamepadIndex gamepad, GamepadButton button, float deadZone)
 {
     if (gamepad == InputGamepadIndex::All)
     {
         for (auto g : Gamepads)
         {
-            if (g->GetButtonUp(button))
+            if (g->GetButtonUp(button, deadZone))
                 return true;
         }
     }
@@ -594,7 +595,7 @@ bool Input::GetGamepadButtonUp(InputGamepadIndex gamepad, GamepadButton button)
     {
         const auto index = static_cast<int32>(gamepad);
         if (index < Gamepads.Count())
-            return Gamepads[index]->GetButtonUp(button);
+            return Gamepads[index]->GetButtonUp(button, deadZone);
     }
     return false;
 }
@@ -1065,26 +1066,26 @@ void InputService::Update()
         bool isActive;
         if (config.Mode == InputActionMode::Pressing)
         {
-            isActive = Input::GetKey(config.Key) || Input::GetMouseButton(config.MouseButton) || Input::GetGamepadButton(config.Gamepad, config.GamepadButton);
+            isActive = Input::GetKey(config.Key) || Input::GetMouseButton(config.MouseButton) || Input::GetGamepadButton(config.Gamepad, config.GamepadButton, config.DeadZone);
         }
         else if (config.Mode == InputActionMode::Press)
         {
-            isActive = Input::GetKeyDown(config.Key) || Input::GetMouseButtonDown(config.MouseButton) || Input::GetGamepadButtonDown(config.Gamepad, config.GamepadButton);
+            isActive = Input::GetKeyDown(config.Key) || Input::GetMouseButtonDown(config.MouseButton) || Input::GetGamepadButtonDown(config.Gamepad, config.GamepadButton, config.DeadZone);
         }
         else
         {
-            isActive = Input::GetKeyUp(config.Key) || Input::GetMouseButtonUp(config.MouseButton) || Input::GetGamepadButtonUp(config.Gamepad, config.GamepadButton);
+            isActive = Input::GetKeyUp(config.Key) || Input::GetMouseButtonUp(config.MouseButton) || Input::GetGamepadButtonUp(config.Gamepad, config.GamepadButton, config.DeadZone);
         }
 
-        if (Input::GetKeyDown(config.Key) || Input::GetMouseButtonDown(config.MouseButton) || Input::GetGamepadButtonDown(config.Gamepad, config.GamepadButton))
+        if (Input::GetKeyDown(config.Key) || Input::GetMouseButtonDown(config.MouseButton) || Input::GetGamepadButtonDown(config.Gamepad, config.GamepadButton, config.DeadZone))
         {
             data.State = InputActionState::Press;
         }
-        else if (Input::GetKey(config.Key) || Input::GetMouseButton(config.MouseButton) || Input::GetGamepadButton(config.Gamepad, config.GamepadButton))
+        else if (Input::GetKey(config.Key) || Input::GetMouseButton(config.MouseButton) || Input::GetGamepadButton(config.Gamepad, config.GamepadButton, config.DeadZone))
         {
             data.State = InputActionState::Pressing;
         }
-        else if (Input::GetKeyUp(config.Key) || Input::GetMouseButtonUp(config.MouseButton) || Input::GetGamepadButtonUp(config.Gamepad, config.GamepadButton))
+        else if (Input::GetKeyUp(config.Key) || Input::GetMouseButtonUp(config.MouseButton) || Input::GetGamepadButtonUp(config.Gamepad, config.GamepadButton, config.DeadZone))
         {
             data.State = InputActionState::Release;
         }
diff --git a/Source/Engine/Input/Input.h b/Source/Engine/Input/Input.h
index 73e87f5f0..dca26a5f4 100644
--- a/Source/Engine/Input/Input.h
+++ b/Source/Engine/Input/Input.h
@@ -238,24 +238,27 @@ public:
     /// </summary>
     /// <param name="gamepadIndex">The gamepad index</param>
     /// <param name="button">Gamepad button to check</param>
+    /// <param name="deadZone">Custom dead-zone value to detect gamepad button usage for non-binary buttons such as left/right thumbs that can move freely. By default, any movement is registered.</param>
     /// <returns>True if user holds down the button, otherwise false.</returns>
-    API_FUNCTION() static bool GetGamepadButton(int32 gamepadIndex, GamepadButton button);
+    API_FUNCTION() static bool GetGamepadButton(int32 gamepadIndex, GamepadButton button, float deadZone = 0.0f);
 
     /// <summary>
     /// Gets the gamepad button down state (true if was pressed during the current frame).
     /// </summary>
     /// <param name="gamepadIndex">The gamepad index</param>
     /// <param name="button">Gamepad button to check</param>
+    /// <param name="deadZone">Custom dead-zone value to detect gamepad button usage for non-binary buttons such as left/right thumbs that can move freely. By default, any movement is registered.</param>
     /// <returns>True if user starts pressing down the button, otherwise false.</returns>
-    API_FUNCTION() static bool GetGamepadButtonDown(int32 gamepadIndex, GamepadButton button);
+    API_FUNCTION() static bool GetGamepadButtonDown(int32 gamepadIndex, GamepadButton button, float deadZone = 0.0f);
 
     /// <summary>
     /// Gets the gamepad button up state (true if was released during the current frame).
     /// </summary>
     /// <param name="gamepadIndex">The gamepad index</param>
     /// <param name="button">Gamepad button to check</param>
+    /// <param name="deadZone">Custom dead-zone value to detect gamepad button usage for non-binary buttons such as left/right thumbs that can move freely. By default, any movement is registered.</param>
     /// <returns>True if user releases the button, otherwise false.</returns>
-    API_FUNCTION() static bool GetGamepadButtonUp(int32 gamepadIndex, GamepadButton button);
+    API_FUNCTION() static bool GetGamepadButtonUp(int32 gamepadIndex, GamepadButton button, float deadZone = 0.0f);
 
     /// <summary>
     /// Gets the gamepad axis value.
@@ -270,24 +273,27 @@ public:
     /// </summary>
     /// <param name="gamepad">The gamepad</param>
     /// <param name="button">Gamepad button to check</param>
+    /// <param name="deadZone">Custom dead-zone value to detect gamepad button usage for non-binary buttons such as left/right thumbs that can move freely. By default, any movement is registered.</param>
     /// <returns>True if user holds down the button, otherwise false.</returns>
-    API_FUNCTION() static bool GetGamepadButton(InputGamepadIndex gamepad, GamepadButton button);
+    API_FUNCTION() static bool GetGamepadButton(InputGamepadIndex gamepad, GamepadButton button, float deadZone = 0.0f);
 
     /// <summary>
     /// Gets the gamepad button down state (true if was pressed during the current frame).
     /// </summary>
     /// <param name="gamepad">The gamepad</param>
     /// <param name="button">Gamepad button to check</param>
+    /// <param name="deadZone">Custom dead-zone value to detect gamepad button usage for non-binary buttons such as left/right thumbs that can move freely. By default, any movement is registered.</param>
     /// <returns>True if user starts pressing down the button, otherwise false.</returns>
-    API_FUNCTION() static bool GetGamepadButtonDown(InputGamepadIndex gamepad, GamepadButton button);
+    API_FUNCTION() static bool GetGamepadButtonDown(InputGamepadIndex gamepad, GamepadButton button, float deadZone = 0.0f);
 
     /// <summary>
     /// Gets the gamepad button up state (true if was released during the current frame).
     /// </summary>
     /// <param name="gamepad">The gamepad</param>
     /// <param name="button">Gamepad button to check</param>
+    /// <param name="deadZone">Custom dead-zone value to detect gamepad button usage for non-binary buttons such as left/right thumbs that can move freely. By default, any movement is registered.</param>
     /// <returns>True if user releases the button, otherwise false.</returns>
-    API_FUNCTION() static bool GetGamepadButtonUp(InputGamepadIndex gamepad, GamepadButton button);
+    API_FUNCTION() static bool GetGamepadButtonUp(InputGamepadIndex gamepad, GamepadButton button, float deadZone = 0.0f);
 
 public:
     /// <summary>
diff --git a/Source/Engine/Input/VirtualInput.h b/Source/Engine/Input/VirtualInput.h
index 817d7014c..a4975aaef 100644
--- a/Source/Engine/Input/VirtualInput.h
+++ b/Source/Engine/Input/VirtualInput.h
@@ -48,6 +48,12 @@ API_STRUCT() struct ActionConfig
     /// </summary>
     API_FIELD(Attributes="EditorOrder(40)")
     InputGamepadIndex Gamepad;
+
+    /// <summary>
+    /// Threshold for non-binary value inputs such as gamepad stick position to decide if action was triggered. Can be sued to activate action only if input value is higher than specified number.
+    /// </summary>
+    API_FIELD(Attributes = "EditorOrder(50)")
+    float DeadZone = 0.5f;
 };
 
 /// <summary>

From 2a2f046f30a967049db2c2b1b279dd143de35f18 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 10 Mar 2026 21:13:36 +0100
Subject: [PATCH 111/203] Don't snap vertices in camera projection icon for
 better quality #3875

---
 Source/Editor/Viewport/Widgets/ViewportWidgetButton.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Editor/Viewport/Widgets/ViewportWidgetButton.cs b/Source/Editor/Viewport/Widgets/ViewportWidgetButton.cs
index 545d71d9b..dd09dc24c 100644
--- a/Source/Editor/Viewport/Widgets/ViewportWidgetButton.cs
+++ b/Source/Editor/Viewport/Widgets/ViewportWidgetButton.cs
@@ -84,6 +84,8 @@ namespace FlaxEditor.Viewport.Widgets
             Float2[] currentStart = Checked ? iconPointsOrtho : iconPointsPerspective;
             Float2[] currentTarget = Checked ? iconPointsPerspective : iconPointsOrtho;
 
+            var features = Render2D.Features;
+            Render2D.Features = features & ~Render2D.RenderingFeatures.VertexSnapping;
             for (int i = 1; i < iconPointCount + 1; i++)
             {
                 int endPointIndex = Mathf.Wrap(i, 0, iconPointCount - 1);
@@ -95,6 +97,7 @@ namespace FlaxEditor.Viewport.Widgets
 
                 Render2D.DrawLine(lineStart, lineEnd, Color.White);
             }
+            Render2D.Features = features;
         }
     }
 

From 0d133cfbdc2ac4125583e254116a74e87c5c42c6 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 10 Mar 2026 22:22:02 +0100
Subject: [PATCH 112/203] Minor fixes to #3870

---
 .../SourceCodeEditing/CodeEditingModule.cs    |  8 ++---
 .../VisualStudio/VisualStudioEditor.cpp       | 36 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs b/Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs
index fc70d0e81..af0187248 100644
--- a/Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs
+++ b/Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs
@@ -325,7 +325,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
             var codeEditor = options.SourceCode.SourceCodeEditor;
             if (codeEditor != "None")
             {
-                foreach (var e in Editor.Instance.CodeEditing.Editors)
+                foreach (var e in _editors)
                 {
                     if (string.Equals(codeEditor, e.Name, StringComparison.OrdinalIgnoreCase))
                     {
@@ -334,10 +334,10 @@ namespace FlaxEditor.Modules.SourceCodeEditing
                     }
                 }
             }
-            if (editor == null)
-                editor = Editor.Instance.CodeEditing.Editors[0];
+            if (editor == null && _editors.Count != 0)
+                editor = _editors[0];
 
-            Editor.Instance.CodeEditing.SelectedEditor = editor;
+            SelectedEditor = editor;
         }
 
         /// <summary>
diff --git a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
index 48b475275..2d79cc02b 100644
--- a/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
+++ b/Source/Editor/Scripting/CodeEditors/VisualStudio/VisualStudioEditor.cpp
@@ -145,7 +145,41 @@ CodeEditorTypes VisualStudioEditor::GetType() const
 
 String VisualStudioEditor::GetName() const
 {
-    return String(ToString(_version));
+    const Char* name;
+    switch (_version)
+    {
+    case VisualStudioVersion::VS2008:
+        name = TEXT("Visual Studio 2008");
+        break;
+    case VisualStudioVersion::VS2010:
+        name = TEXT("Visual Studio 2010");
+        break;
+    case VisualStudioVersion::VS2012:
+        name = TEXT("Visual Studio 2012");
+        break;
+    case VisualStudioVersion::VS2013:
+        name = TEXT("Visual Studio 2013");
+        break;
+    case VisualStudioVersion::VS2015:
+        name = TEXT("Visual Studio 2015");
+        break;
+    case VisualStudioVersion::VS2017:
+        name = TEXT("Visual Studio 2017");
+        break;
+    case VisualStudioVersion::VS2019:
+        name = TEXT("Visual Studio 2019");
+        break;
+    case VisualStudioVersion::VS2022:
+        name = TEXT("Visual Studio 2022");
+        break;
+    case VisualStudioVersion::VS2026:
+        name = TEXT("Visual Studio 2026");
+        break;
+    default:
+        name = ToString(_version);
+        break;
+    }
+    return String(name);
 }
 
 String VisualStudioEditor::GetGenerateProjectCustomArgs() const

From c3aecc1a11eed5faef756685445654662e849a47 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Tue, 10 Mar 2026 19:47:09 -0500
Subject: [PATCH 113/203] Add allowable characters enum to text box

---
 Source/Engine/UI/GUI/Common/TextBoxBase.cs | 90 ++++++++++++++++++++--
 1 file changed, 83 insertions(+), 7 deletions(-)

diff --git a/Source/Engine/UI/GUI/Common/TextBoxBase.cs b/Source/Engine/UI/GUI/Common/TextBoxBase.cs
index 489e4c93d..201e91c61 100644
--- a/Source/Engine/UI/GUI/Common/TextBoxBase.cs
+++ b/Source/Engine/UI/GUI/Common/TextBoxBase.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 #if FLAX_EDITOR
 using FlaxEditor.Options;
 #endif
@@ -42,6 +44,38 @@ namespace FlaxEngine.GUI
             '<',
         };
 
+        /// <summary>
+        /// The allowable characters to use for the text.
+        /// </summary>
+        [Flags]
+        public enum AllowableCharacters
+        {
+            /// <summary>
+            /// Wether to not allow any character in the text.
+            /// </summary>
+            None = 0,
+            
+            /// <summary>
+            /// Whether to use letters in the text.
+            /// </summary>
+            Letters = 1 << 0,
+
+            /// <summary>
+            /// Whether to use numbers in the text.
+            /// </summary>
+            Numbers = 1 << 1,
+
+            /// <summary>
+            /// Whether to use symbols in the text.
+            /// </summary>
+            Symbols = 1 << 2,
+            
+            /// <summary>
+            /// Whether to use all characters in the text.
+            /// </summary>
+            All = Letters | Numbers | Symbols,
+        }
+
         /// <summary>
         /// Default height of the text box
         /// </summary>
@@ -86,6 +120,11 @@ namespace FlaxEngine.GUI
         /// Flag used to indicate whenever text can contain multiple lines.
         /// </summary>
         protected bool _isMultiline;
+        
+        /// <summary>
+        /// The characters to allow in the text.
+        /// </summary>
+        protected AllowableCharacters _charactersToAllow = AllowableCharacters.All;
 
         /// <summary>
         /// Flag used to indicate whenever text is read-only and cannot be modified by the user.
@@ -188,6 +227,16 @@ namespace FlaxEngine.GUI
             }
         }
 
+        /// <summary>
+        /// The character to allow in the text.
+        /// </summary>
+        [EditorOrder(41), Tooltip("The character to allow in the text.")]
+        public AllowableCharacters CharactersToAllow
+        { 
+            get => _charactersToAllow;
+            set => _charactersToAllow = value;
+        }
+
         /// <summary>
         /// Gets or sets the maximum number of characters the user can type into the text box control.
         /// </summary>
@@ -395,15 +444,42 @@ namespace FlaxEngine.GUI
                 value = value.GetLines()[0];
             }
 
-            if (_text != value)
+            if (_text.Equals(value, StringComparison.Ordinal))
+                return;
+
+            if (CharactersToAllow != AllowableCharacters.All)
             {
-                Deselect();
-                ResetViewOffset();
-
-                _text = value;
-
-                OnTextChanged();
+                if (CharactersToAllow == AllowableCharacters.None)
+                {
+                    value = string.Empty;
+                }
+                else
+                {
+                    if (!CharactersToAllow.HasFlag(AllowableCharacters.Letters))
+                    {
+                        if (value != null)
+                            value = new string(value.Where(c => !char.IsLetter(c)).ToArray());
+                    }
+                    if (!CharactersToAllow.HasFlag(AllowableCharacters.Numbers))
+                    {
+                        if (value != null)
+                            value = new string(value.Where(c => !char.IsNumber(c)).ToArray());
+                    }
+                    if (!CharactersToAllow.HasFlag(AllowableCharacters.Symbols))
+                    {
+                        if (value != null)
+                            value = new string(value.Where(c => !char.IsSymbol(c)).ToArray());
+                    }
+                    value ??= string.Empty;
+                }
             }
+                
+            Deselect();
+            ResetViewOffset();
+
+            _text = value;
+
+            OnTextChanged();
         }
 
         /// <summary>

From 62492c7607e9637a12dd383801f38f18318ae8cc Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 11 Mar 2026 09:38:49 +0100
Subject: [PATCH 114/203] Fix importing file when target location already
 exists

#3579
---
 .../AssetsImportingManager.cpp                | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/ContentImporters/AssetsImportingManager.cpp b/Source/Engine/ContentImporters/AssetsImportingManager.cpp
index 9cad287dc..696f43a9e 100644
--- a/Source/Engine/ContentImporters/AssetsImportingManager.cpp
+++ b/Source/Engine/ContentImporters/AssetsImportingManager.cpp
@@ -36,6 +36,30 @@
 #include "CreateAnimation.h"
 #include "CreateBehaviorTree.h"
 #include "CreateJson.h"
+#include "Engine/Content/Assets/Model.h"
+
+namespace
+{
+    bool IsAssetTypeNameTextureFile(const String& typeName)
+    {
+        return typeName == Texture::TypeName || typeName == SpriteAtlas::TypeName;
+    }
+
+    bool IsAssetTypeNameModelFile(const String& typeName)
+    {
+        return typeName == Model::TypeName || typeName == SkinnedModel::TypeName || typeName == Animation::TypeName;
+    }
+
+    bool IsAssetTypeNameMatch(const String& a, const String& b)
+    {
+        // Special case when reimporting model/texture but different type
+        if (IsAssetTypeNameTextureFile(a) && IsAssetTypeNameTextureFile(b))
+            return true;
+        if (IsAssetTypeNameModelFile(a) && IsAssetTypeNameModelFile(b))
+            return true;
+        return a == b;
+    }
+}
 
 // Tags used to detect asset creation mode
 const String AssetsImportingManager::CreateTextureTag(TEXT("Texture"));
@@ -84,8 +108,6 @@ CreateAssetContext::CreateAssetContext(const StringView& inputPath, const String
     CustomArg = arg;
     Data.Header.ID = id;
     SkipMetadata = false;
-
-    // TODO: we should use ASNI only chars path (Assimp can use only that kind)
     OutputPath = Content::CreateTemporaryAssetPath();
 }
 
@@ -122,6 +144,24 @@ CreateAssetResult CreateAssetContext::Run(const CreateAssetFunction& callback)
         Data.Metadata.Copy((const byte*)buffer.GetString(), (uint32)buffer.GetSize());
     }
 
+    // Check if target asset already exists but has different type
+    AssetInfo targetAssetInfo;
+    if (Content::GetAssetInfo(TargetAssetPath, targetAssetInfo) && !IsAssetTypeNameMatch(targetAssetInfo.TypeName, Data.Header.TypeName))
+    {
+        // Change path
+        int32 index = 0;
+        String newTargetAssetPath;
+        do
+        {
+            newTargetAssetPath = StringUtils::GetDirectoryName(TargetAssetPath);
+            newTargetAssetPath /= StringUtils::GetFileNameWithoutExtension(TargetAssetPath) + String::Format(TEXT(" ({})."), index++) + FileSystem::GetExtension(TargetAssetPath);
+        } while (index < 100 && FileSystem::FileExists(newTargetAssetPath));
+        TargetAssetPath = newTargetAssetPath;
+
+        // Change id
+        Data.Header.ID = Guid::New();
+    }
+
     // Save file
     result = FlaxStorage::Create(OutputPath, Data) ? CreateAssetResult::CannotSaveFile : CreateAssetResult::Ok;
     if (result == CreateAssetResult::Ok)

From 479c5f896cf6a7839040732624f63264074b24ea Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 11 Mar 2026 13:43:26 +0100
Subject: [PATCH 115/203] Fix `MeshAccelerationStructure` to use `MeshAccessor`
 for proper mesh format access

#3984
---
 Source/Engine/Graphics/Models/MeshBase.cpp    |  8 +++++
 .../ModelTool/MeshAccelerationStructure.cpp   | 32 ++++++++-----------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Source/Engine/Graphics/Models/MeshBase.cpp b/Source/Engine/Graphics/Models/MeshBase.cpp
index eadbfcba9..bbec523a2 100644
--- a/Source/Engine/Graphics/Models/MeshBase.cpp
+++ b/Source/Engine/Graphics/Models/MeshBase.cpp
@@ -158,6 +158,14 @@ void MeshAccessor::Stream::CopyTo(Span<Float3> dst) const
     {
         Platform::MemoryCopy(dst.Get(), _data.Get(), _data.Length());
     }
+    else if (IsLinear(PixelFormat::R16G16B16A16_Float))
+    {
+        for (int32 i = 0; i < count; i++)
+        {
+            auto v = *(Half4*)(_data.Get() + i * _stride);
+            dst.Get()[i] = Float3(Float16Compressor::Decompress(v.X), Float16Compressor::Decompress(v.Y), Float16Compressor::Decompress(v.Z));
+        }
+    }
     else
     {
         for (int32 i = 0; i < count; i++)
diff --git a/Source/Engine/Tools/ModelTool/MeshAccelerationStructure.cpp b/Source/Engine/Tools/ModelTool/MeshAccelerationStructure.cpp
index 6e1b5ae6f..297a6f868 100644
--- a/Source/Engine/Tools/ModelTool/MeshAccelerationStructure.cpp
+++ b/Source/Engine/Tools/ModelTool/MeshAccelerationStructure.cpp
@@ -9,6 +9,7 @@
 #include "Engine/Content/Assets/Model.h"
 #include "Engine/Graphics/GPUBuffer.h"
 #include "Engine/Graphics/Models/ModelData.h"
+#include "Engine/Graphics/Models/MeshAccessor.h"
 #include "Engine/Profiler/ProfilerCPU.h"
 
 PACK_STRUCT(struct GPUBVH {
@@ -321,7 +322,6 @@ void MeshAccelerationStructure::Add(Model* model, int32 lodIndex)
     lodIndex = Math::Clamp(lodIndex, model->HighestResidentLODIndex(), model->LODs.Count() - 1);
     ModelLOD& lod = model->LODs[lodIndex];
     _meshes.EnsureCapacity(_meshes.Count() + lod.Meshes.Count());
-    bool failed = false;
     for (int32 i = 0; i < lod.Meshes.Count(); i++)
     {
         auto& mesh = lod.Meshes[i];
@@ -336,25 +336,19 @@ void MeshAccelerationStructure::Add(Model* model, int32 lodIndex)
         auto& meshData = _meshes.AddOne();
         meshData.Asset = model;
         model->AddReference();
-        if (model->IsVirtual())
-        {
-            meshData.Indices = mesh.GetTriangleCount() * 3;
-            meshData.Vertices = mesh.GetVertexCount();
-            failed |= mesh.DownloadDataGPU(MeshBufferType::Index, meshData.IndexBuffer);
-            failed |= mesh.DownloadDataGPU(MeshBufferType::Vertex0, meshData.VertexBuffer);
-        }
-        else
-        {
-            failed |= mesh.DownloadDataCPU(MeshBufferType::Index, meshData.IndexBuffer, meshData.Indices);
-            failed |= mesh.DownloadDataCPU(MeshBufferType::Vertex0, meshData.VertexBuffer, meshData.Vertices);
-        }
-        if (failed)
+        MeshAccessor accessor;
+        MeshBufferType bufferTypes[2] = { MeshBufferType::Index, MeshBufferType::Vertex0 };
+        if (accessor.LoadMesh(&mesh, false, ToSpan(bufferTypes, 2)))
             return;
-        if (!meshData.IndexBuffer.IsAllocated() && meshData.IndexBuffer.Length() != 0)
-        {
-            // BVH nodes modifies index buffer (sorts data in-place) so clone it
-            meshData.IndexBuffer.Copy(meshData.IndexBuffer.Get(), meshData.IndexBuffer.Length());
-        }
+        auto indexStream = accessor.Index();
+        auto positionStream = accessor.Position();
+        if (!indexStream.IsValid() || !positionStream.IsValid())
+            return;
+        meshData.Indices = indexStream.GetCount();
+        meshData.Vertices = positionStream.GetCount();
+        meshData.IndexBuffer.Copy(indexStream.GetData());
+        meshData.VertexBuffer.Allocate(meshData.Vertices * sizeof(Float3));
+        positionStream.CopyTo(ToSpan(meshData.VertexBuffer.Get<Float3>(), meshData.Vertices));
         meshData.Use16BitIndexBuffer = mesh.Use16BitIndexBuffer();
         meshData.Bounds = mesh.GetBox();
     }

From 96bbae8e28712f24b3969e5220703635caed1f97 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 11 Mar 2026 16:01:56 +0100
Subject: [PATCH 116/203] Fix Global SDF update when changing Draw Modes of the
 model

Refactor `DrawModes` field in `StaticModel` and `FoliageType` into property with getter/setter

#3949
---
 Source/Engine/Foliage/Foliage.cpp             | 16 ++++++---
 Source/Engine/Foliage/FoliageType.cpp         | 20 +++++++++--
 Source/Engine/Foliage/FoliageType.h           | 14 ++++++--
 Source/Engine/Level/Actors/StaticModel.cpp    | 34 +++++++++++++------
 Source/Engine/Level/Actors/StaticModel.h      | 18 ++++++----
 Source/Engine/Level/Scene/SceneRendering.h    |  1 +
 .../Renderer/GlobalSignDistanceFieldPass.cpp  |  3 +-
 7 files changed, 79 insertions(+), 27 deletions(-)

diff --git a/Source/Engine/Foliage/Foliage.cpp b/Source/Engine/Foliage/Foliage.cpp
index efe89bf5c..459f1b662 100644
--- a/Source/Engine/Foliage/Foliage.cpp
+++ b/Source/Engine/Foliage/Foliage.cpp
@@ -22,7 +22,7 @@
 #include "Engine/Serialization/Serialization.h"
 #include "Engine/Utilities/Encryption.h"
 
-#define FOLIAGE_GET_DRAW_MODES(renderContext, type) (type.DrawModes & renderContext.View.Pass & renderContext.View.GetShadowsDrawPassMask(type.ShadowsMode))
+#define FOLIAGE_GET_DRAW_MODES(renderContext, type) (type._drawModes & renderContext.View.Pass & renderContext.View.GetShadowsDrawPassMask(type.ShadowsMode))
 #define FOLIAGE_CAN_DRAW(renderContext, type) (type.IsReady() && FOLIAGE_GET_DRAW_MODES(renderContext, type) != DrawPass::None && type.Model->CanBeRendered())
 
 Foliage::Foliage(const SpawnParams& params)
@@ -360,7 +360,7 @@ void Foliage::DrawCluster(DrawContext& context, FoliageCluster* cluster, Mesh::D
                 draw.DrawState = &instance.DrawState;
                 draw.Bounds = sphere;
                 draw.PerInstanceRandom = instance.Random;
-                draw.DrawModes = type.DrawModes;
+                draw.DrawModes = type._drawModes;
                 draw.SetStencilValue(_layer);
                 type.Model->Draw(context.RenderContext, draw);
 
@@ -597,14 +597,22 @@ void Foliage::DrawType(RenderContext& renderContext, const FoliageType& type, Me
 
 void Foliage::InitType(const RenderView& view, FoliageType& type)
 {
-    const DrawPass drawModes = type.DrawModes & view.Pass & view.GetShadowsDrawPassMask(type.ShadowsMode);
+    const DrawPass drawModes = type._drawModes & view.Pass & view.GetShadowsDrawPassMask(type.ShadowsMode);
     type._canDraw = type.IsReady() && drawModes != DrawPass::None && type.Model && type.Model->CanBeRendered();
+    bool drawModesDirty = false;
     for (int32 j = 0; j < type.Entries.Count(); j++)
     {
         auto& e = type.Entries[j];
         e.ReceiveDecals = type.ReceiveDecals != 0;
         e.ShadowsMode = type.ShadowsMode;
+        if (type._drawModesDirty)
+        {
+            type._drawModesDirty = 0;
+            drawModesDirty = true;
+        }
     }
+    if (drawModesDirty)
+        GetSceneRendering()->UpdateActor(this, _sceneRenderingKey, ISceneRenderingListener::DrawModes);
 }
 
 int32 Foliage::GetInstancesCount() const
@@ -1250,7 +1258,7 @@ void Foliage::Draw(RenderContext& renderContext)
         draw.Deformation = nullptr;
         draw.Bounds = instance.Bounds;
         draw.PerInstanceRandom = instance.Random;
-        draw.DrawModes = type.DrawModes & view.Pass & view.GetShadowsDrawPassMask(type.ShadowsMode);
+        draw.DrawModes = type._drawModes & view.Pass & view.GetShadowsDrawPassMask(type.ShadowsMode);
         draw.SetStencilValue(_layer);
         type.Model->Draw(renderContext, draw);
         return;
diff --git a/Source/Engine/Foliage/FoliageType.cpp b/Source/Engine/Foliage/FoliageType.cpp
index 8b8c84420..e9eb63b2d 100644
--- a/Source/Engine/Foliage/FoliageType.cpp
+++ b/Source/Engine/Foliage/FoliageType.cpp
@@ -13,6 +13,7 @@ FoliageType::FoliageType()
     , Index(-1)
 {
     _isReady = 0;
+    _drawModesDirty = 0;
 
     ReceiveDecals = true;
     UseDensityScaling = false;
@@ -32,7 +33,7 @@ FoliageType& FoliageType::operator=(const FoliageType& other)
     CullDistance = other.CullDistance;
     CullDistanceRandomRange = other.CullDistanceRandomRange;
     ScaleInLightmap = other.ScaleInLightmap;
-    DrawModes = other.DrawModes;
+    SetDrawModes(other._drawModes);
     ShadowsMode = other.ShadowsMode;
     PaintDensity = other.PaintDensity;
     PaintRadius = other.PaintRadius;
@@ -69,6 +70,19 @@ void FoliageType::SetMaterials(const Array<MaterialBase*>& value)
         Entries[i].Material = value[i];
 }
 
+DrawPass FoliageType::GetDrawModes() const
+{
+    return _drawModes;
+}
+
+void FoliageType::SetDrawModes(DrawPass value)
+{
+    if (_drawModes == value)
+        return;
+    _drawModes = value;
+    _drawModesDirty = 1;
+}
+
 Float3 FoliageType::GetRandomScale() const
 {
     Float3 result;
@@ -150,7 +164,7 @@ void FoliageType::Serialize(SerializeStream& stream, const void* otherObj)
     SERIALIZE(CullDistance);
     SERIALIZE(CullDistanceRandomRange);
     SERIALIZE(ScaleInLightmap);
-    SERIALIZE(DrawModes);
+    SERIALIZE_MEMBER(DrawModes, _drawModes);
     SERIALIZE(ShadowsMode);
     SERIALIZE_BIT(ReceiveDecals);
     SERIALIZE_BIT(UseDensityScaling);
@@ -191,7 +205,7 @@ void FoliageType::Deserialize(DeserializeStream& stream, ISerializeModifier* mod
     DESERIALIZE(CullDistance);
     DESERIALIZE(CullDistanceRandomRange);
     DESERIALIZE(ScaleInLightmap);
-    DESERIALIZE(DrawModes);
+    DESERIALIZE_MEMBER(DrawModes, _drawModes);
     DESERIALIZE(ShadowsMode);
     DESERIALIZE_BIT(ReceiveDecals);
     DESERIALIZE_BIT(UseDensityScaling);
diff --git a/Source/Engine/Foliage/FoliageType.h b/Source/Engine/Foliage/FoliageType.h
index 224ed0bd8..8b36f618b 100644
--- a/Source/Engine/Foliage/FoliageType.h
+++ b/Source/Engine/Foliage/FoliageType.h
@@ -48,6 +48,8 @@ API_CLASS(Sealed, NoSpawn) class FLAXENGINE_API FoliageType : public ScriptingOb
 private:
     uint8 _isReady : 1;
     uint8 _canDraw : 1;
+    uint8 _drawModesDirty : 1;
+    DrawPass _drawModes = DrawPass::Depth | DrawPass::GBuffer | DrawPass::Forward;
 
 public:
     /// <summary>
@@ -124,9 +126,15 @@ public:
     API_FIELD() float ScaleInLightmap = 1.0f;
 
     /// <summary>
-    /// The draw passes to use for rendering this foliage type.
+    /// Gets the draw passes to use for rendering this foliage type.
     /// </summary>
-    API_FIELD() DrawPass DrawModes = DrawPass::Depth | DrawPass::GBuffer | DrawPass::Forward;
+    API_PROPERTY(Attributes="DefaultValue(DrawPass.Depth | DrawPass.GBuffer | DrawPass.Forward)")
+    DrawPass GetDrawModes() const;
+
+    /// <summary>
+    /// Sets the draw passes to use for rendering this foliage type.
+    /// </summary>
+    API_PROPERTY() void SetDrawModes(DrawPass value);
 
     /// <summary>
     /// The shadows casting mode.
@@ -184,7 +192,7 @@ public:
     API_FIELD() float PlacementRandomRollAngle = 0.0f;
 
     /// <summary>
-    /// The density scaling scale applied to the global scale for the foliage instances of this type. Can be used to boost or reduce density scaling effect on this foliage type. Default is 1.
+    /// The density scale factor applied to the global scale for the foliage instances of this type. Can be used to boost or reduce density scaling effect on this foliage type. Default is 1. Lower to reduce density scaling effect when downscaling foliage via global quality/scalability.
     /// </summary>
     API_FIELD() float DensityScalingScale = 1.0f;
 
diff --git a/Source/Engine/Level/Actors/StaticModel.cpp b/Source/Engine/Level/Actors/StaticModel.cpp
index f41e4a805..19e4e3f34 100644
--- a/Source/Engine/Level/Actors/StaticModel.cpp
+++ b/Source/Engine/Level/Actors/StaticModel.cpp
@@ -66,6 +66,20 @@ void StaticModel::SetBoundsScale(float value)
     UpdateBounds();
 }
 
+DrawPass StaticModel::GetDrawModes() const
+{
+    return _drawModes;
+}
+
+void StaticModel::SetDrawModes(DrawPass value)
+{
+    if (_drawModes == value)
+        return;
+    _drawModes = value;
+    if (_sceneRenderingKey != -1)
+        GetSceneRendering()->UpdateActor(this, _sceneRenderingKey, ISceneRenderingListener::DrawModes);
+}
+
 int32 StaticModel::GetLODBias() const
 {
     return _lodBias;
@@ -330,13 +344,13 @@ void StaticModel::Draw(RenderContext& renderContext)
         return;
     if (renderContext.View.Pass == DrawPass::GlobalSDF)
     {
-        if (EnumHasAnyFlags(DrawModes, DrawPass::GlobalSDF) && Model->SDF.Texture)
+        if (EnumHasAnyFlags(_drawModes, DrawPass::GlobalSDF) && Model->SDF.Texture)
             GlobalSignDistanceFieldPass::Instance()->RasterizeModelSDF(this, Model->SDF, _transform, _box);
         return;
     }
     if (renderContext.View.Pass == DrawPass::GlobalSurfaceAtlas)
     {
-        if (EnumHasAnyFlags(DrawModes, DrawPass::GlobalSurfaceAtlas) && Model->SDF.Texture)
+        if (EnumHasAnyFlags(_drawModes, DrawPass::GlobalSurfaceAtlas) && Model->SDF.Texture)
             GlobalSurfaceAtlasPass::Instance()->RasterizeActor(this, this, _sphere, _transform, Model->LODs.Last().GetBox());
         return;
     }
@@ -353,7 +367,7 @@ void StaticModel::Draw(RenderContext& renderContext)
     draw.Lightmap = _scene ? _scene->LightmapsData.GetReadyLightmap(Lightmap.TextureIndex) : nullptr;
     draw.LightmapUVs = &Lightmap.UVsArea;
     draw.Flags = _staticFlags;
-    draw.DrawModes = DrawModes;
+    draw.DrawModes = _drawModes;
     draw.Bounds = _sphere;
     draw.Bounds.Center -= renderContext.View.Origin;
     draw.PerInstanceRandom = GetPerInstanceRandom();
@@ -390,7 +404,7 @@ void StaticModel::Draw(RenderContextBatch& renderContextBatch)
     draw.Lightmap = _scene ? _scene->LightmapsData.GetReadyLightmap(Lightmap.TextureIndex) : nullptr;
     draw.LightmapUVs = &Lightmap.UVsArea;
     draw.Flags = _staticFlags;
-    draw.DrawModes = DrawModes;
+    draw.DrawModes = _drawModes;
     draw.Bounds = _sphere;
     draw.Bounds.Center -= renderContext.View.Origin;
     draw.PerInstanceRandom = GetPerInstanceRandom();
@@ -435,7 +449,7 @@ void StaticModel::Serialize(SerializeStream& stream, const void* otherObj)
     SERIALIZE_MEMBER(LODBias, _lodBias);
     SERIALIZE_MEMBER(ForcedLOD, _forcedLod);
     SERIALIZE_MEMBER(SortOrder, _sortOrder);
-    SERIALIZE(DrawModes);
+    SERIALIZE_MEMBER(DrawModes, _drawModes);
 
     if (HasLightmap()
 #if USE_EDITOR
@@ -487,7 +501,7 @@ void StaticModel::Deserialize(DeserializeStream& stream, ISerializeModifier* mod
     DESERIALIZE_MEMBER(LODBias, _lodBias);
     DESERIALIZE_MEMBER(ForcedLOD, _forcedLod);
     DESERIALIZE_MEMBER(SortOrder, _sortOrder);
-    DESERIALIZE(DrawModes);
+    DESERIALIZE_MEMBER(DrawModes, _drawModes);
     DESERIALIZE_MEMBER(LightmapIndex, Lightmap.TextureIndex);
     DESERIALIZE_MEMBER(LightmapArea, Lightmap.UVsArea);
 
@@ -537,27 +551,27 @@ void StaticModel::Deserialize(DeserializeStream& stream, ISerializeModifier* mod
         if (member != stream.MemberEnd() && member->value.IsBool() && member->value.GetBool())
         {
             MARK_CONTENT_DEPRECATED();
-            DrawModes = DrawPass::Depth;
+            _drawModes = DrawPass::Depth;
         }
     }
     // [Deprecated on 07.02.2022, expires on 07.02.2024]
     if (modifier->EngineBuild <= 6330)
     {
         MARK_CONTENT_DEPRECATED();
-        DrawModes |= DrawPass::GlobalSDF;
+        _drawModes |= DrawPass::GlobalSDF;
     }
     // [Deprecated on 27.04.2022, expires on 27.04.2024]
     if (modifier->EngineBuild <= 6331)
     {
         MARK_CONTENT_DEPRECATED();
-        DrawModes |= DrawPass::GlobalSurfaceAtlas;
+        _drawModes |= DrawPass::GlobalSurfaceAtlas;
     }
 
     {
         const auto member = stream.FindMember("RenderPasses");
         if (member != stream.MemberEnd() && member->value.IsInt())
         {
-            DrawModes = (DrawPass)member->value.GetInt();
+            _drawModes = (DrawPass)member->value.GetInt();
         }
     }
 }
diff --git a/Source/Engine/Level/Actors/StaticModel.h b/Source/Engine/Level/Actors/StaticModel.h
index e6ed701cc..4b575a0ed 100644
--- a/Source/Engine/Level/Actors/StaticModel.h
+++ b/Source/Engine/Level/Actors/StaticModel.h
@@ -23,6 +23,7 @@ private:
     bool _vertexColorsDirty;
     byte _vertexColorsCount;
     int8 _sortOrder;
+    DrawPass _drawModes = DrawPass::Default;
     Array<Color32> _vertexColorsData[MODEL_MAX_LODS];
     GPUBuffer* _vertexColorsBuffer[MODEL_MAX_LODS];
     Model* _residencyChangedModel = nullptr;
@@ -40,12 +41,6 @@ public:
     API_FIELD(Attributes="EditorOrder(20), DefaultValue(null), EditorDisplay(\"Model\")")
     AssetReference<Model> Model;
 
-    /// <summary>
-    /// The draw passes to use for rendering this object.
-    /// </summary>
-    API_FIELD(Attributes="EditorOrder(15), DefaultValue(DrawPass.Default), EditorDisplay(\"Model\")")
-    DrawPass DrawModes = DrawPass::Default;
-
     /// <summary>
     /// The baked lightmap entry.
     /// </summary>
@@ -74,6 +69,17 @@ public:
     /// </summary>
     API_PROPERTY() void SetBoundsScale(float value);
 
+    /// <summary>
+    /// Gets the draw passes to use for rendering this object.
+    /// </summary>
+    API_PROPERTY(Attributes="EditorOrder(15), DefaultValue(DrawPass.Default), EditorDisplay(\"Model\")")
+    DrawPass GetDrawModes() const;
+
+    /// <summary>
+    /// Sets the draw passes to use for rendering this object.
+    /// </summary>
+    API_PROPERTY() void SetDrawModes(DrawPass value);
+
     /// <summary>
     /// Gets the model Level Of Detail bias value. Allows to increase or decrease rendered model quality.
     /// </summary>
diff --git a/Source/Engine/Level/Scene/SceneRendering.h b/Source/Engine/Level/Scene/SceneRendering.h
index 25dfc63fa..d522454a6 100644
--- a/Source/Engine/Level/Scene/SceneRendering.h
+++ b/Source/Engine/Level/Scene/SceneRendering.h
@@ -56,6 +56,7 @@ public:
         Layer = 4,
         StaticFlags = 8,
         AutoDelayDuringRendering = 16, // Conditionally allow updating data during rendering when writes are locked
+        DrawModes = 32,
         Auto = Visual | Bounds | Layer,
     };
 
diff --git a/Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp b/Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp
index 010e14bf9..ae6e8a9a8 100644
--- a/Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp
+++ b/Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp
@@ -408,7 +408,8 @@ public:
         if (GLOBAL_SDF_ACTOR_IS_STATIC(a) && ObjectTypes.Contains(a->GetTypeHandle()))
         {
             ScopeWriteLock lock(Locker);
-            OnSceneRenderingDirty(BoundingBox::FromSphere(prevBounds));
+            if (flags != DrawModes && flags != Layer && flags != StaticFlags)
+                OnSceneRenderingDirty(BoundingBox::FromSphere(prevBounds));
             OnSceneRenderingDirty(a->GetBox());
         }
     }

From 22c88eb59d818e1bf8404a012ce65cc9310bfc42 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 11 Mar 2026 19:25:18 +0100
Subject: [PATCH 117/203] Fix blocky terrain SDF

#3975
---
 Content/Shaders/GlobalSignDistanceField.flax  |  4 ++--
 Source/Engine/Terrain/Terrain.cpp             | 11 +++++++----
 Source/Shaders/GlobalSignDistanceField.shader | 10 +++++++---
 Source/Shaders/TerrainCommon.hlsl             |  4 ++--
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Content/Shaders/GlobalSignDistanceField.flax b/Content/Shaders/GlobalSignDistanceField.flax
index 5afcb4bf4..01dae76b1 100644
--- a/Content/Shaders/GlobalSignDistanceField.flax
+++ b/Content/Shaders/GlobalSignDistanceField.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f07ebb16820897e8598ae7a0627cb75b3d28e9dceea3ad4bd9ff543d5cdd01c
-size 13979
+oid sha256:0506a5485a0107f67714ceb8c1714f18cb5718bacfde36fad91d53ea3cb60de9
+size 14044
diff --git a/Source/Engine/Terrain/Terrain.cpp b/Source/Engine/Terrain/Terrain.cpp
index 77b4ee8a6..f0ad65894 100644
--- a/Source/Engine/Terrain/Terrain.cpp
+++ b/Source/Engine/Terrain/Terrain.cpp
@@ -549,19 +549,22 @@ bool Terrain::DrawSetup(RenderContext& renderContext)
     const DrawPass drawModes = DrawModes & renderContext.View.Pass;
     if (drawModes == DrawPass::GlobalSDF)
     {
-        const float chunkSize = TERRAIN_UNITS_PER_VERTEX * (float)_chunkSize;
-        const float posToUV = 0.25f / chunkSize;
-        Float4 localToUV(posToUV, posToUV, 0.0f, 0.0f);
+        const float chunkScale = 0.25f / (TERRAIN_UNITS_PER_VERTEX * (float)_chunkSize); // Patch heightfield is divided into 4x4 chunks
         for (const TerrainPatch* patch : _patches)
         {
             if (!patch->Heightmap)
                 continue;
+            GPUTexture* heightfield = patch->Heightmap->GetTexture();
+            float size = (float)heightfield->Width();
+            Float4 localToUV;
+            localToUV.X = localToUV.Y = chunkScale * (size - 1) / size; // Skip the last edge texel
+            localToUV.Z = localToUV.W = 0.5f / size; // Include half-texel offset
             Transform patchTransform;
             patchTransform.Translation = patch->_offset + Vector3(0, patch->_yOffset, 0);
             patchTransform.Orientation = Quaternion::Identity;
             patchTransform.Scale = Float3(1.0f, patch->_yHeight, 1.0f);
             patchTransform = _transform.LocalToWorld(patchTransform);
-            GlobalSignDistanceFieldPass::Instance()->RasterizeHeightfield(this, patch->Heightmap->GetTexture(), patchTransform, patch->_bounds, localToUV);
+            GlobalSignDistanceFieldPass::Instance()->RasterizeHeightfield(this, heightfield, patchTransform, patch->_bounds, localToUV);
         }
         return true;
     }
diff --git a/Source/Shaders/GlobalSignDistanceField.shader b/Source/Shaders/GlobalSignDistanceField.shader
index fe4bafda5..e8bb1b1f7 100644
--- a/Source/Shaders/GlobalSignDistanceField.shader
+++ b/Source/Shaders/GlobalSignDistanceField.shader
@@ -170,15 +170,14 @@ void CS_RasterizeHeightfield(uint3 DispatchThreadId : SV_DispatchThreadID)
 		// Convert voxel world-space position into heightfield local-space position and get heightfield UV
 		float4x4 worldToLocal = ToMatrix4x4(objectData.WorldToVolume);
 		float3 volumePos = mul(float4(voxelWorldPos, 1), worldToLocal).xyz;
-		float3 volumeUV = volumePos * objectData.VolumeToUVWMul + objectData.VolumeToUVWAdd;
-		float2 heightfieldUV = float2(volumeUV.x, volumeUV.z);
 
         // Sample heightfield around the voxel location (heightmap uses point sampler)
         Texture2D<float4> heightmap = ObjectsTextures[i];
         float4 localToUV = float4(objectData.VolumeToUVWMul.xz, objectData.VolumeToUVWAdd.xz);
+#if 1
         float3 n00, n10, n01, n11;
         bool h00, h10, h01, h11;
-        float offset = CascadeVoxelSize * 2;
+        float offset = CascadeVoxelSize;
         float3 p00 = SampleHeightmap(heightmap, volumePos + float3(-offset, 0, 0), localToUV, n00, h00, objectData.MipOffset);
         float3 p10 = SampleHeightmap(heightmap, volumePos + float3(+offset, 0, 0), localToUV, n10, h10, objectData.MipOffset);
         float3 p01 = SampleHeightmap(heightmap, volumePos + float3(0, 0, -offset), localToUV, n01, h01, objectData.MipOffset);
@@ -189,6 +188,11 @@ void CS_RasterizeHeightfield(uint3 DispatchThreadId : SV_DispatchThreadID)
         float3 heightfieldNormal = (n00 + n10 + n01 + n11) * 0.25f;
         heightfieldNormal = normalize(heightfieldNormal);
         bool isHole = h00 || h10 || h01 || h11;
+#else
+        float3 heightfieldNormal;
+        bool isHole;
+        float3 heightfieldPosition = SampleHeightmap(heightmap, volumePos, localToUV, heightfieldNormal, isHole, objectData.MipOffset);
+#endif
 
         // Skip holes and pixels outside the heightfield
 	    if (isHole)
diff --git a/Source/Shaders/TerrainCommon.hlsl b/Source/Shaders/TerrainCommon.hlsl
index 0c2f57168..f883e8033 100644
--- a/Source/Shaders/TerrainCommon.hlsl
+++ b/Source/Shaders/TerrainCommon.hlsl
@@ -35,11 +35,11 @@ float3 SampleHeightmap(Texture2D<float4> heightmap, float3 localPosition, float4
 {
     // Sample heightmap
 	float2 uv = localPosition.xz * localToUV.xy + localToUV.zw;
-	float4 value = heightmap.SampleLevel(SamplerPointClamp, uv, mipOffset);
+	float4 value = heightmap.SampleLevel(SamplerLinearClamp, uv, mipOffset);
 
     // Decode heightmap
     normal = DecodeHeightmapNormal(value, isHole);
-	float height = DecodeHeightmapHeight(value);;
+	float height = DecodeHeightmapHeight(value);
 	float3 position = float3(localPosition.x, height, localPosition.z);
 
     // UVs outside the heightmap are empty

From ace84ae29faa235d2a7f1c32132b5812fc007f3f Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 11 Mar 2026 23:31:44 +0100
Subject: [PATCH 118/203] Add limit to max DDGI cascade updates per-frame to
 `2`

#3963
---
 .../Renderer/GI/DynamicDiffuseGlobalIllumination.cpp      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.cpp b/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.cpp
index 25550ecd8..37d268991 100644
--- a/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.cpp
+++ b/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.cpp
@@ -90,6 +90,7 @@ public:
         Float3 ProbesOrigin;
         float ProbesSpacing = 0.0f;
         Int3 ProbeScrollOffsets;
+        bool PendingUpdate = true;
         Int3 ProbeScrollClears;
 
         void Clear()
@@ -97,6 +98,7 @@ public:
             ProbesOrigin = Float3::Zero;
             ProbeScrollOffsets = Int3::Zero;
             ProbeScrollClears = Int3::Zero;
+            PendingUpdate = true;
         }
     } Cascades[4];
 
@@ -457,9 +459,12 @@ bool DynamicDiffuseGlobalIlluminationPass::RenderInner(RenderContext& renderCont
     //const uint64 cascadeFrequencies[] = { 1, 1, 1, 1 };
     //const uint64 cascadeFrequencies[] = { 10, 10, 10, 10 };
     bool cascadeSkipUpdate[4];
+    int32 maxCascadesPerFrame = renderContext.View.IsSingleFrame ? cascadesCount : 2;
     for (int32 cascadeIndex = 0; cascadeIndex < cascadesCount; cascadeIndex++)
     {
-        cascadeSkipUpdate[cascadeIndex] = !clear && (ddgiData.LastFrameUsed % cascadeFrequencies[cascadeIndex]) != 0 && GPU_SPREAD_WORKLOAD;
+        auto& cascade = ddgiData.Cascades[cascadeIndex];
+        cascade.PendingUpdate |= !clear && (ddgiData.LastFrameUsed % cascadeFrequencies[cascadeIndex]) != 0 && GPU_SPREAD_WORKLOAD;
+        cascadeSkipUpdate[cascadeIndex] = !cascade.PendingUpdate || maxCascadesPerFrame-- <= 0;
     }
 
     // Compute scrolling (probes are placed around camera but are scrolling to increase stability during movement)
@@ -468,6 +473,7 @@ bool DynamicDiffuseGlobalIlluminationPass::RenderInner(RenderContext& renderCont
         if (cascadeSkipUpdate[cascadeIndex])
             continue;
         auto& cascade = ddgiData.Cascades[cascadeIndex];
+        cascade.PendingUpdate = false;
 
         // Calculate the count of grid cells between the view origin and the scroll anchor
         const Float3 volumeOrigin = cascade.ProbesOrigin + Float3(cascade.ProbeScrollOffsets) * cascade.ProbesSpacing;

From 6d9d606085574521f98c86e7e9d53528a0297585 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 11 Mar 2026 23:56:47 +0100
Subject: [PATCH 119/203] Add `UNITS_TO_METERS_SCALE` to shader sources for
 world units scale

#3907
---
 Source/Shaders/Common.hlsl         | 1 +
 Source/Shaders/LightingCommon.hlsl | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/Shaders/Common.hlsl b/Source/Shaders/Common.hlsl
index 66303546a..2052214b2 100644
--- a/Source/Shaders/Common.hlsl
+++ b/Source/Shaders/Common.hlsl
@@ -131,6 +131,7 @@ SamplerComparisonState ShadowSamplerLinear : register(s5);
 #define SAMPLE_RT_LINEAR(rt, texCoord) rt.SampleLevel(SamplerLinearClamp, texCoord, 0)
 #define HDR_CLAMP_MAX 65472.0
 #define PI 3.1415926535897932
+#define UNITS_TO_METERS_SCALE 0.01f
 
 // Structure that contains information about GBuffer
 struct GBufferData
diff --git a/Source/Shaders/LightingCommon.hlsl b/Source/Shaders/LightingCommon.hlsl
index 5b15a0d4d..734b9b709 100644
--- a/Source/Shaders/LightingCommon.hlsl
+++ b/Source/Shaders/LightingCommon.hlsl
@@ -68,8 +68,8 @@ void GetRadialLightAttenuation(
     // Distance attenuation
     if (lightData.InverseSquared)
     {
-        // Convert cm-based scene units to meters for inverse-squared falloff.
-        const float distanceScale = 0.01f;
+        // Convert scene units to meters for inverse-squared falloff
+        const float distanceScale = UNITS_TO_METERS_SCALE;
         const float distanceScaleSqr = distanceScale * distanceScale;
         float distanceSqrScaled = distanceSqr * distanceScaleSqr;
         float distanceBiasSqrScaled = distanceBiasSqr * distanceScaleSqr;

From 895dcf4aa6d856f672a09f37a7c02cb7f0c8608f Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 00:00:28 +0100
Subject: [PATCH 120/203] Add auto-converting old point/spot lights brightness
 when using `Inverse Squared Falloff` to match new shader math

#3907
---
 Flax.flaxproj                             |  2 +-
 Source/Engine/Level/Actors/PointLight.cpp |  9 +++++++++
 Source/Engine/Level/Actors/SpotLight.cpp  | 10 ++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Flax.flaxproj b/Flax.flaxproj
index c9c27281b..78c03fce6 100644
--- a/Flax.flaxproj
+++ b/Flax.flaxproj
@@ -4,7 +4,7 @@
     "Major": 1,
     "Minor": 11,
     "Revision": 0,
-    "Build": 6807
+    "Build": 6808
   },
   "Company": "Flax",
   "Copyright": "Copyright (c) 2012-2026 Wojciech Figat. All rights reserved.",
diff --git a/Source/Engine/Level/Actors/PointLight.cpp b/Source/Engine/Level/Actors/PointLight.cpp
index 607bf1bc4..b5801166e 100644
--- a/Source/Engine/Level/Actors/PointLight.cpp
+++ b/Source/Engine/Level/Actors/PointLight.cpp
@@ -1,6 +1,7 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
 #include "PointLight.h"
+#include "Engine/Content/Deprecated.h"
 #include "Engine/Graphics/RenderTask.h"
 #include "Engine/Graphics/RenderTools.h"
 #include "Engine/Graphics/RenderView.h"
@@ -196,6 +197,14 @@ void PointLight::Deserialize(DeserializeStream& stream, ISerializeModifier* modi
     DESERIALIZE(UseInverseSquaredFalloff);
     DESERIALIZE(UseIESBrightness);
     DESERIALIZE(IESBrightnessScale);
+
+    // [Deprecated on 12.03.2026, expires on 12.03.2028]
+    if (modifier->EngineBuild <= 6807 && SERIALIZE_FIND_MEMBER(stream, "UseInverseSquaredFalloff") != stream.MemberEnd() && UseInverseSquaredFalloff)
+    {
+        // Convert old non-physical brightness value that was used for Inverse Squared Falloff which wasn't based on proper cm/m units calculations
+        MARK_CONTENT_DEPRECATED();
+        Brightness = Math::Sqrt(Brightness * 0.01f);
+    }
 }
 
 bool PointLight::IntersectsItself(const Ray& ray, Real& distance, Vector3& normal)
diff --git a/Source/Engine/Level/Actors/SpotLight.cpp b/Source/Engine/Level/Actors/SpotLight.cpp
index 85b77647a..38502cf1b 100644
--- a/Source/Engine/Level/Actors/SpotLight.cpp
+++ b/Source/Engine/Level/Actors/SpotLight.cpp
@@ -1,6 +1,8 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
 #include "SpotLight.h"
+
+#include "Engine/Content/Deprecated.h"
 #include "Engine/Graphics/RenderView.h"
 #include "Engine/Renderer/RenderList.h"
 #include "Engine/Content/Assets/IESProfile.h"
@@ -282,6 +284,14 @@ void SpotLight::Deserialize(DeserializeStream& stream, ISerializeModifier* modif
     DESERIALIZE(UseInverseSquaredFalloff);
     DESERIALIZE(UseIESBrightness);
     DESERIALIZE(IESBrightnessScale);
+
+    // [Deprecated on 12.03.2026, expires on 12.03.2028]
+    if (modifier->EngineBuild <= 6807 && SERIALIZE_FIND_MEMBER(stream, "UseInverseSquaredFalloff") != stream.MemberEnd() && UseInverseSquaredFalloff)
+    {
+        // Convert old non-physical brightness value that was used for Inverse Squared Falloff which wasn't based on proper cm/m units calculations
+        MARK_CONTENT_DEPRECATED();
+        Brightness = Math::Sqrt(Brightness * 0.01f);
+    }
 }
 
 bool SpotLight::IntersectsItself(const Ray& ray, Real& distance, Vector3& normal)

From e736048fab2b28e7ae3ee1accb54044a49e51445 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 08:41:06 +0100
Subject: [PATCH 121/203] Ensure probe count is never out of bounds

#3963
---
 Content/Shaders/GI/DDGI.flax  | 4 ++--
 Source/Shaders/GI/DDGI.shader | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content/Shaders/GI/DDGI.flax b/Content/Shaders/GI/DDGI.flax
index 257953bf9..98cfbb80a 100644
--- a/Content/Shaders/GI/DDGI.flax
+++ b/Content/Shaders/GI/DDGI.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b017cf857f443553020e4bc7c8c8c5da3a826a2514322664a023ffa6005f7a5
-size 38217
+oid sha256:50753dbd37cb2a6fd6f48a597e90c8b8b689c7e433e66a5f21bc4ffa94244895
+size 38260
diff --git a/Source/Shaders/GI/DDGI.shader b/Source/Shaders/GI/DDGI.shader
index b080efc0b..bade984fc 100644
--- a/Source/Shaders/GI/DDGI.shader
+++ b/Source/Shaders/GI/DDGI.shader
@@ -351,6 +351,7 @@ META_CS(true, FEATURE_LEVEL_SM5)
 void CS_UpdateProbesInitArgs()
 {
     uint activeProbesCount = ActiveProbes.Load(0); // Counter at 0
+    activeProbesCount = min(activeProbesCount, ProbesCount);
     uint arg = 0;
     for (uint probesOffset = 0; probesOffset < activeProbesCount; probesOffset += DDGI_TRACE_RAYS_PROBES_COUNT_LIMIT)
     {

From 30d7588d9cc3d44ac920d3b12acc8a29b3384053 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 08:53:30 +0100
Subject: [PATCH 122/203] Fix UI panel controls missing in Editor

---
 Source/Engine/UI/GUI/ScrollableControl.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Source/Engine/UI/GUI/ScrollableControl.cs b/Source/Engine/UI/GUI/ScrollableControl.cs
index 4977ac89b..7caa211cf 100644
--- a/Source/Engine/UI/GUI/ScrollableControl.cs
+++ b/Source/Engine/UI/GUI/ScrollableControl.cs
@@ -6,7 +6,6 @@ namespace FlaxEngine.GUI
     /// Base class for container controls that can offset controls in a view (eg. scroll panels).
     /// </summary>
     /// <seealso cref="FlaxEngine.GUI.ContainerControl" />
-    [HideInEditor]
     public class ScrollableControl : ContainerControl
     {
         /// <summary>

From 62e492452dec984851c654fc15bd385ea82bbbe3 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 09:26:23 +0100
Subject: [PATCH 123/203] Add UI editor grid toggle

---
 Source/Editor/Gizmo/UIEditorGizmo.cs          | 30 ++++++++++++-------
 .../Editor/Viewport/PrefabWindowViewport.cs   |  3 +-
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Source/Editor/Gizmo/UIEditorGizmo.cs b/Source/Editor/Gizmo/UIEditorGizmo.cs
index 765893bed..8307ec8de 100644
--- a/Source/Editor/Gizmo/UIEditorGizmo.cs
+++ b/Source/Editor/Gizmo/UIEditorGizmo.cs
@@ -180,6 +180,11 @@ namespace FlaxEditor
         /// </summary>
         public bool EnableCamera => _view != null && EnableBackground;
 
+        /// <summary>
+        /// True if enable grid drawing.
+        /// </summary>
+        public bool ShowGrid { get; set; } = true;
+
         /// <summary>
         /// Transform gizmo to use sync with (selection, snapping, transformation settings).
         /// </summary>
@@ -492,17 +497,20 @@ namespace FlaxEditor
                 // Draw background
                 Surface.VisjectSurface.DrawBackgroundDefault(Editor.Instance.UI.VisjectSurfaceBackground, Width, Height);
 
-                // Draw grid
-                var viewRect = GetClientArea();
-                var upperLeft = _view.PointFromParent(viewRect.Location);
-                var bottomRight = _view.PointFromParent(viewRect.Size);
-                var min = Float2.Min(upperLeft, bottomRight);
-                var max = Float2.Max(upperLeft, bottomRight);
-                var pixelRange = (max - min) * ViewScale;
-                Render2D.PushClip(ref viewRect);
-                DrawAxis(Float2.UnitX, viewRect, min.X, max.X, pixelRange.X);
-                DrawAxis(Float2.UnitY, viewRect, min.Y, max.Y, pixelRange.Y);
-                Render2D.PopClip();
+                if (ShowGrid)
+                {
+                    // Draw grid
+                    var viewRect = GetClientArea();
+                    var upperLeft = _view.PointFromParent(viewRect.Location);
+                    var bottomRight = _view.PointFromParent(viewRect.Size);
+                    var min = Float2.Min(upperLeft, bottomRight);
+                    var max = Float2.Max(upperLeft, bottomRight);
+                    var pixelRange = (max - min) * ViewScale;
+                    Render2D.PushClip(ref viewRect);
+                    DrawAxis(Float2.UnitX, viewRect, min.X, max.X, pixelRange.X);
+                    DrawAxis(Float2.UnitY, viewRect, min.Y, max.Y, pixelRange.Y);
+                    Render2D.PopClip();
+                }
             }
 
             base.Draw();
diff --git a/Source/Editor/Viewport/PrefabWindowViewport.cs b/Source/Editor/Viewport/PrefabWindowViewport.cs
index 7f2b1a471..a8bdc8f20 100644
--- a/Source/Editor/Viewport/PrefabWindowViewport.cs
+++ b/Source/Editor/Viewport/PrefabWindowViewport.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using FlaxEditor.Content;
 using FlaxEditor.Gizmo;
 using FlaxEditor.GUI.ContextMenu;
-using FlaxEditor.GUI.Input;
 using FlaxEditor.Modules;
 using FlaxEditor.SceneGraph;
 using FlaxEditor.Scripting;
@@ -15,7 +14,6 @@ using FlaxEditor.Viewport.Previews;
 using FlaxEditor.Windows.Assets;
 using FlaxEngine;
 using FlaxEngine.GUI;
-using FlaxEngine.Json;
 using Utils = FlaxEditor.Utilities.Utils;
 
 namespace FlaxEditor.Viewport
@@ -185,6 +183,7 @@ namespace FlaxEditor.Viewport
             showGridButton.Clicked += () =>
             {
                 _gridGizmo.Enabled = !_gridGizmo.Enabled;
+                _uiRoot.ShowGrid = _gridGizmo.Enabled;
                 showGridButton.Checked = _gridGizmo.Enabled;
             };
             showGridButton.Checked = true;

From 7fa40eba8301fdf8d27b9a9b833462ee26e09e5e Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 10:10:47 +0100
Subject: [PATCH 124/203] Fix `Render2D.DrawRectangle` to avoid alpha overdraw
 on the corners when thickness is large

---
 Source/Engine/Render2D/Render2D.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Source/Engine/Render2D/Render2D.cpp b/Source/Engine/Render2D/Render2D.cpp
index 5ae034bc5..689c1a3c1 100644
--- a/Source/Engine/Render2D/Render2D.cpp
+++ b/Source/Engine/Render2D/Render2D.cpp
@@ -1440,8 +1440,28 @@ void Render2D::DrawRectangle(const Rectangle& rect, const Color& color1, const C
     RENDER2D_CHECK_RENDERING_STATE;
 
     const auto& mask = ClipLayersStack.Peek().Mask;
+    float thick = thickness;
     thickness *= (TransformCached.M11 + TransformCached.M22 + TransformCached.M33) * 0.3333333f;
 
+    // When lines thickness is very large, don't use corner caps and place line ends to not overlap
+    if (thickness > 4.0f)
+    {
+        thick *= Math::Lerp(0.6f, 1.0f, Math::Saturate(thick - 4.0f)); // Smooth transition between soft LineAA and harsh FillRect
+        Float2 totalMin = rect.GetUpperLeft() - Float2(thick * 0.5f);
+        Float2 totalMax = rect.GetBottomRight() + Float2(thick * 0.5f);
+        Float2 size = totalMax - totalMin;
+        Render2DDrawCall& drawCall = DrawCalls.AddOne();
+        drawCall.Type = NeedAlphaWithTint(color1, color2, color3, color4) ? DrawCallType::FillRect : DrawCallType::FillRectNoAlpha;
+        drawCall.StartIB = IBIndex;
+        drawCall.CountIB = 6 * 4;
+        // TODO: interpolate colors from corners to extended rectangle edges properly
+        WriteRect(Rectangle(totalMin.X, totalMin.Y, size.X, thick), color1, color2, color2, color1);
+        WriteRect(Rectangle(totalMin.X, totalMin.Y + rect.Size.Y, size.X, thick), color4, color3, color3, color4);
+        WriteRect(Rectangle(totalMin.X, totalMin.Y + thick, thick, rect.Size.Y - thick), color1, color1, color4, color4);
+        WriteRect(Rectangle(totalMax.X - thick, totalMin.Y + thick, thick, rect.Size.Y - thick), color2, color2, color3, color3);
+        return;
+    }
+
     Float2 points[5];
     ApplyTransform(rect.GetUpperLeft(), points[0]);
     ApplyTransform(rect.GetUpperRight(), points[1]);

From b5d841ffc93596c0aff623f1a56868feeb65a838 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 11:06:42 +0100
Subject: [PATCH 125/203] Use total rotation from #3758 in #3760

---
 Source/Editor/Gizmo/UIEditorGizmo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Editor/Gizmo/UIEditorGizmo.cs b/Source/Editor/Gizmo/UIEditorGizmo.cs
index 3d0bc022b..61109556c 100644
--- a/Source/Editor/Gizmo/UIEditorGizmo.cs
+++ b/Source/Editor/Gizmo/UIEditorGizmo.cs
@@ -401,7 +401,7 @@ namespace FlaxEditor
                 var uiControlDelta = GetControlDelta(control, ref _mouseMovesPos, ref moveLocation);
 
                 // Transform delta to control local space
-                var rotation = control.Rotation * Mathf.DegreesToRadians; // TODO: use total parent rotation
+                var rotation = GetTotalRotation(control) * Mathf.DegreesToRadians;
                 var cos = Mathf.Cos(rotation);
                 var sin = Mathf.Sin(rotation);
                 var localDeltaX = uiControlDelta.X * cos + uiControlDelta.Y * sin;

From 8318a9c1d033fa5f559fa74cbfdabef5f8e183ae Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 13:39:01 +0100
Subject: [PATCH 126/203] Fix crash when unloading scene during tick of that
 scene

---
 Source/Engine/Level/Level.cpp              |  3 --
 Source/Engine/Level/Scene/Scene.cpp        |  3 ++
 Source/Engine/Level/Scene/SceneTicking.cpp | 40 +++++++++++-----------
 Source/Engine/Level/Scene/SceneTicking.h   |  8 +++++
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/Source/Engine/Level/Level.cpp b/Source/Engine/Level/Level.cpp
index 956005f57..a46ee52f6 100644
--- a/Source/Engine/Level/Level.cpp
+++ b/Source/Engine/Level/Level.cpp
@@ -958,9 +958,6 @@ bool LevelImpl::unloadScene(Scene* scene)
     // Simple enqueue scene root object to be deleted
     scene->DeleteObject();
 
-    // Force flush deleted objects so we actually delete unloaded scene objects (prevent from reloading their managed objects, etc.)
-    ObjectsRemovalService::Flush();
-
     return false;
 }
 
diff --git a/Source/Engine/Level/Scene/Scene.cpp b/Source/Engine/Level/Scene/Scene.cpp
index f60aa8d2f..b45424a3d 100644
--- a/Source/Engine/Level/Scene/Scene.cpp
+++ b/Source/Engine/Level/Scene/Scene.cpp
@@ -389,11 +389,14 @@ void Scene::BeginPlay(SceneBeginData* data)
         if (model == nullptr)
             CreateCsgModel();
     }
+
+    Ticking.SetTicking(true);
 }
 
 void Scene::EndPlay()
 {
     // Improve scene cleanup performance by removing all data from scene rendering and ticking containers
+    Ticking.SetTicking(false);
     Ticking.Clear();
     Rendering.Clear();
     Navigation.Clear();
diff --git a/Source/Engine/Level/Scene/SceneTicking.cpp b/Source/Engine/Level/Scene/SceneTicking.cpp
index 30a551117..2b0ccc506 100644
--- a/Source/Engine/Level/Scene/SceneTicking.cpp
+++ b/Source/Engine/Level/Scene/SceneTicking.cpp
@@ -44,7 +44,7 @@ void SceneTicking::TickData::Tick()
 {
     TickScripts(Scripts);
 
-    for (int32 i = 0; i < Ticks.Count(); i++)
+    for (int32 i = 0; i < Ticks.Count() && _canTick; i++)
         Ticks.Get()[i].Call();
 }
 
@@ -66,7 +66,7 @@ void SceneTicking::TickData::TickExecuteInEditor()
 {
     TickScripts(ScriptsExecuteInEditor);
 
-    for (int32 i = 0; i < TicksExecuteInEditor.Count(); i++)
+    for (int32 i = 0; i < TicksExecuteInEditor.Count() && _canTick; i++)
         TicksExecuteInEditor.Get()[i].Call();
 }
 
@@ -89,10 +89,8 @@ SceneTicking::FixedUpdateTickData::FixedUpdateTickData()
 
 void SceneTicking::FixedUpdateTickData::TickScripts(const Array<Script*>& scripts)
 {
-    for (auto* script : scripts)
-    {
-        script->OnFixedUpdate();
-    }
+    for (int32 i = 0; i < scripts.Count() && _canTick; i++)
+        scripts.Get()[i]->OnFixedUpdate();
 }
 
 SceneTicking::UpdateTickData::UpdateTickData()
@@ -102,36 +100,30 @@ SceneTicking::UpdateTickData::UpdateTickData()
 
 void SceneTicking::UpdateTickData::TickScripts(const Array<Script*>& scripts)
 {
-    for (auto* script : scripts)
-    {
-        script->OnUpdate();
-    }
+    for (int32 i = 0; i < scripts.Count() && _canTick; i++)
+        scripts.Get()[i]->OnUpdate();
 }
 
 SceneTicking::LateUpdateTickData::LateUpdateTickData()
-    : TickData(64)
+    : TickData(0)
 {
 }
 
 void SceneTicking::LateUpdateTickData::TickScripts(const Array<Script*>& scripts)
 {
-    for (auto* script : scripts)
-    {
-        script->OnLateUpdate();
-    }
+    for (int32 i = 0; i < scripts.Count() && _canTick; i++)
+        scripts.Get()[i]->OnLateUpdate();
 }
 
 SceneTicking::LateFixedUpdateTickData::LateFixedUpdateTickData()
-    : TickData(64)
+    : TickData(0)
 {
 }
 
 void SceneTicking::LateFixedUpdateTickData::TickScripts(const Array<Script*>& scripts)
 {
-    for (auto* script : scripts)
-    {
-        script->OnLateFixedUpdate();
-    }
+    for (int32 i = 0; i < scripts.Count() && _canTick; i++)
+        scripts.Get()[i]->OnLateFixedUpdate();
 }
 
 void SceneTicking::AddScript(Script* obj)
@@ -167,3 +159,11 @@ void SceneTicking::Clear()
     LateUpdate.Clear();
     LateFixedUpdate.Clear();
 }
+
+void SceneTicking::SetTicking(bool enable)
+{
+    FixedUpdate._canTick = enable;
+    Update._canTick = enable;
+    LateUpdate._canTick = enable;
+    LateFixedUpdate._canTick = enable;
+}
diff --git a/Source/Engine/Level/Scene/SceneTicking.h b/Source/Engine/Level/Scene/SceneTicking.h
index 78e028b8e..26040852b 100644
--- a/Source/Engine/Level/Scene/SceneTicking.h
+++ b/Source/Engine/Level/Scene/SceneTicking.h
@@ -46,6 +46,9 @@ public:
     /// </summary>
     class FLAXENGINE_API TickData
     {
+    protected:
+        friend SceneTicking;
+        bool _canTick = true;
     public:
         Array<Script*> Scripts;
         Array<Tick> Ticks;
@@ -134,6 +137,11 @@ public:
     /// </summary>
     void Clear();
 
+    /// <summary>
+    /// Changes the ability to tick. When disabled, the ticking functions won't be called. Can be called during ticking (eg. when scene is unloaded) to stp performing any more ticks.
+    /// </summary>
+    void SetTicking(bool enable);
+
 public:
     /// <summary>
     /// The fixed update tick function.

From e7016564b16e68dc5c103d6da5930f405735588d Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 14:27:34 +0100
Subject: [PATCH 127/203] Add Git repository branch name and commit hash
 injection into generated code module metadata

---
 Source/Editor/Windows/AboutDialog.cs          | 10 ++-
 Source/Engine/Engine/Engine.cpp               |  4 ++
 .../Bindings/BindingsGenerator.CSharp.cs      |  3 +-
 .../Bindings/BindingsGenerator.Cpp.cs         |  4 ++
 Source/Tools/Flax.Build/ProjectInfo.cs        | 66 +++++++++++++++++++
 .../Tools/Flax.Build/Utilities/Utilities.cs   |  4 +-
 6 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/Windows/AboutDialog.cs b/Source/Editor/Windows/AboutDialog.cs
index 1d9afbdfe..e8352fb1c 100644
--- a/Source/Editor/Windows/AboutDialog.cs
+++ b/Source/Editor/Windows/AboutDialog.cs
@@ -2,6 +2,7 @@
 //#define USE_AUTODESK_FBX_SDK
 
 using System.Collections.Generic;
+using System.Reflection;
 using FlaxEditor.GUI.Dialogs;
 using FlaxEngine;
 using FlaxEngine.GUI;
@@ -45,9 +46,16 @@ namespace FlaxEditor.Windows
                 VerticalAlignment = TextAlignment.Center,
                 Parent = this
             };
+            var assembly = typeof(Editor).Assembly;
+            var assemblyCopyright = assembly.GetCustomAttribute<AssemblyCopyrightAttribute>();
+            var assemblyInformationalVersion = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+            var versionParts = assemblyInformationalVersion.InformationalVersion.Split('+');
+            string versionInfo = string.Empty;
+            if (versionParts.Length == 3)
+                versionInfo = $"\nBranch: {versionParts[1]}+{(versionParts[2].Length == 40 ? versionParts[2].Substring(0, 8) : versionParts[2])}";
             new Label(nameLabel.Left, nameLabel.Bottom + 4, nameLabel.Width, 50)
             {
-                Text = string.Format("Version: {0}\nCopyright (c) 2012-2025 Wojciech Figat.\nAll rights reserved.", Globals.EngineVersion),
+                Text = $"Version: {Globals.EngineVersion}{versionInfo}\n{assemblyCopyright.Copyright.Replace(". ", ".\n")}",
                 HorizontalAlignment = TextAlignment.Near,
                 VerticalAlignment = TextAlignment.Near,
                 Parent = this
diff --git a/Source/Engine/Engine/Engine.cpp b/Source/Engine/Engine/Engine.cpp
index 5e8224b4e..15b3a1932 100644
--- a/Source/Engine/Engine/Engine.cpp
+++ b/Source/Engine/Engine/Engine.cpp
@@ -595,7 +595,11 @@ void EngineImpl::InitLog()
 #if COMPILE_WITH_DEV_ENV
     LOG(Info, "Compiled for Dev Environment");
 #endif
+#if defined(FLAXENGINE_BRANCH) && defined(FLAXENGINE_COMMIT)
+    LOG(Info, "Version " FLAXENGINE_VERSION_TEXT ", " FLAXENGINE_BRANCH ", " FLAXENGINE_COMMIT);
+#else
     LOG(Info, "Version " FLAXENGINE_VERSION_TEXT);
+#endif
     const Char* cpp = TEXT("?");
     if (__cplusplus == 202101L) cpp = TEXT("C++23");
     else if (__cplusplus == 202002L) cpp = TEXT("C++20");
diff --git a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
index 034803d25..174c6de2c 100644
--- a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
+++ b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
@@ -2429,7 +2429,7 @@ namespace Flax.Build.Bindings
             contents.AppendLine();
             contents.AppendLine($"[assembly: AssemblyTitle(\"{binaryModuleName}\")]");
             contents.AppendLine("[assembly: AssemblyDescription(\"\")]");
-            contents.AppendLine("[assembly: AssemblyConfiguration(\"\")]");
+            contents.AppendLine($"[assembly: AssemblyConfiguration(\"{buildData.Configuration}\")]");
             contents.AppendLine($"[assembly: AssemblyCompany(\"{project.Company}\")]");
             contents.AppendLine("[assembly: AssemblyProduct(\"FlaxEngine\")]");
             contents.AppendLine($"[assembly: AssemblyCopyright(\"{project.Copyright}\")]");
@@ -2439,6 +2439,7 @@ namespace Flax.Build.Bindings
             contents.AppendLine($"[assembly: Guid(\"{id:d}\")]");
             contents.AppendLine($"[assembly: AssemblyVersion(\"{project.Version}\")]");
             contents.AppendLine($"[assembly: AssemblyFileVersion(\"{project.Version}\")]");
+            contents.AppendLine($"[assembly: AssemblyInformationalVersion(\"{project.VersionControlInfo}\")]");
 #if USE_NETCORE
             contents.AppendLine("[assembly: DisableRuntimeMarshalling]");
 #endif
diff --git a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
index f1c4c6be8..ce557be20 100644
--- a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
+++ b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
@@ -3289,6 +3289,10 @@ namespace Flax.Build.Bindings
             contents.AppendLine($"#define {binaryModuleNameUpper}_VERSION_REVISION {version.Revision}");
             contents.AppendLine($"#define {binaryModuleNameUpper}_COMPANY \"{project.Company}\"");
             contents.AppendLine($"#define {binaryModuleNameUpper}_COPYRIGHT \"{project.Copyright}\"");
+            if (project.VersionControlBranch.Length != 0)
+                contents.AppendLine($"#define {binaryModuleNameUpper}_BRANCH \"{project.VersionControlBranch}\"");
+            if (project.VersionControlCommit.Length != 0)
+                contents.AppendLine($"#define {binaryModuleNameUpper}_COMMIT \"{project.VersionControlCommit}\"");
             contents.AppendLine();
             contents.AppendLine("class BinaryModule;");
             contents.AppendLine($"extern \"C\" {binaryModuleNameUpper}_API BinaryModule* GetBinaryModule{binaryModuleName}();");
diff --git a/Source/Tools/Flax.Build/ProjectInfo.cs b/Source/Tools/Flax.Build/ProjectInfo.cs
index 44065015d..00bdbf938 100644
--- a/Source/Tools/Flax.Build/ProjectInfo.cs
+++ b/Source/Tools/Flax.Build/ProjectInfo.cs
@@ -145,6 +145,7 @@ namespace Flax.Build
     public sealed class ProjectInfo
     {
         private static List<ProjectInfo> _projectsCache;
+        private string _versionControlCommit, _versionControlBranch;
 
         /// <summary>
         /// The project reference.
@@ -232,6 +233,51 @@ namespace Flax.Build
         [System.Text.Json.Serialization.JsonConverter(typeof(ConfigurationDictionaryConverter))]
         public Dictionary<string, string> Configuration;
 
+        /// <summary>
+        /// Gets the name of the branch from Version Control System (VCS) used by the project. Empty when unused.
+        /// </summary>
+        public string VersionControlBranch
+        {
+            get
+            {
+                if (_versionControlBranch == null)
+                    InitVersionControlInfo();
+                return _versionControlBranch;
+            }
+        }
+
+        /// <summary>
+        /// Gets the commit hash/changeset identifier from Version Control System (VCS) used by the project. Empty when unused.
+        /// </summary>
+        public string VersionControlCommit
+        {
+            get
+            {
+                if (_versionControlCommit == null)
+                    InitVersionControlInfo();
+                return _versionControlCommit;
+            }
+        }
+
+        /// <summary>
+        /// Gets the informative version of the project including any Version Control System (VCS) information such as branch name, commit hash or changeset identifier.
+        /// </summary>
+        public string VersionControlInfo
+        {
+
+            get
+            {
+                if (_versionControlCommit == null)
+                    InitVersionControlInfo();
+                var version = Version.ToString();
+                if (_versionControlBranch.Length != 0)
+                    version += "+" + _versionControlBranch;
+                if (_versionControlCommit.Length != 0)
+                    version += "+" + _versionControlCommit;
+                return version;
+            }
+        }
+
         /// <summary>
         /// True if project is using C#-only and no native toolsets is required to build and use scripts.
         /// </summary>
@@ -267,6 +313,26 @@ namespace Flax.Build
             });
         }
 
+        private void InitVersionControlInfo()
+        {
+            _versionControlBranch = string.Empty;
+            _versionControlCommit = string.Empty;
+
+            // Git
+            if (Directory.Exists(Path.Combine(ProjectFolderPath, ".git")))
+            {
+                try
+                {
+                    _versionControlBranch = Utilities.ReadProcessOutput("git", "rev-parse --abbrev-ref HEAD", ProjectFolderPath);
+                    _versionControlCommit = Utilities.ReadProcessOutput("git", "rev-parse HEAD", ProjectFolderPath);
+                }
+                catch (Exception)
+                {
+                    // Ignored
+                }
+            }
+        }
+
         /// <summary>
         /// Gets all projects including this project, it's references and their references (any deep level of references).
         /// </summary>
diff --git a/Source/Tools/Flax.Build/Utilities/Utilities.cs b/Source/Tools/Flax.Build/Utilities/Utilities.cs
index 872b269ee..cb55b154a 100644
--- a/Source/Tools/Flax.Build/Utilities/Utilities.cs
+++ b/Source/Tools/Flax.Build/Utilities/Utilities.cs
@@ -587,8 +587,9 @@ namespace Flax.Build
         /// </summary>
         /// <param name="filename">The executable file path.</param>
         /// <param name="args">The custom arguments.</param>
+        /// <param name="workspace">The custom folder to run program in it.</param>
         /// <returns>Returned process output.</returns>
-        public static string ReadProcessOutput(string filename, string args = null)
+        public static string ReadProcessOutput(string filename, string args = null, string workspace = null)
         {
             Process p = new Process
             {
@@ -599,6 +600,7 @@ namespace Flax.Build
                     UseShellExecute = false,
                     CreateNoWindow = true,
                     RedirectStandardOutput = true,
+                    WorkingDirectory = workspace,
                 }
             };
             p.Start();

From 549ed76e7c71e584985048246520e85632db0c76 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 14:32:11 +0100
Subject: [PATCH 128/203] Add warning when importing texture that is
 non-power-of-two and cannot generate mip maps

---
 Source/Engine/Tools/TextureTool/TextureTool.DirectXTex.cpp | 4 ++++
 Source/Engine/Tools/TextureTool/TextureTool.stb.cpp        | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/Source/Engine/Tools/TextureTool/TextureTool.DirectXTex.cpp b/Source/Engine/Tools/TextureTool/TextureTool.DirectXTex.cpp
index d7199a470..be38f0015 100644
--- a/Source/Engine/Tools/TextureTool/TextureTool.DirectXTex.cpp
+++ b/Source/Engine/Tools/TextureTool/TextureTool.DirectXTex.cpp
@@ -722,6 +722,10 @@ bool TextureTool::ImportTextureDirectXTex(ImageType type, const StringView& path
         errorMsg = String::Format(TEXT("Imported texture has not full mip chain, loaded mips count: {0}, expected: {1}"), sourceMipLevels, mipLevels);
         return true;
     }
+    if (options.GenerateMipMaps && !isPowerOfTwo)
+    {
+        LOG(Warning, "Cannot generate mip maps for texture '{}' that size is not power of two. Use Resize or Max Size to change dimensions.", StringUtils::GetFileName(path), width, height);
+    }
 
     // Allocate memory for texture data
     auto& data = textureData.Items;
diff --git a/Source/Engine/Tools/TextureTool/TextureTool.stb.cpp b/Source/Engine/Tools/TextureTool/TextureTool.stb.cpp
index 7c74ef3f2..544877232 100644
--- a/Source/Engine/Tools/TextureTool/TextureTool.stb.cpp
+++ b/Source/Engine/Tools/TextureTool/TextureTool.stb.cpp
@@ -543,6 +543,10 @@ bool TextureTool::ImportTextureStb(ImageType type, const StringView& path, Textu
         errorMsg = String::Format(TEXT("Imported texture has not full mip chain, loaded mips count: {0}, expected: {1}"), sourceMipLevels, mipLevels);
         return true;
     }
+    if (options.GenerateMipMaps && !isPowerOfTwo)
+    {
+        LOG(Warning, "Cannot generate mip maps for texture '{}' that size is not power of two. Use Resize or Max Size to change dimensions.", StringUtils::GetFileName(path), width, height);
+    }
 
     // Decompress if texture is compressed (next steps need decompressed input data, for eg. mip maps generation or format changing)
     if (PixelFormatExtensions::IsCompressed(textureDataSrc->Format))

From 8b4f8de9888b72aa5b4504d04bb3314f22b8a651 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 15:27:31 +0100
Subject: [PATCH 129/203] Fix `Control.LocalLocation` to use parent control
 `GetDesireClientArea` rather than `Bounds`

#3889
---
 Source/Engine/UI/GUI/Control.Bounds.cs | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/UI/GUI/Control.Bounds.cs b/Source/Engine/UI/GUI/Control.Bounds.cs
index 62bffd6f7..079530c50 100644
--- a/Source/Engine/UI/GUI/Control.Bounds.cs
+++ b/Source/Engine/UI/GUI/Control.Bounds.cs
@@ -166,8 +166,26 @@ namespace FlaxEngine.GUI
         [NoSerialize, HideInEditor]
         public Float2 LocalLocation
         {
-            get => _bounds.Location - (_parent != null ? _parent._bounds.Size * (_anchorMax + _anchorMin) * 0.5f : Float2.Zero) + _bounds.Size * _pivot;
-            set => Bounds = new Rectangle(value + (_parent != null ? _parent.Bounds.Size * (_anchorMax + _anchorMin) * 0.5f : Float2.Zero) - _bounds.Size * _pivot, _bounds.Size);
+            get
+            {
+                var anchor = Float2.Zero;
+                if (_parent != null)
+                {
+                    _parent.GetDesireClientArea(out var parentBounds);
+                    anchor = parentBounds.Location + parentBounds.Size * (_anchorMin + _anchorMax) * 0.5f;
+                }
+                return _bounds.Location - anchor + _bounds.Size * _pivot;
+            }
+            set
+            {
+                var anchor = Float2.Zero;
+                if (_parent != null)
+                {
+                    _parent.GetDesireClientArea(out var parentBounds);
+                    anchor = parentBounds.Location + parentBounds.Size * (_anchorMin + _anchorMax) * 0.5f;
+                }
+                Bounds = new Rectangle(value + anchor - _bounds.Size * _pivot, _bounds.Size);
+            }
         }
 
         /// <summary>

From d784fddf953087ab6cec2e0a55ababd63847fe01 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 17:22:43 +0100
Subject: [PATCH 130/203] Code style cleanup for #3944

---
 Source/Editor/Windows/Assets/FontWindow.cs |  2 +-
 Source/Engine/Render2D/FontManager.cpp     | 28 ++++++++++++----------
 Source/Engine/Render2D/FontTextureAtlas.h  |  2 +-
 Source/Engine/Render2D/Render2D.cpp        | 12 ++--------
 Source/ThirdParty/msdfgen/msdfgen.Build.cs |  2 +-
 5 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/Source/Editor/Windows/Assets/FontWindow.cs b/Source/Editor/Windows/Assets/FontWindow.cs
index 1a69f7724..e08a87b05 100644
--- a/Source/Editor/Windows/Assets/FontWindow.cs
+++ b/Source/Editor/Windows/Assets/FontWindow.cs
@@ -46,7 +46,7 @@ namespace FlaxEditor.Windows.Assets
                 options = new FontOptions
                 {
                     Hinting = Hinting,
-                    RasterMode = RasterMode
+                    RasterMode = RasterMode,
                 };
                 if (AntiAliasing)
                     options.Flags |= FontFlags.AntiAliasing;
diff --git a/Source/Engine/Render2D/FontManager.cpp b/Source/Engine/Render2D/FontManager.cpp
index 7376173f8..d58394bb3 100644
--- a/Source/Engine/Render2D/FontManager.cpp
+++ b/Source/Engine/Render2D/FontManager.cpp
@@ -9,11 +9,11 @@
 #include "Engine/Content/Content.h"
 #include "Engine/Engine/EngineService.h"
 #include "Engine/Threading/Threading.h"
+#include "Engine/Render2D/MSDFGenerator.h"
 #include "IncludeFreeType.h"
 #include <ThirdParty/freetype/ftsynth.h>
 #include <ThirdParty/freetype/ftbitmap.h>
 #include <ThirdParty/freetype/internal/ftdrv.h>
-#include "Engine/Render2D/MSDFGenerator.h"
 
 namespace FontManagerImpl
 {
@@ -200,7 +200,8 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
 
         FT_Bitmap* bitmap = &glyph->bitmap;
         FT_Bitmap tmpBitmap;
-        if (bitmap->pixel_mode != FT_PIXEL_MODE_GRAY) {
+        if (bitmap->pixel_mode != FT_PIXEL_MODE_GRAY)
+        {
             // Convert the bitmap to 8bpp grayscale
             FT_Bitmap_New(&tmpBitmap);
             FT_Bitmap_Convert(Library, bitmap, &tmpBitmap, 4);
@@ -233,7 +234,7 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
             }
             return false;
         }
-        
+
         // Copy glyph data after rasterization (row by row)
         for (int32 row = 0; row < glyphHeight; row++)
         {
@@ -241,15 +242,16 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
         }
 
         // Normalize gray scale images not using 256 colors
-        if (bitmap->num_grays != 256) {
+        if (bitmap->num_grays != 256)
+        {
             const int32 scale = 255 / (bitmap->num_grays - 1);
-            for (byte& pixel : GlyphImageData) {
+            for (byte& pixel : GlyphImageData)
                 pixel *= scale;
-            }
         }
 
         // Free temporary bitmap if used
-        if (bitmap == &tmpBitmap) {
+        if (bitmap == &tmpBitmap)
+        {
             FT_Bitmap_Done(Library, bitmap);
             bitmap = nullptr;
         }
@@ -267,7 +269,8 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
         MSDFGenerator::GenerateMSDF(glyph, GlyphImageData, glyphWidth, glyphHeight, msdf_top, msdf_left);
 
         // End for empty glyphs
-        if (GlyphImageData.IsEmpty()) {
+        if (GlyphImageData.IsEmpty())
+        {
             entry.TextureIndex = MAX_uint8;
             return false;
         }
@@ -281,11 +284,12 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
     }
 
     // Find atlas for the character texture
-    PixelFormat requiredFormat = options.RasterMode == FontRasterMode::MSDF ? PixelFormat::R8G8B8A8_UNorm : PixelFormat::R8_UNorm;
+    PixelFormat atlasFormat = options.RasterMode == FontRasterMode::MSDF ? PixelFormat::R8G8B8A8_UNorm : PixelFormat::R8_UNorm;
     int32 atlasIndex = 0;
     const FontTextureAtlasSlot* slot = nullptr;
-    for (; atlasIndex < Atlases.Count() && slot == nullptr; atlasIndex++) {
-        if (Atlases[atlasIndex]->GetPixelFormat() != requiredFormat)
+    for (; atlasIndex < Atlases.Count() && slot == nullptr; atlasIndex++)
+    {
+        if (Atlases[atlasIndex]->GetFormat() != atlasFormat)
             continue;
         slot = Atlases[atlasIndex]->AddEntry(glyphWidth, glyphHeight, GlyphImageData);
     }
@@ -296,7 +300,7 @@ bool FontManager::AddNewEntry(Font* font, Char c, FontCharacterEntry& entry)
     {
         // Create new atlas
         auto atlas = Content::CreateVirtualAsset<FontTextureAtlas>();
-        atlas->Setup(requiredFormat, FontTextureAtlas::PaddingStyle::PadWithZero);
+        atlas->Setup(atlasFormat, FontTextureAtlas::PaddingStyle::PadWithZero);
         Atlases.Add(atlas);
         atlasIndex++;
 
diff --git a/Source/Engine/Render2D/FontTextureAtlas.h b/Source/Engine/Render2D/FontTextureAtlas.h
index 3a6ca98ae..f688644ab 100644
--- a/Source/Engine/Render2D/FontTextureAtlas.h
+++ b/Source/Engine/Render2D/FontTextureAtlas.h
@@ -108,7 +108,7 @@ public:
     /// <summary>
     /// Gets the atlas pixel format.
     /// </summary>
-    FORCE_INLINE PixelFormat GetPixelFormat() const
+    FORCE_INLINE PixelFormat GetFormat() const
     {
         return _format;
     }
diff --git a/Source/Engine/Render2D/Render2D.cpp b/Source/Engine/Render2D/Render2D.cpp
index d33964be6..d9e052e6e 100644
--- a/Source/Engine/Render2D/Render2D.cpp
+++ b/Source/Engine/Render2D/Render2D.cpp
@@ -1190,10 +1190,6 @@ void Render2D::DrawText(Font* font, const StringView& text, const Color& color,
     float scale = 1.0f / FontManager::FontScale;
     const bool enableFallbackFonts = EnumHasAllFlags(Features, RenderingFeatures::FallbackFonts);
 
-    const FontAsset* asset = font->GetAsset();
-    const FontOptions& options = asset->GetOptions();
-    const bool useMSDF = options.RasterMode == FontRasterMode::MSDF;
-
     // Render all characters
     FontCharacterEntry entry;
     Render2DDrawCall drawCall;
@@ -1204,7 +1200,7 @@ void Render2D::DrawText(Font* font, const StringView& text, const Color& color,
     }
     else
     {
-        drawCall.Type = useMSDF ? DrawCallType::DrawCharMSDF : DrawCallType::DrawChar;
+        drawCall.Type = font->GetAsset()->GetOptions().RasterMode == FontRasterMode::MSDF ? DrawCallType::DrawCharMSDF : DrawCallType::DrawChar;
         drawCall.AsChar.Mat = nullptr;
     }
     Float2 pointer = location;
@@ -1309,10 +1305,6 @@ void Render2D::DrawText(Font* font, const StringView& text, const Color& color,
     float scale = layout.Scale / FontManager::FontScale;
     const bool enableFallbackFonts = EnumHasAllFlags(Features, RenderingFeatures::FallbackFonts);
 
-    const FontAsset* asset = font->GetAsset();
-    const FontOptions& options = asset->GetOptions();
-    const bool useMSDF = options.RasterMode == FontRasterMode::MSDF;
-
     // Process text to get lines
     Lines.Clear();
     font->ProcessText(text, Lines, layout);
@@ -1327,7 +1319,7 @@ void Render2D::DrawText(Font* font, const StringView& text, const Color& color,
     }
     else
     {
-        drawCall.Type = useMSDF ? DrawCallType::DrawCharMSDF : DrawCallType::DrawChar;
+        drawCall.Type = font->GetAsset()->GetOptions().RasterMode == FontRasterMode::MSDF ? DrawCallType::DrawCharMSDF : DrawCallType::DrawChar;
         drawCall.AsChar.Mat = nullptr;
     }
     for (int32 lineIndex = 0; lineIndex < Lines.Count(); lineIndex++)
diff --git a/Source/ThirdParty/msdfgen/msdfgen.Build.cs b/Source/ThirdParty/msdfgen/msdfgen.Build.cs
index 4a98013d7..f798152b1 100644
--- a/Source/ThirdParty/msdfgen/msdfgen.Build.cs
+++ b/Source/ThirdParty/msdfgen/msdfgen.Build.cs
@@ -40,6 +40,6 @@ public class msdfgen : DepsModule
         default: throw new InvalidPlatformException(options.Platform.Target);
         }
 
-        options.PublicIncludePaths.Add(Path.Combine(Globals.EngineRoot, @"Source\ThirdParty\msdfgen"));
+        options.PublicIncludePaths.Add(Path.Combine(Globals.EngineRoot, "Source/ThirdParty/msdfgen"));
     }
 }

From bc3cddc774c0b2f9e234296a71dde9dab59b34f5 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 17:23:29 +0100
Subject: [PATCH 131/203] Build `msdfgen` for Windows and Android with a minor
 cleanup for a build script

#3944
---
 .../ThirdParty/ARM64/libmsdfgen-core.a        |  3 +
 .../Binaries/ThirdParty/x64/msdfgen-core.lib  |  3 +
 .../Flax.Build/Deps/Dependencies/msdfgen.cs   | 84 ++++++-------------
 3 files changed, 31 insertions(+), 59 deletions(-)
 create mode 100644 Source/Platforms/Android/Binaries/ThirdParty/ARM64/libmsdfgen-core.a
 create mode 100644 Source/Platforms/Windows/Binaries/ThirdParty/x64/msdfgen-core.lib

diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libmsdfgen-core.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libmsdfgen-core.a
new file mode 100644
index 000000000..274ba3a52
--- /dev/null
+++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libmsdfgen-core.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c34b3e22db047130c0f0a425197f4e27f345c458fbadb73104c7af69d0f9f2cd
+size 4560474
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/msdfgen-core.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/msdfgen-core.lib
new file mode 100644
index 000000000..3b2aeffc3
--- /dev/null
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/msdfgen-core.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1bb19678e7b094a07f035bf9438fde6ec56bc0d68a192a2e719a41aee4089e03
+size 1097914
diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs b/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
index 1829f9ff0..5f1e4280c 100644
--- a/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
@@ -7,7 +7,7 @@ using Flax.Build;
 namespace Flax.Deps.Dependencies
 {
     /// <summary>
-    /// Official Open Asset Import Library Repository. Loads 40+ 3D file formats into one unified and clean data structure. http://www.assimp.org
+    /// Multi-channel signed distance field generator. https://github.com/Chlumsky/msdfgen
     /// </summary>
     /// <seealso cref="Flax.Deps.Dependency" />
     class msdfgen : Dependency
@@ -23,6 +23,7 @@ namespace Flax.Deps.Dependencies
                     return new[]
                     {
                         TargetPlatform.Windows,
+                        TargetPlatform.Android,
                     };
                 case TargetPlatform.Linux:
                     return new[]
@@ -73,6 +74,7 @@ namespace Flax.Deps.Dependencies
         public override void Build(BuildOptions options)
         {
             var root = options.IntermediateFolder;
+            var configuration = "Release";
             string includeDir = null;
             var filesToKeep = new[]
             {
@@ -87,86 +89,50 @@ namespace Flax.Deps.Dependencies
                 "-DBUILD_SHARED_LIBS=OFF",
                 "-DMSDFGEN_INSTALL=ON"
             };
-            var cmakeArgs = string.Join(" ", args);
 
             // Get the source
-            CloneGitRepoSingleBranch(root, "https://github.com/Chlumsky/msdfgen.git", "master", "1874bcf7d9624ccc85b4bc9a85d78116f690f35b");
+            var commit = "1874bcf7d9624ccc85b4bc9a85d78116f690f35b"; // Version 1.13
+            CloneGitRepoSingleBranch(root, "https://github.com/Chlumsky/msdfgen.git", "master", commit);
 
             foreach (var platform in options.Platforms)
             {
                 foreach (var architecture in options.Architectures)
                 {
                     BuildStarted(platform, architecture);
+
+                    var buildDir = Path.Combine(root, "build-" + architecture);
+                    var installDir = Path.Combine(root, "install-" + architecture);
+                    var depsFolder = GetThirdPartyFolder(options, platform, architecture);
+                    includeDir = Path.Combine(installDir, "include");
+                    SetupDirectory(buildDir, true);
+                    File.Delete(Path.Combine(root, "CMakeCache.txt"));
+
+                    Dictionary<string, string> envVars = null;
+                    var libName = "libmsdfgen-core.a";
+                    var cmakeArgs = string.Join(" ", args);
                     switch (platform)
                     {
                     case TargetPlatform.Windows:
-                    {
-                        var configuration = "Release";
-
-                        // Build for Windows
-                        File.Delete(Path.Combine(root, "CMakeCache.txt"));
-                        
-                        var buildDir = Path.Combine(root, "build-" + architecture);
-                        var installDir = Path.Combine(root, "install-" + architecture);
-                        SetupDirectory(buildDir, true);
-                        RunCmake(root, platform, architecture, $"-B\"{buildDir}\" " + cmakeArgs);
-                        BuildCmake(buildDir);
-                        Utilities.Run("cmake", $"--install {buildDir} --prefix {installDir} --config {configuration}", null, root, Utilities.RunOptions.DefaultTool);
-                        var depsFolder = GetThirdPartyFolder(options, platform, architecture);
-                        Utilities.FileCopy(Path.Combine(installDir, "lib", "msdfgen-core.lib"), Path.Combine(depsFolder, "msdfgen-core.lib"));
-                        // This will be set multiple times, but the headers are the same anyway.
-                        includeDir = Path.Combine(installDir, "include");
-
+                    case TargetPlatform.XboxOne:
+                    case TargetPlatform.XboxScarlett:
+                        libName = "msdfgen-core.lib";
                         break;
-                    }
                     case TargetPlatform.Linux:
-                    {
-                        var configuration = "Release";
-                        var envVars = new Dictionary<string, string>
+                        envVars = new Dictionary<string, string>
                         {
                             { "CC", "clang-" + Configuration.LinuxClangMinVer },
                             { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer },
                             { "CXX", "clang++-" + Configuration.LinuxClangMinVer },
                             { "CMAKE_BUILD_PARALLEL_LEVEL", CmakeBuildParallel },
                         };
-
-                        // Build for Linux
-                        File.Delete(Path.Combine(root, "CMakeCache.txt"));
-
-                        var buildDir = Path.Combine(root, "build-" + architecture);
-                        var installDir = Path.Combine(root, "install-" + architecture);
-                        SetupDirectory(buildDir, true);
-                        RunCmake(root, platform, architecture, $"-B\"{buildDir}\" " + cmakeArgs + " -DCMAKE_POSITION_INDEPENDENT_CODE=ON", envVars);
-                        BuildCmake(buildDir);
-                        Utilities.Run("cmake", $"--install {buildDir} --prefix {installDir} --config {configuration}", null, root, Utilities.RunOptions.DefaultTool);
-                        var depsFolder = GetThirdPartyFolder(options, platform, architecture);
-                        Utilities.FileCopy(Path.Combine(installDir, "lib", "libmsdfgen-core.a"), Path.Combine(depsFolder, "libmsdfgen-core.a"));
-                        // This will be set multiple times, but the headers are the same anyway.
-                        includeDir = Path.Combine(installDir, "include");
-                        
+                        cmakeArgs += " -DCMAKE_POSITION_INDEPENDENT_CODE=ON";
                         break;
                     }
-                    case TargetPlatform.Mac:
-                    {
-                        var configuration = "Release";
 
-                        // Build for Mac
-                        File.Delete(Path.Combine(root, "CMakeCache.txt"));
-
-                        var buildDir = Path.Combine(root, "build-" + architecture);
-                        var installDir = Path.Combine(root, "install-" + architecture);
-                        SetupDirectory(buildDir, true);
-                        RunCmake(root, platform, architecture, $"-B\"{buildDir}\" " + cmakeArgs);
-                        BuildCmake(buildDir);
-                        Utilities.Run("cmake", $"--install {buildDir} --prefix {installDir} --config {configuration}", null, root, Utilities.RunOptions.DefaultTool);
-                        var depsFolder = GetThirdPartyFolder(options, platform, architecture);
-                        Utilities.FileCopy(Path.Combine(installDir, "lib", "libmsdfgen-core.a"), Path.Combine(depsFolder, "libmsdfgen-core.a"));
-                        // This will be set multiple times, but the headers are the same anyway.
-                        includeDir = Path.Combine(installDir, "include");
-                        
-                        break;
-                    }
-                    }
+                    RunCmake(root, platform, architecture, $"-B\"{buildDir}\" " + cmakeArgs, envVars);
+                    BuildCmake(buildDir);
+                    Utilities.Run("cmake", $"--install {buildDir} --prefix {installDir} --config {configuration}", null, root, Utilities.RunOptions.DefaultTool);
+                    Utilities.FileCopy(Path.Combine(installDir, "lib", libName), Path.Combine(depsFolder, libName));
                 }
             }
 

From 48d86ac7aeb9a88434173c724f20760eb3cd68f8 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 17:23:39 +0100
Subject: [PATCH 132/203] Update engine assets

---
 Content/Editor/Fonts/Inconsolata-Regular.flax        | 4 ++--
 Content/Editor/Fonts/NotoSansSC-Regular.flax         | 4 ++--
 Content/Editor/Fonts/Roboto-Regular.flax             | 4 ++--
 Content/Editor/Fonts/SegMDL2.flax                    | 4 ++--
 Content/Editor/Fonts/Segoe Media Center Regular.flax | 4 ++--
 Content/Shaders/GUI.flax                             | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Content/Editor/Fonts/Inconsolata-Regular.flax b/Content/Editor/Fonts/Inconsolata-Regular.flax
index a2fdf0626..d85ef610a 100644
--- a/Content/Editor/Fonts/Inconsolata-Regular.flax
+++ b/Content/Editor/Fonts/Inconsolata-Regular.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36995fa880bf47331618b1e96f613c6925e72484fe76e98d6e44c1985ecab017
-size 93015
+oid sha256:139e2f54a268f4febc753aaa9807a33a6eb2dd84e788c5b8b4f50ca8683d2b3b
+size 93116
diff --git a/Content/Editor/Fonts/NotoSansSC-Regular.flax b/Content/Editor/Fonts/NotoSansSC-Regular.flax
index 39964e6c5..8f8f00157 100644
--- a/Content/Editor/Fonts/NotoSansSC-Regular.flax
+++ b/Content/Editor/Fonts/NotoSansSC-Regular.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19fa43eb7b31ee3936348b1f271c464c79d7020a21d33e3cdbe54f98c3b14304
-size 10560899
+oid sha256:2ddc7af5fab1dd4ad858ad2abf11c6c243d908345720892cd56242fbc9c33b02
+size 10560900
diff --git a/Content/Editor/Fonts/Roboto-Regular.flax b/Content/Editor/Fonts/Roboto-Regular.flax
index a1e416f77..01251cac6 100644
--- a/Content/Editor/Fonts/Roboto-Regular.flax
+++ b/Content/Editor/Fonts/Roboto-Regular.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:574b86d8e7439e88c3d7b4265cbc5ad7089c49368c47661b2c6f4c997cb53d86
-size 172093
+oid sha256:c0584b3a3c186364464de155edece5cb6a8c46000676ac82a45f951f3a67fac5
+size 172194
diff --git a/Content/Editor/Fonts/SegMDL2.flax b/Content/Editor/Fonts/SegMDL2.flax
index d06bac811..b627849d9 100644
--- a/Content/Editor/Fonts/SegMDL2.flax
+++ b/Content/Editor/Fonts/SegMDL2.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c4a17c412fce35275af5be883c784b57d192eb188fb3568990b0ae8e0e6d34e
-size 204049
+oid sha256:f7a9d723d6342b8a484dfb2ee784cef506b3311a6092be0e9de35f941d698ff5
+size 204150
diff --git a/Content/Editor/Fonts/Segoe Media Center Regular.flax b/Content/Editor/Fonts/Segoe Media Center Regular.flax
index e9038cd65..6c17d96bf 100644
--- a/Content/Editor/Fonts/Segoe Media Center Regular.flax	
+++ b/Content/Editor/Fonts/Segoe Media Center Regular.flax	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d277b4abbdc1c91f056dd0d838631135242643abb41ce5751b1be3aaca72401
-size 72697
+oid sha256:c21443a111daede658cb634f56b4ae0838dbb2eaa75d4ba8ba74a4c77df44de8
+size 72798
diff --git a/Content/Shaders/GUI.flax b/Content/Shaders/GUI.flax
index d5e3f59fa..484f09f46 100644
--- a/Content/Shaders/GUI.flax
+++ b/Content/Shaders/GUI.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fed6a05104322f61a77f6cf69b64478518b829165a2a3ab7fc151098dcd48be
-size 4526
+oid sha256:551f893b015cd364911270816607651917545c83d28259c918018ff3ffc15937
+size 5333

From 88587fb6a4f3ad036cf073cb73441840353a2449 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 20:24:03 +0100
Subject: [PATCH 133/203] Add utility function to `GUICommon.hlsl` for MSDF
 fonts sampling in shaders

#3944
---
 Content/Shaders/GUI.flax           |  4 +--
 Source/Engine/Render2D/FontAsset.h |  6 ++---
 Source/Shaders/GUI.shader          | 20 +++-----------
 Source/Shaders/GUICommon.hlsl      | 43 ++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/Content/Shaders/GUI.flax b/Content/Shaders/GUI.flax
index 484f09f46..3e0ccc18f 100644
--- a/Content/Shaders/GUI.flax
+++ b/Content/Shaders/GUI.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:551f893b015cd364911270816607651917545c83d28259c918018ff3ffc15937
-size 5333
+oid sha256:b816ba638bc37b8a8288e4c397ff5b708153057650fa6b626a109ba42d189694
+size 4721
diff --git a/Source/Engine/Render2D/FontAsset.h b/Source/Engine/Render2D/FontAsset.h
index c9966c68b..56cc3d655 100644
--- a/Source/Engine/Render2D/FontAsset.h
+++ b/Source/Engine/Render2D/FontAsset.h
@@ -77,7 +77,7 @@ API_ENUM() enum class FontRasterMode : byte
     Bitmap,
 
     /// <summary>
-    /// Use the MSDF generator to render font atlases. Need to be rendered with a compatible material.
+    /// Use the Multi-channel Signed Distance Field (MSDF) generator to render font atlases. Need to be rendered with a compatible material.
     /// </summary>
     MSDF,
 };
@@ -92,7 +92,7 @@ API_STRUCT() struct FontOptions
     DECLARE_SCRIPTING_TYPE_MINIMAL(FontOptions);
 
     /// <summary>
-    /// The hinting.
+    /// The font hinting used when rendering characters.
     /// </summary>
     API_FIELD() FontHinting Hinting;
 
@@ -102,7 +102,7 @@ API_STRUCT() struct FontOptions
     API_FIELD() FontFlags Flags;
 
     /// <summary>
-    /// The rasterization mode.
+    /// The font rasterization mode.
     /// </summary>
     API_FIELD() FontRasterMode RasterMode;
 };
diff --git a/Source/Shaders/GUI.shader b/Source/Shaders/GUI.shader
index b09a3474d..a8f9452e9 100644
--- a/Source/Shaders/GUI.shader
+++ b/Source/Shaders/GUI.shader
@@ -92,7 +92,7 @@ float4 PS_Font(VS2PS input) : SV_Target0
 	PerformClipping(input);
 
 	float4 color = input.Color;
-	color.a *= Image.Sample(SamplerLinearClamp, input.TexCoord).r;
+    color.a *= SampleFont(Image, input.TexCoord);
 	return color;
 }
 
@@ -102,22 +102,8 @@ float4 PS_FontMSDF(VS2PS input) : SV_Target0
 	PerformClipping(input);
 
 	float4 color = input.Color;
-	float3 msd = Image.Sample(SamplerLinearClamp, input.TexCoord).rgb;
-    float sd = max(min(msd.r, msd.g), min(max(msd.r, msd.g), msd.b));
-
-    uint width, height;
-    Image.GetDimensions(width, height);
-    float pxRange = 4.0f; // Must match C++ code
-    float unitRange = float2(pxRange, pxRange) / float2(width, height);
-
-    float2 dx = ddx(input.TexCoord);
-    float2 dy = ddy(input.TexCoord);
-    float2 screenTexSize = rsqrt(dx * dx + dy * dy);
-    float screenPxRange = max(0.5f * dot(screenTexSize, unitRange), 1.0f);
-    float screenPxDist = screenPxRange * (sd - 0.5f);
-
-    float opacity = saturate(screenPxDist + 0.5f);
-	return float4(color.rgb, opacity);
+    color.a *= SampleFontMSDF(Image, input.TexCoord);
+	return color;
 }
 
 float4 GetSample(float weight, float offset, float2 uv)
diff --git a/Source/Shaders/GUICommon.hlsl b/Source/Shaders/GUICommon.hlsl
index 14c8b1327..67f9daac4 100644
--- a/Source/Shaders/GUICommon.hlsl
+++ b/Source/Shaders/GUICommon.hlsl
@@ -54,4 +54,47 @@ void PerformClipping(VS2PS input)
     PerformClipping(input.ClipOriginAndPos.xy, input.ClipOriginAndPos.zw, input.ClipExtents);
 }
 
+float SampleFont(Texture2D font, float2 uv)
+{
+    return font.Sample(SamplerLinearClamp, uv).r;
+}
+
+float GetFontMSDFMedian(Texture2D font, float2 uv)
+{
+    float4 msd = font.Sample(SamplerLinearClamp, uv);
+    return max(min(msd.r, msd.g), min(max(msd.r, msd.g), msd.b));
+}
+
+float GetFontMSDFPixelRange(Texture2D font, float2 uv)
+{
+    uint width, height;
+    font.GetDimensions(width, height);
+    float pxRange = 4.0f; // Must match C++ code
+    float unitRange = float2(pxRange, pxRange) / float2(width, height);
+
+    float2 dx = ddx(uv);
+    float2 dy = ddy(uv);
+    float2 screenTexSize = rsqrt(dx * dx + dy * dy);
+    return max(0.5f * dot(screenTexSize, unitRange), 1.0f);
+}
+
+float SampleFontMSDF(Texture2D font, float2 uv)
+{
+    float sd = GetFontMSDFMedian(font, uv);
+    float screenPxRange = GetFontMSDFPixelRange(font, uv);
+    float screenPxDist = screenPxRange * (sd - 0.5f);
+    return saturate(screenPxDist + 0.5f);
+}
+
+float SampleFontMSDFOutline(Texture2D font, float2 uv, float thickness)
+{
+    float4 msd = font.Sample(SamplerLinearClamp, uv);
+    float sd = max(min(msd.r, msd.g), min(max(msd.r, msd.g), msd.b));
+    float screenPxRange = GetFontMSDFPixelRange(font, uv);
+    float thick = clamp(thickness, 0.0, screenPxRange * 0.5 - 1.0) / screenPxRange;
+    float outline = saturate((min(sd, msd.a) - 0.5 + thick) * screenPxRange + 0.5);
+    outline *= 1 - saturate(screenPxRange * (sd - 0.5f) + 0.5f);
+    return outline;
+}
+
 #endif

From d2a03b90ec3aeff76fc357d2a49907ca9ad85a8e Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 22:50:54 +0100
Subject: [PATCH 134/203] Add another utility

---
 Source/Shaders/GUICommon.hlsl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Source/Shaders/GUICommon.hlsl b/Source/Shaders/GUICommon.hlsl
index 67f9daac4..07420389c 100644
--- a/Source/Shaders/GUICommon.hlsl
+++ b/Source/Shaders/GUICommon.hlsl
@@ -65,6 +65,11 @@ float GetFontMSDFMedian(Texture2D font, float2 uv)
     return max(min(msd.r, msd.g), min(max(msd.r, msd.g), msd.b));
 }
 
+float GetFontMSDFMedian(float4 msd)
+{
+    return max(min(msd.r, msd.g), min(max(msd.r, msd.g), msd.b));
+}
+
 float GetFontMSDFPixelRange(Texture2D font, float2 uv)
 {
     uint width, height;

From afe917a7f320280831c35b40769b4dcc4fc7c102 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 22:51:29 +0100
Subject: [PATCH 135/203] Improve e7016564b16e68dc5c103d6da5930f405735588d to
 reduce recompilation on commit changes

---
 Source/Engine/Audio/Audio.cpp                        |  1 -
 Source/Engine/Engine/Engine.cpp                      |  2 +-
 Source/Engine/Level/Actor.cpp                        |  1 +
 Source/Engine/Level/Level.cpp                        |  1 +
 Source/Engine/Renderer/AtmospherePreCompute.h        |  2 --
 Source/Engine/Serialization/ISerializeModifier.h     |  8 ++++----
 Source/Engine/Serialization/Serialization.cpp        |  7 +++++++
 Source/Engine/Serialization/Stream.cpp               |  1 +
 Source/Engine/ShadowsOfMordor/Builder.cpp            |  1 -
 .../Flax.Build/Bindings/BindingsGenerator.Cpp.cs     | 12 ++++++++++--
 10 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/Source/Engine/Audio/Audio.cpp b/Source/Engine/Audio/Audio.cpp
index 5574919c4..12cde01e8 100644
--- a/Source/Engine/Audio/Audio.cpp
+++ b/Source/Engine/Audio/Audio.cpp
@@ -3,7 +3,6 @@
 #include "Audio.h"
 #include "AudioBackend.h"
 #include "AudioSettings.h"
-#include "FlaxEngine.Gen.h"
 #include "Engine/Scripting/ScriptingType.h"
 #include "Engine/Scripting/BinaryModule.h"
 #include "Engine/Level/Level.h"
diff --git a/Source/Engine/Engine/Engine.cpp b/Source/Engine/Engine/Engine.cpp
index 15b3a1932..b53b69741 100644
--- a/Source/Engine/Engine/Engine.cpp
+++ b/Source/Engine/Engine/Engine.cpp
@@ -596,7 +596,7 @@ void EngineImpl::InitLog()
     LOG(Info, "Compiled for Dev Environment");
 #endif
 #if defined(FLAXENGINE_BRANCH) && defined(FLAXENGINE_COMMIT)
-    LOG(Info, "Version " FLAXENGINE_VERSION_TEXT ", " FLAXENGINE_BRANCH ", " FLAXENGINE_COMMIT);
+    LOG(Info, "Version " FLAXENGINE_VERSION_TEXT ", {}, {}", StringAsUTF16<>(FLAXENGINE_BRANCH).Get(), StringAsUTF16<>(FLAXENGINE_COMMIT).Get());
 #else
     LOG(Info, "Version " FLAXENGINE_VERSION_TEXT);
 #endif
diff --git a/Source/Engine/Level/Actor.cpp b/Source/Engine/Level/Actor.cpp
index abf62aef0..8123142aa 100644
--- a/Source/Engine/Level/Actor.cpp
+++ b/Source/Engine/Level/Actor.cpp
@@ -5,6 +5,7 @@
 #include "Level.h"
 #include "SceneQuery.h"
 #include "SceneObjectsFactory.h"
+#include "FlaxEngine.Gen.h"
 #include "Scene/Scene.h"
 #include "Prefabs/Prefab.h"
 #include "Prefabs/PrefabManager.h"
diff --git a/Source/Engine/Level/Level.cpp b/Source/Engine/Level/Level.cpp
index a46ee52f6..adea4575b 100644
--- a/Source/Engine/Level/Level.cpp
+++ b/Source/Engine/Level/Level.cpp
@@ -5,6 +5,7 @@
 #include "LargeWorlds.h"
 #include "SceneQuery.h"
 #include "SceneObjectsFactory.h"
+#include "FlaxEngine.Gen.h"
 #include "Scene/Scene.h"
 #include "Engine/Content/Content.h"
 #include "Engine/Content/Deprecated.h"
diff --git a/Source/Engine/Renderer/AtmospherePreCompute.h b/Source/Engine/Renderer/AtmospherePreCompute.h
index e1fd3fa93..bf72f276a 100644
--- a/Source/Engine/Renderer/AtmospherePreCompute.h
+++ b/Source/Engine/Renderer/AtmospherePreCompute.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include "FlaxEngine.Gen.h"
-
 class GPUTexture;
 
 /// <summary>
diff --git a/Source/Engine/Serialization/ISerializeModifier.h b/Source/Engine/Serialization/ISerializeModifier.h
index 8815ac2ea..0c49e24f1 100644
--- a/Source/Engine/Serialization/ISerializeModifier.h
+++ b/Source/Engine/Serialization/ISerializeModifier.h
@@ -4,7 +4,6 @@
 
 #include "Engine/Core/Collections/Dictionary.h"
 #include "Engine/Core/Types/Guid.h"
-#include "FlaxEngine.Gen.h"
 
 /// <summary>
 /// Object serialization modification base class. Allows to extend the serialization process by custom effects like object ids mapping.
@@ -12,17 +11,18 @@
 class FLAXENGINE_API ISerializeModifier
 {
 public:
-
     /// <summary>
     /// Number of engine build when data was serialized. Useful to upgrade data from the older storage format.
     /// </summary>
-    uint32 EngineBuild = FLAXENGINE_VERSION_BUILD;
+    uint32 EngineBuild;
 
     // Utility for scene deserialization to track currently mapped in Prefab Instance object IDs into IdsMapping.
-    int32 CurrentInstance = -1;
+    int32 CurrentInstance;
 
     /// <summary>
     /// The object IDs mapping. Key is a serialized object id, value is mapped value to use.
     /// </summary>
     Dictionary<Guid, Guid> IdsMapping;
+
+    ISerializeModifier();
 };
diff --git a/Source/Engine/Serialization/Serialization.cpp b/Source/Engine/Serialization/Serialization.cpp
index 1eb6b0181..ec02fd65f 100644
--- a/Source/Engine/Serialization/Serialization.cpp
+++ b/Source/Engine/Serialization/Serialization.cpp
@@ -25,6 +25,13 @@
 #include "Engine/Content/Asset.h"
 #include "Engine/Level/SceneObject.h"
 #include "Engine/Utilities/Encryption.h"
+#include "FlaxEngine.Gen.h"
+
+ISerializeModifier::ISerializeModifier()
+{
+    EngineBuild = FLAXENGINE_VERSION_BUILD;
+    CurrentInstance = -1;
+}
 
 void ISerializable::DeserializeIfExists(DeserializeStream& stream, const char* memberName, ISerializeModifier* modifier)
 {
diff --git a/Source/Engine/Serialization/Stream.cpp b/Source/Engine/Serialization/Stream.cpp
index 4c9b94042..bbf57ea30 100644
--- a/Source/Engine/Serialization/Stream.cpp
+++ b/Source/Engine/Serialization/Stream.cpp
@@ -5,6 +5,7 @@
 #include "JsonWriters.h"
 #include "JsonSerializer.h"
 #include "MemoryReadStream.h"
+#include "FlaxEngine.Gen.h"
 #include "Engine/Core/Types/CommonValue.h"
 #include "Engine/Core/Types/Variant.h"
 #include "Engine/Core/Collections/Dictionary.h"
diff --git a/Source/Engine/ShadowsOfMordor/Builder.cpp b/Source/Engine/ShadowsOfMordor/Builder.cpp
index 6f85fb950..048661617 100644
--- a/Source/Engine/ShadowsOfMordor/Builder.cpp
+++ b/Source/Engine/ShadowsOfMordor/Builder.cpp
@@ -148,7 +148,6 @@ void ShadowsOfMordor::Builder::Dispose()
 #include "Engine/Serialization/FileWriteStream.h"
 #include "Engine/Engine/CommandLine.h"
 #include "Engine/Scripting/Scripting.h"
-#include "FlaxEngine.Gen.h"
 
 namespace ShadowsOfMordor
 {
diff --git a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
index ce557be20..4dbbe576c 100644
--- a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
+++ b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
@@ -3290,12 +3290,16 @@ namespace Flax.Build.Bindings
             contents.AppendLine($"#define {binaryModuleNameUpper}_COMPANY \"{project.Company}\"");
             contents.AppendLine($"#define {binaryModuleNameUpper}_COPYRIGHT \"{project.Copyright}\"");
             if (project.VersionControlBranch.Length != 0)
-                contents.AppendLine($"#define {binaryModuleNameUpper}_BRANCH \"{project.VersionControlBranch}\"");
+                contents.AppendLine($"#define {binaryModuleNameUpper}_BRANCH {binaryModuleName}Branch");
             if (project.VersionControlCommit.Length != 0)
-                contents.AppendLine($"#define {binaryModuleNameUpper}_COMMIT \"{project.VersionControlCommit}\"");
+                contents.AppendLine($"#define {binaryModuleNameUpper}_COMMIT {binaryModuleName}Commit");
             contents.AppendLine();
             contents.AppendLine("class BinaryModule;");
             contents.AppendLine($"extern \"C\" {binaryModuleNameUpper}_API BinaryModule* GetBinaryModule{binaryModuleName}();");
+            if (project.VersionControlBranch.Length != 0)
+                contents.AppendLine($"extern \"C\" {binaryModuleNameUpper}_API const char* {binaryModuleName}Branch;");
+            if (project.VersionControlCommit.Length != 0)
+                contents.AppendLine($"extern \"C\" {binaryModuleNameUpper}_API const char* {binaryModuleName}Commit;");
             GenerateCppBinaryModuleHeader?.Invoke(buildData, binaryModule, contents);
             Utilities.WriteFileIfChanged(binaryModuleHeaderPath, contents.ToString());
 
@@ -3321,6 +3325,10 @@ namespace Flax.Build.Bindings
             }
             contents.AppendLine("    return &module;");
             contents.AppendLine("}");
+            if (project.VersionControlBranch.Length != 0)
+                contents.AppendLine($"extern \"C\" const char* {binaryModuleName}Branch = \"{project.VersionControlBranch}\";");
+            if (project.VersionControlCommit.Length != 0)
+                contents.AppendLine($"extern \"C\" const char* {binaryModuleName}Commit = \"{project.VersionControlCommit}\";");
             GenerateCppBinaryModuleSource?.Invoke(buildData, binaryModule, contents);
             Utilities.WriteFileIfChanged(binaryModuleSourcePath, contents.ToString());
             PutStringBuilder(contents);

From fa91e3e3abde29dc3a66711bf9d20bf53bfc02b2 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 23:32:37 +0100
Subject: [PATCH 136/203] Update asset

---
 Content/Shaders/GUI.flax | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content/Shaders/GUI.flax b/Content/Shaders/GUI.flax
index 3e0ccc18f..79948533e 100644
--- a/Content/Shaders/GUI.flax
+++ b/Content/Shaders/GUI.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b816ba638bc37b8a8288e4c397ff5b708153057650fa6b626a109ba42d189694
-size 4721
+oid sha256:324f564e3b0324dbdf5712f3f1e11f54f276d11bc203aecabeef93953b2ab904
+size 4719

From 3d201ec73fd53bfdbdc86840c8493257c82a11d2 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Mar 2026 23:56:50 +0100
Subject: [PATCH 137/203] Add msdfgen build for Linux

---
 .../Platforms/Linux/Binaries/ThirdParty/x64/libmsdfgen-core.a  | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 Source/Platforms/Linux/Binaries/ThirdParty/x64/libmsdfgen-core.a

diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libmsdfgen-core.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libmsdfgen-core.a
new file mode 100644
index 000000000..b3b6c9433
--- /dev/null
+++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libmsdfgen-core.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8ff134eba56b2889351f7bd1cd82744c1c4b4d9c7bb96d5daa99e8e047a7c30
+size 516942

From b41d25cbce6e84e52bd08de6398772f32fb5bc2a Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 13 Mar 2026 00:12:07 +0100
Subject: [PATCH 138/203] Add msdfgen build for iOS and Mac

---
 .../Platforms/Mac/Binaries/ThirdParty/ARM64/libmsdfgen-core.a  | 3 +++
 Source/Platforms/Mac/Binaries/ThirdParty/x64/libmsdfgen-core.a | 3 +++
 .../Platforms/iOS/Binaries/ThirdParty/ARM64/libmsdfgen-core.a  | 3 +++
 Source/ThirdParty/msdfgen/msdfgen.Build.cs                     | 1 +
 Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs           | 1 +
 5 files changed, 11 insertions(+)
 create mode 100644 Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libmsdfgen-core.a
 create mode 100644 Source/Platforms/Mac/Binaries/ThirdParty/x64/libmsdfgen-core.a
 create mode 100644 Source/Platforms/iOS/Binaries/ThirdParty/ARM64/libmsdfgen-core.a

diff --git a/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libmsdfgen-core.a b/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libmsdfgen-core.a
new file mode 100644
index 000000000..60b14c840
--- /dev/null
+++ b/Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libmsdfgen-core.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb5021ea29786ec0b7134c33404c565c829ebdcde71b7891ceb45fdd5c5082b6
+size 347384
diff --git a/Source/Platforms/Mac/Binaries/ThirdParty/x64/libmsdfgen-core.a b/Source/Platforms/Mac/Binaries/ThirdParty/x64/libmsdfgen-core.a
new file mode 100644
index 000000000..248cfd4fb
--- /dev/null
+++ b/Source/Platforms/Mac/Binaries/ThirdParty/x64/libmsdfgen-core.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6bc9e9aa3dc131affa4ad64b46cffb0d229cfaac6253743f3cc755cfce519015
+size 422104
diff --git a/Source/Platforms/iOS/Binaries/ThirdParty/ARM64/libmsdfgen-core.a b/Source/Platforms/iOS/Binaries/ThirdParty/ARM64/libmsdfgen-core.a
new file mode 100644
index 000000000..7fd2e753b
--- /dev/null
+++ b/Source/Platforms/iOS/Binaries/ThirdParty/ARM64/libmsdfgen-core.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:673aff1bb5180811371876fa19f8f4dc6a97e76690d27544f507136c3eb4ba0d
+size 349464
diff --git a/Source/ThirdParty/msdfgen/msdfgen.Build.cs b/Source/ThirdParty/msdfgen/msdfgen.Build.cs
index f798152b1..c5f008ac9 100644
--- a/Source/ThirdParty/msdfgen/msdfgen.Build.cs
+++ b/Source/ThirdParty/msdfgen/msdfgen.Build.cs
@@ -34,6 +34,7 @@ public class msdfgen : DepsModule
             break;
         case TargetPlatform.Linux:
         case TargetPlatform.Mac:
+        case TargetPlatform.iOS:
         case TargetPlatform.Android:
             options.OutputFiles.Add(Path.Combine(depsRoot, "libmsdfgen-core.a"));
             break;
diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs b/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
index 5f1e4280c..45322f815 100644
--- a/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/msdfgen.cs
@@ -34,6 +34,7 @@ namespace Flax.Deps.Dependencies
                     return new[]
                     {
                         TargetPlatform.Mac,
+                        TargetPlatform.iOS,
                     };
                 default: return new TargetPlatform[0];
                 }

From f87606808655e8e5b2a1da7777fc407436035865 Mon Sep 17 00:00:00 2001
From: Phantom <salvini.michael01@gmail.com>
Date: Fri, 13 Mar 2026 20:09:57 +0100
Subject: [PATCH 139/203] Fix Text Color Highlighted

---
 Source/Engine/UI/GUI/Common/Dropdown.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Engine/UI/GUI/Common/Dropdown.cs b/Source/Engine/UI/GUI/Common/Dropdown.cs
index 6488bb14a..4e6a235a8 100644
--- a/Source/Engine/UI/GUI/Common/Dropdown.cs
+++ b/Source/Engine/UI/GUI/Common/Dropdown.cs
@@ -595,7 +595,7 @@ namespace FlaxEngine.GUI
                 Size = new Float2(size.X - margin, size.Y),
                 Font = Font,
                 TextColor = TextColor * 0.9f,
-                TextColorHighlighted = TextColorHighlighted.Brightness < 0.05f ? Color.Lerp(TextColorHighlighted, Color.White, 0.3f) : TextColorHighlighted,
+                TextColorHighlighted = (BackgroundColorSelected.Brightness < 0.05f && TextColorHighlighted.Brightness < 0.05f) ? Color.Lerp(TextColorHighlighted, Color.White, 0.3f) : TextColorHighlighted,
                 HorizontalAlignment = HorizontalAlignment,
                 VerticalAlignment = VerticalAlignment,
                 Text = _items[i],

From 80767d65ae55e9fdd713e4a995a10105a451970d Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 13 Mar 2026 23:21:08 +0100
Subject: [PATCH 140/203] Fix camera preview placement in editor preview when
 resizing window

---
 Source/Editor/Windows/EditGameWindow.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Source/Editor/Windows/EditGameWindow.cs b/Source/Editor/Windows/EditGameWindow.cs
index dbeab28b1..5f91aebe6 100644
--- a/Source/Editor/Windows/EditGameWindow.cs
+++ b/Source/Editor/Windows/EditGameWindow.cs
@@ -257,7 +257,7 @@ namespace FlaxEditor.Windows
         private void UpdateCameraPreview()
         {
             // Disable rendering preview during GI baking
-            if (Editor.StateMachine.CurrentState.IsPerformanceHeavy)
+            if (Editor == null || Editor.StateMachine.CurrentState.IsPerformanceHeavy)
             {
                 HideAllCameraPreviews();
                 return;
@@ -406,6 +406,14 @@ namespace FlaxEditor.Windows
             }
         }
 
+        /// <inheritdoc />
+        protected override void OnSizeChanged()
+        {
+            base.OnSizeChanged();
+
+            UpdateCameraPreview();
+        }
+
         /// <inheritdoc />
         public override void OnDestroy()
         {

From f42a9a760adee861860a73a443b8013ba660ff41 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 13 Mar 2026 23:21:30 +0100
Subject: [PATCH 141/203] Adjust new Z Axis color in Transform

---
 Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs
index c1179e393..131a9b10a 100644
--- a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs
@@ -24,7 +24,7 @@ namespace FlaxEditor.CustomEditors.Editors
         /// <summary>
         /// The Z axis color.
         /// </summary>
-        public static Color AxisColorZ = new Color(0.0f, 0.0235294f, 0.9f, 1.0f);
+        public static Color AxisColorZ = new Color(0.0f, 0.42352f, 0.8f, 1.0f);
 
         /// <summary>
         /// Custom editor for actor position property.

From 14d6273a2f465176f48dc0e04e2eb87cbb7e09ce Mon Sep 17 00:00:00 2001
From: Phantom <salvini.michael01@gmail.com>
Date: Sat, 14 Mar 2026 15:29:31 +0100
Subject: [PATCH 142/203] fix #2 on Dropdown

---
 Source/Engine/UI/GUI/Common/Dropdown.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Engine/UI/GUI/Common/Dropdown.cs b/Source/Engine/UI/GUI/Common/Dropdown.cs
index 4e6a235a8..b91d70dc9 100644
--- a/Source/Engine/UI/GUI/Common/Dropdown.cs
+++ b/Source/Engine/UI/GUI/Common/Dropdown.cs
@@ -595,7 +595,7 @@ namespace FlaxEngine.GUI
                 Size = new Float2(size.X - margin, size.Y),
                 Font = Font,
                 TextColor = TextColor * 0.9f,
-                TextColorHighlighted = (BackgroundColorSelected.Brightness < 0.05f && TextColorHighlighted.Brightness < 0.05f) ? Color.Lerp(TextColorHighlighted, Color.White, 0.3f) : TextColorHighlighted,
+                TextColorHighlighted = BackgroundColorSelected.Brightness < 0.05f ? Color.Lerp(TextColorHighlighted, Color.White, 0.3f) : TextColorHighlighted,
                 HorizontalAlignment = HorizontalAlignment,
                 VerticalAlignment = VerticalAlignment,
                 Text = _items[i],

From 13084652800b790e775b7be07c64855bb2522859 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Tue, 17 Mar 2026 22:02:36 +0100
Subject: [PATCH 143/203] fix sphere with negative radius getting culled to
 early in physics collider debug draw

---
 Source/Engine/Physics/Colliders/SphereCollider.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Engine/Physics/Colliders/SphereCollider.cpp b/Source/Engine/Physics/Colliders/SphereCollider.cpp
index 0576ae6cf..eda3884e4 100644
--- a/Source/Engine/Physics/Colliders/SphereCollider.cpp
+++ b/Source/Engine/Physics/Colliders/SphereCollider.cpp
@@ -26,7 +26,7 @@ void SphereCollider::SetRadius(const float value)
 
 void SphereCollider::DrawPhysicsDebug(RenderView& view)
 {
-    const BoundingSphere sphere(_sphere.Center - view.Origin, _sphere.Radius);
+    const BoundingSphere sphere(_sphere.Center - view.Origin, Math::Abs(_sphere.Radius));
     if (!view.CullingFrustum.Intersects(sphere))
         return;
     if (view.Mode == ViewMode::PhysicsColliders && !GetIsTrigger())

From cb9e09c21ba04e3a72d7393f636287dce2a2b9d5 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 18 Mar 2026 16:55:35 +0100
Subject: [PATCH 144/203] fix Show whole timeline button

---
 Source/Editor/GUI/Timeline/Timeline.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Source/Editor/GUI/Timeline/Timeline.cs b/Source/Editor/GUI/Timeline/Timeline.cs
index 15e7eb953..1fb19e9ec 100644
--- a/Source/Editor/GUI/Timeline/Timeline.cs
+++ b/Source/Editor/GUI/Timeline/Timeline.cs
@@ -2148,10 +2148,9 @@ namespace FlaxEditor.GUI.Timeline
         /// </summary>
         public void ShowWholeTimeline()
         {
-            var viewWidth = Width;
-            var timelineWidth = Duration * UnitsPerSecond * Zoom + 8 * StartOffset;
-            _backgroundArea.ViewOffset = Float2.Zero;
-            Zoom = viewWidth / timelineWidth;
+            const float padding = 40f;
+            Zoom = (_backgroundArea.Width - padding * 2f) / (Duration * UnitsPerSecond);
+            _backgroundArea.ViewOffset = new Float2(-_leftEdge.X + padding, _backgroundArea.ViewOffset.Y);
         }
 
         /// <summary>

From e5d526c9af30bfa0a0c7508de255600d48b16c33 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 18 Mar 2026 16:55:45 +0100
Subject: [PATCH 145/203] show whole timeline when animation loads

---
 Source/Editor/Windows/Assets/AnimationWindow.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Editor/Windows/Assets/AnimationWindow.cs b/Source/Editor/Windows/Assets/AnimationWindow.cs
index 268e18503..8dbcc5921 100644
--- a/Source/Editor/Windows/Assets/AnimationWindow.cs
+++ b/Source/Editor/Windows/Assets/AnimationWindow.cs
@@ -455,6 +455,7 @@ namespace FlaxEditor.Windows.Assets
                 _timeline.Enabled = true;
                 _timeline.SetNoTracksText(null);
                 ClearEditedFlag();
+                _timeline.ShowWholeTimeline();
             }
         }
 

From b54794255a66d6b69efeab82a50b57497656c935 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 24 Mar 2026 17:14:30 +0100
Subject: [PATCH 146/203] Fix `.pch` files rebuilds after MSVC toolchain
 updates

---
 .../Platforms/Windows/WindowsToolchainBase.cs | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs b/Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs
index 583b93b55..8e9f522a8 100644
--- a/Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs
+++ b/Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs
@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Xml;
 using Flax.Build.Graph;
@@ -26,6 +25,11 @@ namespace Flax.Build.Platforms
         /// </summary>
         protected readonly string _vcToolPath;
 
+        /// <summary>
+        /// The VC tools version.
+        /// </summary>
+        protected readonly string _vcToolVersion;
+
         /// <summary>
         /// The compiler path.
         /// </summary>
@@ -147,6 +151,21 @@ namespace Flax.Build.Platforms
             _libToolPath = Path.Combine(_vcToolPath, "lib.exe");
             _xdcmakePath = Path.Combine(_vcToolPath, "xdcmake.exe");
 
+            // Find 'MSVC\XX.YY.ZZ\bin' to get version
+            _vcToolVersion = string.Empty;
+            var pathParts = _vcToolPath.Split('\\');
+            if (pathParts.Length >= 3)
+            {
+                for (int i = 3; i < pathParts.Length; i++)
+                {
+                    if (pathParts[i] == "bin" && pathParts[i - 2] == "MSVC")
+                    {
+                        _vcToolVersion = pathParts[i - 1];
+                        break;
+                    }
+                }
+            }
+
             // Add Visual C++ toolset include and library paths
             var vcToolChainDir = toolsets[Toolset];
             SystemIncludePaths.Add(Path.Combine(vcToolChainDir, "include"));
@@ -370,7 +389,7 @@ namespace Flax.Build.Platforms
         public override void LogInfo()
         {
             var sdkPath = WindowsPlatformBase.GetSDKs()[SDK];
-            Log.Info(string.Format("Using Windows Toolset {0} ({1})", Toolset, sdkPath));
+            Log.Info(string.Format("Using Windows Toolset {0}, {2} ({1})", Toolset, sdkPath, _vcToolVersion));
             Log.Info(string.Format("Using Windows SDK {0} ({1})", WindowsPlatformBase.GetSDKVersion(SDK), _vcToolPath));
         }
 
@@ -663,8 +682,9 @@ namespace Flax.Build.Platforms
                 var pchSourceFile = Path.Combine(options.IntermediateFolder, Path.ChangeExtension(pchFilName, "cpp"));
                 var contents = Bindings.BindingsGenerator.GetStringBuilder();
                 contents.AppendLine("// This code was auto-generated. Do not modify it.");
-                // TODO: write compiler version to properly rebuild pch on Visual Studio updates
                 contents.Append("// Compiler: ").AppendLine(_compilerPath);
+                contents.Append("// Toolchain: ").AppendLine(_vcToolVersion);
+                contents.Append("// CppVersion: ").AppendLine(compileEnvironment.CppVersion.ToString());
                 contents.Append("#include \"").Append(pchSource).AppendLine("\"");
                 Utilities.WriteFileIfChanged(pchSourceFile, contents.ToString());
                 Bindings.BindingsGenerator.PutStringBuilder(contents);

From 99d3da467e6dfc57e5ebc96606f839c5340abbe9 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 24 Mar 2026 17:45:06 +0100
Subject: [PATCH 147/203] Fix deadlock when hot-reloading scripts in Editor
 while `Animation` asset gets auto-saved

#3942
---
 Source/Engine/Content/Assets/Animation.cpp | 23 +++++++++++++++++-----
 Source/Engine/Content/Assets/Animation.h   |  4 ++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Source/Engine/Content/Assets/Animation.cpp b/Source/Engine/Content/Assets/Animation.cpp
index 917db28ac..86fa41f89 100644
--- a/Source/Engine/Content/Assets/Animation.cpp
+++ b/Source/Engine/Content/Assets/Animation.cpp
@@ -691,11 +691,7 @@ Asset::LoadResult Animation::load()
                     continue;
                 }
 #if USE_EDITOR
-                if (!_registeredForScriptingReload)
-                {
-                    _registeredForScriptingReload = true;
-                    Level::ScriptsReloadStart.Bind<Animation, &Animation::OnScriptsReloadStart>(this);
-                }
+                _registerForScriptingReload = true;
 #endif
             }
         }
@@ -733,6 +729,7 @@ void Animation::unload(bool isReloading)
 {
     ScopeWriteLock systemScope(Animations::SystemLocker);
 #if USE_EDITOR
+    _registerForScriptingReload = false;
     if (_registeredForScriptingReload)
     {
         _registeredForScriptingReload = false;
@@ -752,6 +749,22 @@ void Animation::unload(bool isReloading)
     NestedAnims.Clear();
 }
 
+#if USE_EDITOR
+
+void Animation::onLoaded_MainThread()
+{
+    if (_registerForScriptingReload && !_registeredForScriptingReload)
+    {
+        _registeredForScriptingReload = true;
+        Level::ScriptsReloadStart.Bind<Animation, &Animation::OnScriptsReloadStart>(this);
+    }
+    _registerForScriptingReload = false;
+
+    BinaryAsset::onLoaded_MainThread();
+}
+
+#endif
+
 AssetChunksFlag Animation::getChunksToPreload() const
 {
     return GET_CHUNK_FLAG(0);
diff --git a/Source/Engine/Content/Assets/Animation.h b/Source/Engine/Content/Assets/Animation.h
index 4f4a773b4..c342cc64c 100644
--- a/Source/Engine/Content/Assets/Animation.h
+++ b/Source/Engine/Content/Assets/Animation.h
@@ -78,6 +78,7 @@ API_CLASS(NoSpawn) class FLAXENGINE_API Animation : public BinaryAsset
 
 private:
 #if USE_EDITOR
+    bool _registerForScriptingReload = false;
     bool _registeredForScriptingReload = false;
     void OnScriptsReloadStart();
 #endif
@@ -163,5 +164,8 @@ protected:
     // [BinaryAsset]
     LoadResult load() override;
     void unload(bool isReloading) override;
+#if USE_EDITOR
+    void onLoaded_MainThread() override;
+#endif
     AssetChunksFlag getChunksToPreload() const override;
 };

From fa17d83501d653b37f3cda8ae1d96e4b2d6d6069 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 24 Mar 2026 18:25:40 +0100
Subject: [PATCH 148/203] Fix showing internal surface parameters (eg. `Base
 Model` in `Anim Graph`)

#3936
---
 .../Editor/Surface/Archetypes/Parameters.cs   | 204 +++++++++---------
 Source/Editor/Surface/VisjectSurface.cs       |   5 +
 .../Editor/Surface/VisjectSurfaceContext.cs   |  10 +-
 Source/Editor/Surface/VisualScriptSurface.cs  |   3 +
 4 files changed, 116 insertions(+), 106 deletions(-)

diff --git a/Source/Editor/Surface/Archetypes/Parameters.cs b/Source/Editor/Surface/Archetypes/Parameters.cs
index 3383e7662..905f793c9 100644
--- a/Source/Editor/Surface/Archetypes/Parameters.cs
+++ b/Source/Editor/Surface/Archetypes/Parameters.cs
@@ -22,15 +22,97 @@ namespace FlaxEditor.Surface.Archetypes
     [HideInEditor]
     public static class Parameters
     {
+        /// <summary>
+        /// Surface node type for parameters group Get/Set nodes.
+        /// </summary>
+        /// <seealso cref="FlaxEditor.Surface.SurfaceNode" />
+        public abstract class SurfaceNodeParamsBase : SurfaceNode
+        {
+            /// <summary>
+            /// The combobox for picking parameter.
+            /// </summary>
+            protected ComboBoxElement _combobox;
+
+            /// <summary>
+            /// Fag used to block layout updated when updating node.
+            /// </summary>
+            protected bool _isUpdateLocked;
+
+            /// <inheritdoc />
+            protected SurfaceNodeParamsBase(uint id, VisjectSurfaceContext context, NodeArchetype nodeArch, GroupArchetype groupArch)
+            : base(id, context, nodeArch, groupArch)
+            {
+            }
+
+            /// <summary>
+            /// Gets the selected parameter.
+            /// </summary>
+            /// <returns>Surface parameter object or null if nothing selected or cannot find it.</returns>
+            protected SurfaceParameter GetSelected()
+            {
+                if (Surface != null)
+                    return Surface.GetParameter(_combobox.SelectedItem);
+                return Context.GetParameter((Guid)Values[0]);
+            }
+
+            /// <summary>
+            /// Updates the combo box.
+            /// </summary>
+            protected void UpdateCombo()
+            {
+                if (_isUpdateLocked)
+                    return;
+                _isUpdateLocked = true;
+                if (_combobox == null)
+                {
+                    _combobox = GetChild<ComboBoxElement>();
+                    _combobox.SelectedIndexChanged += OnSelectedChanged;
+                }
+                string toSelect = null;
+                Guid loadedSelected = (Guid)Values[0];
+                _combobox.ClearItems();
+                var parameters = Surface.Parameters;
+                for (int i = 0; i < parameters.Count; i++)
+                {
+                    var param = parameters[i];
+                    if (!param.IsPublic && !Surface.CanShowPrivateParameters)
+                        continue;
+                    _combobox.AddItem(param.Name);
+                    if (param.ID == loadedSelected)
+                        toSelect = param.Name;
+                }
+                _combobox.SelectedItem = toSelect;
+                _isUpdateLocked = false;
+            }
+
+            private void OnSelectedChanged(ComboBox cb)
+            {
+                if (_isUpdateLocked)
+                    return;
+                var selected = GetSelected();
+                var selectedID = selected?.ID ?? Guid.Empty;
+                if (selectedID != (Guid)Values[0])
+                    Set(selected, ref selectedID);
+            }
+
+            /// <summary>
+            /// Sets the selected parameter.
+            /// </summary>
+            /// <param name="selected">Parameter.</param>
+            /// <param name="selectedID">Parameter identifier.</param>
+            protected virtual void Set(SurfaceParameter selected, ref Guid selectedID)
+            {
+                SetValue(0, selectedID);
+            }
+        }
+
         /// <summary>
         /// Surface node type for parameters group Get node.
         /// </summary>
         /// <seealso cref="FlaxEditor.Surface.SurfaceNode" />
-        public class SurfaceNodeParamsGet : SurfaceNode, IParametersDependantNode
+        public class SurfaceNodeParamsGet : SurfaceNodeParamsBase, IParametersDependantNode
         {
-            private ComboBoxElement _combobox;
             private readonly List<ISurfaceNodeElement> _dynamicChildren = new List<ISurfaceNodeElement>();
-            private bool _isUpdateLocked;
             private ScriptType _layoutType;
             private NodeElementArchetype[] _layoutElements;
 
@@ -306,49 +388,6 @@ namespace FlaxEditor.Surface.Archetypes
                 UpdateTitle();
             }
 
-            private void UpdateCombo()
-            {
-                if (_isUpdateLocked)
-                    return;
-                _isUpdateLocked = true;
-                if (_combobox == null)
-                {
-                    _combobox = (ComboBoxElement)_children[0];
-                    _combobox.SelectedIndexChanged += OnSelectedChanged;
-                }
-                int toSelect = -1;
-                Guid loadedSelected = (Guid)Values[0];
-                _combobox.ClearItems();
-                for (int i = 0; i < Surface.Parameters.Count; i++)
-                {
-                    var param = Surface.Parameters[i];
-                    _combobox.AddItem(param.Name);
-                    if (param.ID == loadedSelected)
-                        toSelect = i;
-                }
-                _combobox.SelectedIndex = toSelect;
-                _isUpdateLocked = false;
-            }
-
-            private void OnSelectedChanged(ComboBox cb)
-            {
-                if (_isUpdateLocked)
-                    return;
-                var selected = GetSelected();
-                var selectedID = selected?.ID ?? Guid.Empty;
-                SetValue(0, selectedID);
-            }
-
-            private SurfaceParameter GetSelected()
-            {
-                if (Surface != null)
-                {
-                    var selectedIndex = _combobox.SelectedIndex;
-                    return selectedIndex >= 0 && selectedIndex < Surface.Parameters.Count ? Surface.Parameters[selectedIndex] : null;
-                }
-                return Context.GetParameter((Guid)Values[0]);
-            }
-
             private void ClearDynamicElements()
             {
                 for (int i = 0; i < _dynamicChildren.Count; i++)
@@ -463,15 +502,19 @@ namespace FlaxEditor.Surface.Archetypes
                 else if (!_isUpdateLocked)
                 {
                     _isUpdateLocked = true;
-                    int toSelect = -1;
+                    string toSelect = null;
                     Guid loadedSelected = (Guid)Values[0];
-                    for (int i = 0; i < Surface.Parameters.Count; i++)
+                    var parameters = Surface.Parameters;
+                    for (int i = 0; i < parameters.Count; i++)
                     {
-                        var param = Surface.Parameters[i];
+                        var param = parameters[i];
                         if (param.ID == loadedSelected)
-                            toSelect = i;
+                        {
+                            toSelect = param.Name;
+                            break;
+                        }
                     }
-                    _combobox.SelectedIndex = toSelect;
+                    _combobox.SelectedItem = toSelect;
                     _isUpdateLocked = false;
                 }
                 UpdateLayout();
@@ -817,66 +860,23 @@ namespace FlaxEditor.Surface.Archetypes
         /// Surface node type for parameters group Set node.
         /// </summary>
         /// <seealso cref="FlaxEditor.Surface.SurfaceNode" />
-        public class SurfaceNodeParamsSet : SurfaceNode, IParametersDependantNode
+        public class SurfaceNodeParamsSet : SurfaceNodeParamsBase, IParametersDependantNode
         {
-            private ComboBoxElement _combobox;
-            private bool _isUpdateLocked;
-
             /// <inheritdoc />
             public SurfaceNodeParamsSet(uint id, VisjectSurfaceContext context, NodeArchetype nodeArch, GroupArchetype groupArch)
             : base(id, context, nodeArch, groupArch)
             {
             }
 
-            private void UpdateCombo()
+            /// <inheritdoc />
+            protected override void Set(SurfaceParameter selected, ref Guid selectedID)
             {
-                if (_isUpdateLocked)
-                    return;
-                _isUpdateLocked = true;
-                if (_combobox == null)
+                SetValues(new[]
                 {
-                    _combobox = GetChild<ComboBoxElement>();
-                    _combobox.SelectedIndexChanged += OnSelectedChanged;
-                }
-                int toSelect = -1;
-                Guid loadedSelected = (Guid)Values[0];
-                _combobox.ClearItems();
-                for (int i = 0; i < Surface.Parameters.Count; i++)
-                {
-                    var param = Surface.Parameters[i];
-                    _combobox.AddItem(param.Name);
-                    if (param.ID == loadedSelected)
-                        toSelect = i;
-                }
-                _combobox.SelectedIndex = toSelect;
-                _isUpdateLocked = false;
-            }
-
-            private void OnSelectedChanged(ComboBox cb)
-            {
-                if (_isUpdateLocked)
-                    return;
-                var selected = GetSelected();
-                var selectedID = selected?.ID ?? Guid.Empty;
-                if (selectedID != (Guid)Values[0])
-                {
-                    SetValues(new[]
-                    {
-                        selectedID,
-                        selected != null ? TypeUtils.GetDefaultValue(selected.Type) : null,
-                    });
-                    UpdateUI();
-                }
-            }
-
-            private SurfaceParameter GetSelected()
-            {
-                if (Surface != null)
-                {
-                    var selectedIndex = _combobox.SelectedIndex;
-                    return selectedIndex >= 0 && selectedIndex < Surface.Parameters.Count ? Surface.Parameters[selectedIndex] : null;
-                }
-                return Context.GetParameter((Guid)Values[0]);
+                    selectedID,
+                    selected != null ? TypeUtils.GetDefaultValue(selected.Type) : null,
+                });
+                UpdateUI();
             }
 
             /// <inheritdoc />
diff --git a/Source/Editor/Surface/VisjectSurface.cs b/Source/Editor/Surface/VisjectSurface.cs
index e3bb94bcc..c4a8d31d3 100644
--- a/Source/Editor/Surface/VisjectSurface.cs
+++ b/Source/Editor/Surface/VisjectSurface.cs
@@ -583,6 +583,11 @@ namespace FlaxEditor.Surface
         /// </summary>
         public virtual bool CanSetParameters => false;
 
+        /// <summary>
+        /// Gets a value indicating whether surface private parameters can be used, otherwise they will remain hidden.
+        /// </summary>
+        public virtual bool CanShowPrivateParameters => false;
+
         /// <summary>
         /// True of the context menu should make use of a description panel drawn at the bottom of the menu
         /// </summary>
diff --git a/Source/Editor/Surface/VisjectSurfaceContext.cs b/Source/Editor/Surface/VisjectSurfaceContext.cs
index 0d10aa230..560a7c1d6 100644
--- a/Source/Editor/Surface/VisjectSurfaceContext.cs
+++ b/Source/Editor/Surface/VisjectSurfaceContext.cs
@@ -254,9 +254,10 @@ namespace FlaxEditor.Surface
         public SurfaceParameter GetParameter(Guid id)
         {
             SurfaceParameter result = null;
-            for (int i = 0; i < Parameters.Count; i++)
+            var parameters = Parameters;
+            for (int i = 0; i < parameters.Count; i++)
             {
-                var parameter = Parameters[i];
+                var parameter = parameters[i];
                 if (parameter.ID == id)
                 {
                     result = parameter;
@@ -274,9 +275,10 @@ namespace FlaxEditor.Surface
         public SurfaceParameter GetParameter(string name)
         {
             SurfaceParameter result = null;
-            for (int i = 0; i < Parameters.Count; i++)
+            var parameters = Parameters;
+            for (int i = 0; i < parameters.Count; i++)
             {
-                var parameter = Parameters[i];
+                var parameter = parameters[i];
                 if (parameter.Name == name)
                 {
                     result = parameter;
diff --git a/Source/Editor/Surface/VisualScriptSurface.cs b/Source/Editor/Surface/VisualScriptSurface.cs
index 2f70ee340..57aa29d67 100644
--- a/Source/Editor/Surface/VisualScriptSurface.cs
+++ b/Source/Editor/Surface/VisualScriptSurface.cs
@@ -187,6 +187,9 @@ namespace FlaxEditor.Surface
         /// <inheritdoc />
         public override bool CanSetParameters => true;
 
+        /// <inheritdoc />
+        public override bool CanShowPrivateParameters => true;
+
         /// <inheritdoc />
         public override bool UseContextMenuDescriptionPanel => true;
 

From 7f1add4bddcc386d1b34ffe3c230f57e276c5814 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sat, 14 Feb 2026 00:07:34 +0100
Subject: [PATCH 149/203] Fix missing `Length` in `Vector4`

---
 Source/Engine/Core/Math/Vector4.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Source/Engine/Core/Math/Vector4.h b/Source/Engine/Core/Math/Vector4.h
index 5f5e436ad..167937c81 100644
--- a/Source/Engine/Core/Math/Vector4.h
+++ b/Source/Engine/Core/Math/Vector4.h
@@ -153,6 +153,12 @@ public:
         return Math::IsOne(X) && Math::IsOne(Y) && Math::IsOne(Z) && Math::IsOne(W);
     }
 
+    // Calculates the length of the vector.
+    T Length() const
+    {
+        return Math::Sqrt(X * X + Y * Y + Z * Z + W * W);
+    }
+
     /// <summary>
     /// Returns the average arithmetic of all the components.
     /// </summary>

From 1318dde3ca00159abe82d262db385e16501661a2 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 24 Mar 2026 18:58:32 +0100
Subject: [PATCH 150/203] Add new HSV wheel material, maintain Editor icons
 atlas for now

#3987
---
 Content/Editor/HSWheel.flax  | 3 +++
 Source/Editor/EditorIcons.cs | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 Content/Editor/HSWheel.flax

diff --git a/Content/Editor/HSWheel.flax b/Content/Editor/HSWheel.flax
new file mode 100644
index 000000000..7fb2f0600
--- /dev/null
+++ b/Content/Editor/HSWheel.flax
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:946a92d15b50e01a67d9e0a9d71493b222dce2b7cc464383b07450ef3afa6888
+size 15068
diff --git a/Source/Editor/EditorIcons.cs b/Source/Editor/EditorIcons.cs
index 7da1d6fb3..8688c502a 100644
--- a/Source/Editor/EditorIcons.cs
+++ b/Source/Editor/EditorIcons.cs
@@ -134,6 +134,7 @@ namespace FlaxEditor
         public SpriteHandle Document128;
         public SpriteHandle XBoxOne128;
         public SpriteHandle UWPStore128;
+        public SpriteHandle ColorWheel128;
         public SpriteHandle LinuxSettings128;
         public SpriteHandle NavigationSettings128;
         public SpriteHandle AudioSettings128;

From d2ef0671e37769c3635abd56fc318378bda71e64 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 24 Mar 2026 19:32:17 +0100
Subject: [PATCH 151/203] Fix incorrect terrain debug buffers disposing

---
 Source/Engine/Terrain/TerrainPatch.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/Terrain/TerrainPatch.cpp b/Source/Engine/Terrain/TerrainPatch.cpp
index 95e9ffd05..61bbf7e3c 100644
--- a/Source/Engine/Terrain/TerrainPatch.cpp
+++ b/Source/Engine/Terrain/TerrainPatch.cpp
@@ -2241,11 +2241,11 @@ void TerrainPatch::DestroyCollision()
     _physicsHeightField = nullptr;
 #if TERRAIN_USE_PHYSICS_DEBUG
     _debugLinesDirty = true;
-    SAFE_DELETE(_debugLines);
+    SAFE_DELETE_GPU_RESOURCE(_debugLines);
 #endif
 #if USE_EDITOR
     _collisionTriangles.Resize(0);
-    SAFE_DELETE(_collisionTrianglesBuffer);
+    SAFE_DELETE_GPU_RESOURCE(_collisionTrianglesBuffer);
     _collisionTrianglesBufferDirty = true;
 #endif
     _collisionVertices.Resize(0);

From f0f1c57ff19d3464e2dea5c2584558081cc79fc6 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 24 Mar 2026 19:43:37 +0100
Subject: [PATCH 152/203] Add scrolling scene tree hierarchy to the newly
 spawned actor after drag and drop

---
 Source/Editor/Viewport/ViewportDraggingHelper.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Source/Editor/Viewport/ViewportDraggingHelper.cs b/Source/Editor/Viewport/ViewportDraggingHelper.cs
index 21287fc94..3e6fce6ad 100644
--- a/Source/Editor/Viewport/ViewportDraggingHelper.cs
+++ b/Source/Editor/Viewport/ViewportDraggingHelper.cs
@@ -198,6 +198,11 @@ namespace FlaxEditor.Viewport
             actor.Position = PostProcessSpawnedActorLocation(actor, ref hitLocation);
             _owner.Spawn(actor);
             _viewport.Focus();
+
+            // Scroll to the new actor in the hierarchy
+            var actorNode = Editor.Instance.Scene.GetActorNode(actor);
+            if (actorNode?.TreeNode.ParentTree.Parent is Panel treePanel)
+                FlaxEngine.Scripting.InvokeOnUpdate(() => treePanel.ScrollViewTo(actorNode.TreeNode));
         }
 
         private void Spawn(ScriptItem item, SceneGraphNode hit, ref Float2 location, ref Vector3 hitLocation, ref Vector3 hitNormal)

From a63e05d444248164da7c88d947860602a9d57306 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 24 Mar 2026 20:10:20 +0100
Subject: [PATCH 153/203] Fix Cloth to snap to the parent actor on spawn in
 Editor

---
 Source/Editor/SceneGraph/Actors/ClothNode.cs  | 29 +++++++++++++++++++
 Source/Editor/SceneGraph/SceneGraphFactory.cs |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 Source/Editor/SceneGraph/Actors/ClothNode.cs

diff --git a/Source/Editor/SceneGraph/Actors/ClothNode.cs b/Source/Editor/SceneGraph/Actors/ClothNode.cs
new file mode 100644
index 000000000..b5caa8258
--- /dev/null
+++ b/Source/Editor/SceneGraph/Actors/ClothNode.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Wojciech Figat. All rights reserved.
+
+using FlaxEngine;
+
+namespace FlaxEditor.SceneGraph.Actors
+{
+    /// <summary>
+    /// Scene tree node for <see cref="Cloth"/> actor type.
+    /// </summary>
+    [HideInEditor]
+    public sealed class ClothNode : ActorNode
+    {
+        /// <inheritdoc />
+        public ClothNode(Actor actor)
+        : base(actor)
+        {
+        }
+
+        /// <inheritdoc />
+        public override void PostSpawn()
+        {
+            base.PostSpawn();
+
+            // Snap to the parent
+            if (!(ParentNode is SceneNode))
+                Actor.LocalTransform = Transform.Identity;
+        }
+    }
+}
diff --git a/Source/Editor/SceneGraph/SceneGraphFactory.cs b/Source/Editor/SceneGraph/SceneGraphFactory.cs
index c4aecef7e..bd465aad2 100644
--- a/Source/Editor/SceneGraph/SceneGraphFactory.cs
+++ b/Source/Editor/SceneGraph/SceneGraphFactory.cs
@@ -51,6 +51,7 @@ namespace FlaxEditor.SceneGraph
             CustomNodesTypes.Add(typeof(AudioSource), typeof(AudioSourceNode));
             CustomNodesTypes.Add(typeof(BoneSocket), typeof(BoneSocketNode));
             CustomNodesTypes.Add(typeof(Decal), typeof(DecalNode));
+            CustomNodesTypes.Add(typeof(Cloth), typeof(ClothNode));
             CustomNodesTypes.Add(typeof(BoxCollider), typeof(BoxColliderNode));
             CustomNodesTypes.Add(typeof(SphereCollider), typeof(ColliderNode));
             CustomNodesTypes.Add(typeof(CapsuleCollider), typeof(ColliderNode));

From 29abfbcdc99f6b2dd36272ab627b8e532412e318 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 24 Mar 2026 22:59:21 +0100
Subject: [PATCH 154/203] Fix Cloth with models that use compressed vertex
 buffer

#4017
---
 Source/Engine/Graphics/Models/MeshAccessor.h  |  21 ++
 Source/Engine/Level/Actors/AnimatedModel.cpp  |  10 +
 Source/Engine/Level/Actors/AnimatedModel.h    |   1 +
 .../Level/Actors/ModelInstanceActor.cpp       |   6 +
 .../Engine/Level/Actors/ModelInstanceActor.h  |  13 +
 Source/Engine/Level/Actors/StaticModel.cpp    |  10 +
 Source/Engine/Level/Actors/StaticModel.h      |   1 +
 Source/Engine/Physics/Actors/Cloth.cpp        | 238 +++++++++---------
 Source/Engine/Physics/Actors/Cloth.h          |   2 +-
 9 files changed, 186 insertions(+), 116 deletions(-)

diff --git a/Source/Engine/Graphics/Models/MeshAccessor.h b/Source/Engine/Graphics/Models/MeshAccessor.h
index 25fc01a1a..96ead669c 100644
--- a/Source/Engine/Graphics/Models/MeshAccessor.h
+++ b/Source/Engine/Graphics/Models/MeshAccessor.h
@@ -39,51 +39,61 @@ public:
 
         FORCE_INLINE int32 GetInt(int32 index) const
         {
+            ASSERT_LOW_LAYER(index * _stride < _data.Length());
             return (int32)_sampler.Read(_data.Get() + index * _stride).X;
         }
 
         FORCE_INLINE float GetFloat(int32 index) const
         {
+            ASSERT_LOW_LAYER(index * _stride < _data.Length());
             return _sampler.Read(_data.Get() + index * _stride).X;
         }
 
         FORCE_INLINE Float2 GetFloat2(int32 index) const
         {
+            ASSERT_LOW_LAYER(index * _stride < _data.Length());
             return Float2(_sampler.Read(_data.Get() + index * _stride));
         }
 
         FORCE_INLINE Float3 GetFloat3(int32 index) const
         {
+            ASSERT_LOW_LAYER(index * _stride < _data.Length());
             return Float3(_sampler.Read(_data.Get() + index * _stride));
         }
 
         FORCE_INLINE Float4 GetFloat4(int32 index) const
         {
+            ASSERT_LOW_LAYER(index * _stride < _data.Length());
             return _sampler.Read(_data.Get() + index * _stride);
         }
 
         FORCE_INLINE void SetInt(int32 index, const int32 value)
         {
+            ASSERT_LOW_LAYER(index * _stride < _data.Length());
             _sampler.Write(_data.Get() + index * _stride, Float4((float)value));
         }
 
         FORCE_INLINE void SetFloat(int32 index, const float value)
         {
+            ASSERT_LOW_LAYER(index * _stride < _data.Length());
             _sampler.Write(_data.Get() + index * _stride, Float4(value));
         }
 
         FORCE_INLINE void SetFloat2(int32 index, const Float2& value)
         {
+            ASSERT_LOW_LAYER(index * _stride < _data.Length());
             _sampler.Write(_data.Get() + index * _stride, Float4(value));
         }
 
         FORCE_INLINE void SetFloat3(int32 index, const Float3& value)
         {
+            ASSERT_LOW_LAYER(index * _stride < _data.Length());
             _sampler.Write(_data.Get() + index * _stride, Float4(value));
         }
 
         FORCE_INLINE void SetFloat4(int32 index, const Float4& value)
         {
+            ASSERT_LOW_LAYER(index * _stride < _data.Length());
             _sampler.Write(_data.Get() + index * _stride, value);
         }
 
@@ -94,11 +104,22 @@ public:
         void Set(Span<Float2> src);
         void Set(Span<Float3> src);
         void Set(Span<Color> src);
+        template<typename T>
+        void Set(const Array<T>& dst) const
+        {
+            Set(Span<T>(dst.Get(), dst.Count()));
+        }
 
         // Copies the contents of this stream into a destination data span.
         void CopyTo(Span<Float2> dst) const;
         void CopyTo(Span<Float3> dst) const;
         void CopyTo(Span<Color> dst) const;
+        template<typename T>
+        void CopyTo(Array<T>& dst) const
+        {
+            dst.Resize(GetCount());
+            CopyTo(Span<T>(dst.Get(), dst.Count()));
+        }
     };
 
 private:
diff --git a/Source/Engine/Level/Actors/AnimatedModel.cpp b/Source/Engine/Level/Actors/AnimatedModel.cpp
index 11497e558..ddafd215d 100644
--- a/Source/Engine/Level/Actors/AnimatedModel.cpp
+++ b/Source/Engine/Level/Actors/AnimatedModel.cpp
@@ -1397,6 +1397,16 @@ bool AnimatedModel::GetMeshData(const MeshReference& ref, MeshBufferType type, B
     return mesh.DownloadDataCPU(type, result, count, layout);
 }
 
+MeshBase* AnimatedModel::GetMesh(const MeshReference& ref) const
+{
+    const auto model = SkinnedModel.Get();
+    if (!model || model->WaitForLoaded())
+        return nullptr;
+    auto& lod = model->LODs[Math::Min(ref.LODIndex, model->LODs.Count() - 1)];
+    auto& mesh = lod.Meshes[Math::Min(ref.MeshIndex, lod.Meshes.Count() - 1)];
+    return &mesh;
+}
+
 MeshDeformation* AnimatedModel::GetMeshDeformation() const
 {
     if (!_deformation)
diff --git a/Source/Engine/Level/Actors/AnimatedModel.h b/Source/Engine/Level/Actors/AnimatedModel.h
index a520d6723..f9182d115 100644
--- a/Source/Engine/Level/Actors/AnimatedModel.h
+++ b/Source/Engine/Level/Actors/AnimatedModel.h
@@ -479,6 +479,7 @@ public:
     bool IntersectsEntry(int32 entryIndex, const Ray& ray, Real& distance, Vector3& normal) override;
     bool IntersectsEntry(const Ray& ray, Real& distance, Vector3& normal, int32& entryIndex) override;
     bool GetMeshData(const MeshReference& ref, MeshBufferType type, BytesContainer& result, int32& count, GPUVertexLayout** layout) const override;
+    MeshBase* GetMesh(const MeshReference& ref) const override;
     void UpdateBounds() override;
     MeshDeformation* GetMeshDeformation() const override;
     void OnDeleteObject() override;
diff --git a/Source/Engine/Level/Actors/ModelInstanceActor.cpp b/Source/Engine/Level/Actors/ModelInstanceActor.cpp
index 527775bfc..b8dc3af1a 100644
--- a/Source/Engine/Level/Actors/ModelInstanceActor.cpp
+++ b/Source/Engine/Level/Actors/ModelInstanceActor.cpp
@@ -14,6 +14,12 @@ String ModelInstanceActor::MeshReference::ToString() const
     return String::Format(TEXT("Actor={},LOD={},Mesh={}"), Actor ? Actor->GetNamePath() : String::Empty, LODIndex, MeshIndex);
 }
 
+MeshBase* ModelInstanceActor::MeshReference::Get() const
+{
+    auto actor = Actor.Get();
+    return actor ? actor->GetMesh(*this) : nullptr;
+}
+
 void ModelInstanceActor::SetEntries(const Array<ModelInstanceEntry>& value)
 {
     WaitForModelLoad();
diff --git a/Source/Engine/Level/Actors/ModelInstanceActor.h b/Source/Engine/Level/Actors/ModelInstanceActor.h
index d5e2498fb..d553d132a 100644
--- a/Source/Engine/Level/Actors/ModelInstanceActor.h
+++ b/Source/Engine/Level/Actors/ModelInstanceActor.h
@@ -29,6 +29,7 @@ API_CLASS(Abstract) class FLAXENGINE_API ModelInstanceActor : public Actor
         API_FIELD() int32 MeshIndex = 0;
 
         String ToString() const;
+        MeshBase* Get() const;
     };
 
 protected:
@@ -113,6 +114,7 @@ public:
 
     /// <summary>
     /// Extracts mesh buffer data from CPU. Might be cached internally (eg. by Model/SkinnedModel).
+    /// [Deprecated in 1.12]
     /// </summary>
     /// <param name="ref">Mesh reference.</param>
     /// <param name="type">Buffer type</param>
@@ -120,11 +122,22 @@ public:
     /// <param name="count">The amount of items inside the result buffer.</param>
     /// <param name="layout">The result layout of the result buffer (for vertex buffers). Optional, pass null to ignore it.</param>
     /// <returns>True if failed, otherwise false.</returns>
+    DEPRECATED("Use GetMesh to resolve mesh reference and access mesh data with MeshAccessor.")
     virtual bool GetMeshData(const MeshReference& ref, MeshBufferType type, BytesContainer& result, int32& count, GPUVertexLayout** layout = nullptr) const
     {
         return true;
     }
 
+    /// <summary>
+    /// Resolves a given mesh reference.
+    /// </summary>
+    /// <param name="ref">Mesh reference.</param>
+    /// <returns>Mesh or null if invalid ref.</returns>
+    virtual MeshBase* GetMesh(const MeshReference& ref) const
+    {
+        return nullptr;
+    }
+
     /// <summary>
     /// Gets the mesh deformation utility for this model instance (optional).
     /// </summary>
diff --git a/Source/Engine/Level/Actors/StaticModel.cpp b/Source/Engine/Level/Actors/StaticModel.cpp
index 19e4e3f34..fad068bf0 100644
--- a/Source/Engine/Level/Actors/StaticModel.cpp
+++ b/Source/Engine/Level/Actors/StaticModel.cpp
@@ -665,6 +665,16 @@ bool StaticModel::GetMeshData(const MeshReference& ref, MeshBufferType type, Byt
     return mesh.DownloadDataCPU(type, result, count, layout);
 }
 
+MeshBase* StaticModel::GetMesh(const MeshReference& ref) const
+{
+    const auto model = Model.Get();
+    if (!model || model->WaitForLoaded())
+        return nullptr;
+    auto& lod = model->LODs[Math::Min(ref.LODIndex, model->LODs.Count() - 1)];
+    auto& mesh = lod.Meshes[Math::Min(ref.MeshIndex, lod.Meshes.Count() - 1)];
+    return &mesh;
+}
+
 MeshDeformation* StaticModel::GetMeshDeformation() const
 {
     if (!_deformation)
diff --git a/Source/Engine/Level/Actors/StaticModel.h b/Source/Engine/Level/Actors/StaticModel.h
index 4b575a0ed..063638e14 100644
--- a/Source/Engine/Level/Actors/StaticModel.h
+++ b/Source/Engine/Level/Actors/StaticModel.h
@@ -181,6 +181,7 @@ public:
     bool IntersectsEntry(int32 entryIndex, const Ray& ray, Real& distance, Vector3& normal) override;
     bool IntersectsEntry(const Ray& ray, Real& distance, Vector3& normal, int32& entryIndex) override;
     bool GetMeshData(const MeshReference& ref, MeshBufferType type, BytesContainer& result, int32& count, GPUVertexLayout** layout) const override;
+    MeshBase* GetMesh(const MeshReference& ref) const override;
     MeshDeformation* GetMeshDeformation() const override;
     void UpdateBounds() override;
 
diff --git a/Source/Engine/Physics/Actors/Cloth.cpp b/Source/Engine/Physics/Actors/Cloth.cpp
index 1f833fa0e..8c9b996ce 100644
--- a/Source/Engine/Physics/Actors/Cloth.cpp
+++ b/Source/Engine/Physics/Actors/Cloth.cpp
@@ -208,8 +208,12 @@ void Cloth::SetPaint(Span<const float> value)
     if (_cloth)
     {
         // Update cloth particles
+        MeshAccessor accessor;
+        MeshBufferType bufferTypes[2] = { MeshBufferType::Index, MeshBufferType::Vertex0 };
+        if (accessor.LoadMesh(GetMesh().Get(), false, ToSpan(bufferTypes, 2)))
+            return;
         Array<float> invMasses;
-        CalculateInvMasses(invMasses);
+        CalculateInvMasses(accessor, invMasses);
         PhysicsBackend::LockClothParticles(_cloth);
         PhysicsBackend::SetClothParticles(_cloth, Span<const Float4>(), Span<const Float3>(), ToSpan<float, const float>(invMasses));
         PhysicsBackend::SetClothPaint(_cloth, value);
@@ -227,18 +231,20 @@ bool Cloth::IntersectsItself(const Ray& ray, Real& distance, Vector3& normal)
     if (_cloth)
     {
         // Precise per-triangle intersection
-        const ModelInstanceActor::MeshReference mesh = GetMesh();
-        if (mesh.Actor == nullptr)
+        const ModelInstanceActor::MeshReference meshRef = GetMesh();
+        if (meshRef.Actor == nullptr)
             return false;
-        BytesContainer indicesData;
-        int32 indicesCount;
-        if (mesh.Actor->GetMeshData(mesh, MeshBufferType::Index, indicesData, indicesCount))
+        MeshAccessor accessor;
+        MeshBufferType bufferTypes[1] = { MeshBufferType::Index };
+        if (accessor.LoadMesh(meshRef.Get(), false, ToSpan(bufferTypes, 1)))
             return false;
+        auto indices = accessor.Index();
+        auto indicesData = indices.GetData();
         PhysicsBackend::LockClothParticles(_cloth);
         const Span<const Float4> particles = PhysicsBackend::GetClothParticles(_cloth);
         const Transform transform = GetTransform();
-        const bool indices16bit = indicesData.Length() / indicesCount == sizeof(uint16);
-        const int32 trianglesCount = indicesCount / 3;
+        const bool indices16bit = indices.GetFormat() == PixelFormat::R16_UInt;
+        const int32 trianglesCount = indices.GetCount() / 3;
         bool result = false;
         distance = MAX_Real;
         for (int32 triangleIndex = 0; triangleIndex < trianglesCount; triangleIndex++)
@@ -341,18 +347,20 @@ void Cloth::DrawPhysicsDebug(RenderView& view)
     if (_cloth)
     {
         PROFILE_CPU();
-        const ModelInstanceActor::MeshReference mesh = GetMesh();
-        if (mesh.Actor == nullptr)
+        const ModelInstanceActor::MeshReference meshRef = GetMesh();
+        if (meshRef.Actor == nullptr)
             return;
-        BytesContainer indicesData;
-        int32 indicesCount;
-        if (mesh.Actor->GetMeshData(mesh, MeshBufferType::Index, indicesData, indicesCount))
+        MeshAccessor accessor;
+        MeshBufferType bufferTypes[1] = { MeshBufferType::Index };
+        if (accessor.LoadMesh(meshRef.Get(), false, ToSpan(bufferTypes, 1)))
             return;
+        auto indices = accessor.Index();
+        auto indicesData = indices.GetData();
         PhysicsBackend::LockClothParticles(_cloth);
         const Span<const Float4> particles = PhysicsBackend::GetClothParticles(_cloth);
         const Transform transform = GetTransform();
-        const bool indices16bit = indicesData.Length() / indicesCount == sizeof(uint16);
-        const int32 trianglesCount = indicesCount / 3;
+        const bool indices16bit = indices.GetFormat() == PixelFormat::R16_UInt;
+        const int32 trianglesCount = indices.GetCount() / 3;
         for (int32 triangleIndex = 0; triangleIndex < trianglesCount; triangleIndex++)
         {
             const int32 index = triangleIndex * 3;
@@ -390,18 +398,20 @@ void Cloth::OnDebugDrawSelected()
     if (_cloth)
     {
         DEBUG_DRAW_WIRE_BOX(_box, Color::Violet.RGBMultiplied(0.8f), 0, true);
-        const ModelInstanceActor::MeshReference mesh = GetMesh();
-        if (mesh.Actor == nullptr)
+        const ModelInstanceActor::MeshReference meshRef = GetMesh();
+        if (meshRef.Actor == nullptr)
             return;
-        BytesContainer indicesData;
-        int32 indicesCount;
-        if (mesh.Actor->GetMeshData(mesh, MeshBufferType::Index, indicesData, indicesCount))
+        MeshAccessor accessor;
+        MeshBufferType bufferTypes[1] = { MeshBufferType::Index };
+        if (accessor.LoadMesh(meshRef.Get(), false, ToSpan(bufferTypes, 1)))
             return;
+        auto indices = accessor.Index();
+        auto indicesData = indices.GetData();
         PhysicsBackend::LockClothParticles(_cloth);
         const Span<const Float4> particles = PhysicsBackend::GetClothParticles(_cloth);
         const Transform transform = GetTransform();
-        const bool indices16bit = indicesData.Length() / indicesCount == sizeof(uint16);
-        const int32 trianglesCount = indicesCount / 3;
+        const bool indices16bit = indices.GetFormat() == PixelFormat::R16_UInt;
+        const int32 trianglesCount = indices.GetCount() / 3;
         for (int32 triangleIndex = 0; triangleIndex < trianglesCount; triangleIndex++)
         {
             const int32 index = triangleIndex * 3;
@@ -556,26 +566,36 @@ bool Cloth::CreateCloth()
 
     // Get mesh data
     // TODO: consider making it via async task so physics can wait on the cloth setup from mesh data just before next fixed update which gives more time when loading scene
-    const ModelInstanceActor::MeshReference mesh = GetMesh();
-    if (mesh.Actor == nullptr)
+    const ModelInstanceActor::MeshReference meshRef = GetMesh();
+    if (meshRef.Actor == nullptr)
         return false;
     PhysicsClothDesc desc;
     desc.Actor = this;
-    BytesContainer data;
-    int32 count;
-    if (mesh.Actor->GetMeshData(mesh, MeshBufferType::Vertex0, data, count))
+    MeshAccessor accessor;
+    MeshBufferType bufferTypes[2] = { MeshBufferType::Index, MeshBufferType::Vertex0 };
+    if (accessor.LoadMesh(meshRef.Get(), false, ToSpan(bufferTypes, 2)))
         return true;
-    // TODO: use MeshAccessor vertex data layout descriptor instead hardcoded position data at the beginning of VB0
-    desc.VerticesData = data.Get();
-    desc.VerticesCount = count;
-    desc.VerticesStride = data.Length() / count;
-    if (mesh.Actor->GetMeshData(mesh, MeshBufferType::Index, data, count))
-        return true;
-    desc.IndicesData = data.Get();
-    desc.IndicesCount = count;
-    desc.IndicesStride = data.Length() / count;
+    auto position = accessor.Position();
+    Array<Float3> tempPositions;
+    if (position.GetFormat() == PixelFormat::R32G32B32_Float)
+    {
+        desc.VerticesData = position.GetData().Get();
+        desc.VerticesCount = position.GetCount();
+        desc.VerticesStride = position.GetStride();
+    }
+    else
+    {
+        position.CopyTo(tempPositions);
+        desc.VerticesData = tempPositions.Get();
+        desc.VerticesCount = tempPositions.Count();
+        desc.VerticesStride = sizeof(Float3);
+    }
+    auto indices = accessor.Index();
+    desc.IndicesData = indices.GetData().Get();
+    desc.IndicesCount = indices.GetCount();
+    desc.IndicesStride = indices.GetStride();
     Array<float> invMasses;
-    CalculateInvMasses(invMasses);
+    CalculateInvMasses(accessor, invMasses);
     desc.InvMassesData = invMasses.Count() == desc.VerticesCount ? invMasses.Get() : nullptr;
     desc.InvMassesStride = sizeof(float);
     desc.MaxDistancesData = _paint.Count() == desc.VerticesCount ? _paint.Get() : nullptr;
@@ -595,13 +615,13 @@ bool Cloth::CreateCloth()
     PhysicsBackend::ClearClothInertia(_cloth);
 
     // Add cloth mesh deformer
-    if (auto* deformation = mesh.Actor->GetMeshDeformation())
+    if (auto* deformation = meshRef.Actor->GetMeshDeformation())
     {
         Function<void(const MeshBase*, MeshDeformationData&)> deformer;
         deformer.Bind<Cloth, &Cloth::RunClothDeformer>(this);
-        deformation->AddDeformer(mesh.LODIndex, mesh.MeshIndex, MeshBufferType::Vertex0, deformer);
+        deformation->AddDeformer(meshRef.LODIndex, meshRef.MeshIndex, MeshBufferType::Vertex0, deformer);
         if (_simulationSettings.ComputeNormals)
-            deformation->AddDeformer(mesh.LODIndex, mesh.MeshIndex, MeshBufferType::Vertex1, deformer);
+            deformation->AddDeformer(meshRef.LODIndex, meshRef.MeshIndex, MeshBufferType::Vertex1, deformer);
         _meshDeformation = deformation;
     }
 
@@ -631,7 +651,7 @@ void Cloth::DestroyCloth()
 #endif
 }
 
-void Cloth::CalculateInvMasses(Array<float>& invMasses)
+void Cloth::CalculateInvMasses(MeshAccessor& accessor, Array<float>& invMasses)
 {
     // Use per-particle max distance to evaluate which particles are immovable
 #if WITH_CLOTH
@@ -641,29 +661,22 @@ void Cloth::CalculateInvMasses(Array<float>& invMasses)
     PROFILE_MEM(Physics);
 
     // Get mesh data
-    const ModelInstanceActor::MeshReference mesh = GetMesh();
-    if (mesh.Actor == nullptr)
-        return;
-    BytesContainer verticesData;
-    int32 verticesCount;
-    if (mesh.Actor->GetMeshData(mesh, MeshBufferType::Vertex0, verticesData, verticesCount))
-        return;
-    BytesContainer indicesData;
-    int32 indicesCount;
-    if (mesh.Actor->GetMeshData(mesh, MeshBufferType::Index, indicesData, indicesCount))
-        return;
+    auto positions = accessor.Position();
+    auto indices = accessor.Index();
+    CHECK(positions.IsValid() && indices.IsValid());
+    int32 verticesCount = positions.GetCount();
     if (_paint.Count() != verticesCount)
     {
         // Fix incorrect paint data
-        LOG(Warning, "Incorrect cloth '{}' paint size {} for mesh '{}' that has {} vertices", GetNamePath(), _paint.Count(), mesh.ToString(), verticesCount);
+        LOG(Warning, "Incorrect cloth '{}' paint size {} for mesh '{}' that has {} vertices", GetNamePath(), _paint.Count(), GetMesh().ToString(), verticesCount);
         int32 countBefore = _paint.Count();
         _paint.Resize(verticesCount);
         for (int32 i = countBefore; i < verticesCount; i++)
             _paint.Get()[i] = 0.0f;
     }
-    const int32 verticesStride = verticesData.Length() / verticesCount;
-    const bool indices16bit = indicesData.Length() / indicesCount == sizeof(uint16);
-    const int32 trianglesCount = indicesCount / 3;
+    const bool indices16bit = indices.GetFormat() == PixelFormat::R16_UInt;
+    const int32 trianglesCount = indices.GetCount() / 3;
+    auto indicesData = indices.GetData();
 
     // Sum triangle area for each influenced particle
     invMasses.Resize(verticesCount);
@@ -676,12 +689,9 @@ void Cloth::CalculateInvMasses(Array<float>& invMasses)
             const int32 i0 = indicesData.Get<uint16>()[index];
             const int32 i1 = indicesData.Get<uint16>()[index + 1];
             const int32 i2 = indicesData.Get<uint16>()[index + 2];
-            // TODO: use MeshAccessor vertex data layout descriptor instead hardcoded position data at the beginning of VB0
-#define GET_POS(i) *(Float3*)((byte*)verticesData.Get() + i * verticesStride)
-            const Float3 v0(GET_POS(i0));
-            const Float3 v1(GET_POS(i1));
-            const Float3 v2(GET_POS(i2));
-#undef GET_POS
+            const Float3 v0(positions.GetFloat3(i0));
+            const Float3 v1(positions.GetFloat3(i1));
+            const Float3 v2(positions.GetFloat3(i2));
             const float area = Float3::TriangleArea(v0, v1, v2);
             invMasses.Get()[i0] += area;
             invMasses.Get()[i1] += area;
@@ -696,12 +706,9 @@ void Cloth::CalculateInvMasses(Array<float>& invMasses)
             const int32 i0 = indicesData.Get<uint32>()[index];
             const int32 i1 = indicesData.Get<uint32>()[index + 1];
             const int32 i2 = indicesData.Get<uint32>()[index + 2];
-            // TODO: use MeshAccessor vertex data layout descriptor instead hardcoded position data at the beginning of VB0
-#define GET_POS(i) *(Float3*)((byte*)verticesData.Get() + i * verticesStride)
-            const Float3 v0(GET_POS(i0));
-            const Float3 v1(GET_POS(i1));
-            const Float3 v2(GET_POS(i2));
-#undef GET_POS
+            const Float3 v0(positions.GetFloat3(i0));
+            const Float3 v1(positions.GetFloat3(i1));
+            const Float3 v2(positions.GetFloat3(i2));
             const float area = Float3::TriangleArea(v0, v1, v2);
             invMasses.Get()[i0] += area;
             invMasses.Get()[i1] += area;
@@ -787,25 +794,22 @@ bool Cloth::OnPreUpdate()
     {
         if (animatedModel->GraphInstance.NodesPose.IsEmpty() || _paint.IsEmpty())
             return false;
-        const ModelInstanceActor::MeshReference mesh = GetMesh();
-        if (mesh.Actor == nullptr)
-            return false;
-        BytesContainer verticesData;
-        int32 verticesCount;
-        GPUVertexLayout* layout;
-        if (mesh.Actor->GetMeshData(mesh, MeshBufferType::Vertex0, verticesData, verticesCount, &layout))
+        const ModelInstanceActor::MeshReference meshRef = GetMesh();
+        if (meshRef.Actor == nullptr)
             return false;
         MeshAccessor accessor;
-        if (accessor.LoadBuffer(MeshBufferType::Vertex0, verticesData, layout))
+        MeshBufferType bufferTypes[1] = { MeshBufferType::Vertex0 };
+        if (accessor.LoadMesh(meshRef.Get(), false, ToSpan(bufferTypes, 1)))
             return false;
         auto positionStream = accessor.Position();
         auto blendIndicesStream = accessor.BlendIndices();
         auto blendWeightsStream = accessor.BlendWeights();
         if (!positionStream.IsValid() || !blendIndicesStream.IsValid() || !blendWeightsStream.IsValid())
             return false;
+        const int32 verticesCount = positionStream.GetCount();
         if (verticesCount != _paint.Count())
         {
-            LOG(Warning, "Incorrect cloth '{}' paint size {} for mesh '{}' that has {} vertices", GetNamePath(), _paint.Count(), mesh.ToString(), verticesCount);
+            LOG(Warning, "Incorrect cloth '{}' paint size {} for mesh '{}' that has {} vertices", GetNamePath(), _paint.Count(), meshRef.ToString(), verticesCount);
             return false;
         }
         PROFILE_CPU_NAMED("Skinned Pose");
@@ -934,49 +938,53 @@ void Cloth::RunClothDeformer(const MeshBase* mesh, MeshDeformationData& deformat
     // Calculate normals
     Array<Float3> normals;
     const ModelInstanceActor::MeshReference meshRef = GetMesh();
-    BytesContainer indicesData;
-    int32 indicesCount;
-    if ((_simulationSettings.ComputeNormals || deformation.Type == MeshBufferType::Vertex1) &&
-        meshRef.Actor && !meshRef.Actor->GetMeshData(meshRef, MeshBufferType::Index, indicesData, indicesCount))
+    if ((_simulationSettings.ComputeNormals || deformation.Type == MeshBufferType::Vertex1) && meshRef.Actor)
     {
-        PROFILE_CPU_NAMED("Normals");
-        // TODO: optimize memory allocs (eg. use shared allocator)
-        normals.Resize(vbCount);
-        Platform::MemoryClear(normals.Get(), vbCount * sizeof(Float3));
-        const bool indices16bit = indicesData.Length() / indicesCount == sizeof(uint16);
-        const int32 trianglesCount = indicesCount / 3;
-        if (indices16bit)
+        MeshAccessor accessor;
+        MeshBufferType bufferTypes[1] = { MeshBufferType::Index };
+        if (!accessor.LoadMesh(meshRef.Get(), false, ToSpan(bufferTypes, 1)))
         {
-            for (int32 triangleIndex = 0; triangleIndex < trianglesCount; triangleIndex++)
+            PROFILE_CPU_NAMED("Normals");
+            auto indices = accessor.Index();
+            auto indicesData = indices.GetData();
+            // TODO: optimize memory allocs (eg. use shared allocator)
+            normals.Resize(vbCount);
+            Platform::MemoryClear(normals.Get(), vbCount * sizeof(Float3));
+            const bool indices16bit = indices.GetFormat() == PixelFormat::R16_UInt;
+            const int32 trianglesCount = indices.GetCount() / 3;
+            if (indices16bit)
             {
-                const int32 index = triangleIndex * 3;
-                const int32 i0 = indicesData.Get<uint16>()[index];
-                const int32 i1 = indicesData.Get<uint16>()[index + 1];
-                const int32 i2 = indicesData.Get<uint16>()[index + 2];
-                const Float3 v0(particles.Get()[i0]);
-                const Float3 v1(particles.Get()[i1]);
-                const Float3 v2(particles.Get()[i2]);
-                const Float3 normal = Float3::Cross(v1 - v0, v2 - v0);
-                normals.Get()[i0] += normal;
-                normals.Get()[i1] += normal;
-                normals.Get()[i2] += normal;
+                for (int32 triangleIndex = 0; triangleIndex < trianglesCount; triangleIndex++)
+                {
+                    const int32 index = triangleIndex * 3;
+                    const int32 i0 = indicesData.Get<uint16>()[index];
+                    const int32 i1 = indicesData.Get<uint16>()[index + 1];
+                    const int32 i2 = indicesData.Get<uint16>()[index + 2];
+                    const Float3 v0(particles.Get()[i0]);
+                    const Float3 v1(particles.Get()[i1]);
+                    const Float3 v2(particles.Get()[i2]);
+                    const Float3 normal = Float3::Cross(v1 - v0, v2 - v0);
+                    normals.Get()[i0] += normal;
+                    normals.Get()[i1] += normal;
+                    normals.Get()[i2] += normal;
+                }
             }
-        }
-        else
-        {
-            for (int32 triangleIndex = 0; triangleIndex < trianglesCount; triangleIndex++)
+            else
             {
-                const int32 index = triangleIndex * 3;
-                const int32 i0 = indicesData.Get<uint32>()[index];
-                const int32 i1 = indicesData.Get<uint32>()[index + 1];
-                const int32 i2 = indicesData.Get<uint32>()[index + 2];
-                const Float3 v0(particles.Get()[i0]);
-                const Float3 v1(particles.Get()[i1]);
-                const Float3 v2(particles.Get()[i2]);
-                const Float3 normal = Float3::Cross(v1 - v0, v2 - v0);
-                normals.Get()[i0] += normal;
-                normals.Get()[i1] += normal;
-                normals.Get()[i2] += normal;
+                for (int32 triangleIndex = 0; triangleIndex < trianglesCount; triangleIndex++)
+                {
+                    const int32 index = triangleIndex * 3;
+                    const int32 i0 = indicesData.Get<uint32>()[index];
+                    const int32 i1 = indicesData.Get<uint32>()[index + 1];
+                    const int32 i2 = indicesData.Get<uint32>()[index + 2];
+                    const Float3 v0(particles.Get()[i0]);
+                    const Float3 v1(particles.Get()[i1]);
+                    const Float3 v2(particles.Get()[i2]);
+                    const Float3 normal = Float3::Cross(v1 - v0, v2 - v0);
+                    normals.Get()[i0] += normal;
+                    normals.Get()[i1] += normal;
+                    normals.Get()[i2] += normal;
+                }
             }
         }
     }
diff --git a/Source/Engine/Physics/Actors/Cloth.h b/Source/Engine/Physics/Actors/Cloth.h
index f83f1c499..8d6f13370 100644
--- a/Source/Engine/Physics/Actors/Cloth.h
+++ b/Source/Engine/Physics/Actors/Cloth.h
@@ -371,6 +371,6 @@ private:
     ImplementPhysicsDebug;
     bool CreateCloth();
     void DestroyCloth();
-    void CalculateInvMasses(Array<float>& invMasses);
+    void CalculateInvMasses(class MeshAccessor& accessor, Array<float>& invMasses);
     void RunClothDeformer(const MeshBase* mesh, struct MeshDeformationData& deformation);
 };

From 13f5222ec75ccc90a4a5a86db72293c1bbac5f06 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 24 Mar 2026 23:00:51 +0100
Subject: [PATCH 155/203] Fix `MeshAccessor` to properly reference model asset
 data during the usage

---
 Source/Engine/Graphics/Models/MeshAccessor.h |  3 +++
 Source/Engine/Graphics/Models/MeshBase.cpp   | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/Source/Engine/Graphics/Models/MeshAccessor.h b/Source/Engine/Graphics/Models/MeshAccessor.h
index 96ead669c..820a6db43 100644
--- a/Source/Engine/Graphics/Models/MeshAccessor.h
+++ b/Source/Engine/Graphics/Models/MeshAccessor.h
@@ -126,8 +126,11 @@ private:
     BytesContainer _data[(int32)MeshBufferType::MAX];
     PixelFormat _formats[(int32)MeshBufferType::MAX] = {};
     GPUVertexLayout* _layouts[(int32)MeshBufferType::MAX] = {};
+    Array<ModelBase*, InlinedAllocation<4>> _usedModels;
 
 public:
+    ~MeshAccessor();
+
     /// <summary>
     /// Loads the data from the mesh.
     /// </summary>
diff --git a/Source/Engine/Graphics/Models/MeshBase.cpp b/Source/Engine/Graphics/Models/MeshBase.cpp
index bbec523a2..275a072d1 100644
--- a/Source/Engine/Graphics/Models/MeshBase.cpp
+++ b/Source/Engine/Graphics/Models/MeshBase.cpp
@@ -188,6 +188,16 @@ void MeshAccessor::Stream::CopyTo(Span<::Color> dst) const
     }
 }
 
+MeshAccessor::~MeshAccessor()
+{
+    for (ModelBase* model : _usedModels)
+    {
+        if (model->Storage)
+            model->Storage->UnlockChunks();
+        model->RemoveReference();
+    }
+}
+
 bool MeshAccessor::LoadMesh(const MeshBase* mesh, bool forceGpu, Span<MeshBufferType> buffers)
 {
     CHECK_RETURN(mesh, true);
@@ -196,6 +206,14 @@ bool MeshAccessor::LoadMesh(const MeshBase* mesh, bool forceGpu, Span<MeshBuffer
         buffers = Span<MeshBufferType>(allBuffers, ARRAY_COUNT(allBuffers));
     Array<BytesContainer, FixedAllocation<4>> meshBuffers;
     Array<GPUVertexLayout*, FixedAllocation<4>> meshLayouts;
+    if (ModelBase* model = mesh->GetModelBase())
+    {
+        // Maintain reference to mesh data (it's buffers might be referenced, not copied)
+        model->AddReference();
+        if (model->Storage)
+            model->Storage->LockChunks();
+        _usedModels.Add(model);
+    }
     if (mesh->DownloadData(buffers, meshBuffers, meshLayouts, forceGpu))
         return true;
     for (int32 i = 0; i < buffers.Length(); i++)

From 7b3cfd989f257a86433a52413bd16b00946cea74 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 24 Mar 2026 23:01:09 +0100
Subject: [PATCH 156/203] Add memory profiler category for Cloth

---
 Source/Engine/Physics/Actors/Cloth.cpp             | 14 +++++++-------
 .../Engine/Physics/PhysX/PhysicsBackendPhysX.cpp   |  4 +++-
 Source/Engine/Profiler/ProfilerMemory.cpp          |  1 +
 Source/Engine/Profiler/ProfilerMemory.h            |  2 ++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Source/Engine/Physics/Actors/Cloth.cpp b/Source/Engine/Physics/Actors/Cloth.cpp
index 8c9b996ce..3e0eb42d4 100644
--- a/Source/Engine/Physics/Actors/Cloth.cpp
+++ b/Source/Engine/Physics/Actors/Cloth.cpp
@@ -133,7 +133,7 @@ Array<Float3> Cloth::GetParticles() const
     if (_cloth)
     {
         PROFILE_CPU();
-        PROFILE_MEM(Physics);
+        PROFILE_MEM(PhysicsCloth);
         PhysicsBackend::LockClothParticles(_cloth);
         const Span<const Float4> particles = PhysicsBackend::GetClothParticles(_cloth);
         result.Resize(particles.Length());
@@ -150,7 +150,7 @@ Array<Float3> Cloth::GetParticles() const
 void Cloth::SetParticles(Span<const Float3> value)
 {
     PROFILE_CPU();
-    PROFILE_MEM(Physics);
+    PROFILE_MEM(PhysicsCloth);
 #if USE_CLOTH_SANITY_CHECKS
     {
         // Sanity check
@@ -180,7 +180,7 @@ Span<float> Cloth::GetPaint() const
 void Cloth::SetPaint(Span<const float> value)
 {
     PROFILE_CPU();
-    PROFILE_MEM(Physics);
+    PROFILE_MEM(PhysicsCloth);
 #if USE_CLOTH_SANITY_CHECKS
     {
         // Sanity check
@@ -312,7 +312,7 @@ void Cloth::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier)
 {
     Actor::Deserialize(stream, modifier);
 
-    PROFILE_MEM(Physics);
+    PROFILE_MEM(PhysicsCloth);
     DESERIALIZE_MEMBER(Mesh, _mesh);
     _mesh.Actor = nullptr; // Don't store this reference
     DESERIALIZE_MEMBER(Force, _forceSettings);
@@ -552,7 +552,7 @@ bool Cloth::CreateCloth()
 {
 #if WITH_CLOTH
     PROFILE_CPU();
-    PROFILE_MEM(Physics);
+    PROFILE_MEM(PhysicsCloth);
 
     // Skip if all vertices are fixed so cloth sim doesn't make sense
     if (_paint.HasItems())
@@ -658,7 +658,7 @@ void Cloth::CalculateInvMasses(MeshAccessor& accessor, Array<float>& invMasses)
     if (_paint.IsEmpty())
         return;
     PROFILE_CPU();
-    PROFILE_MEM(Physics);
+    PROFILE_MEM(PhysicsCloth);
 
     // Get mesh data
     auto positions = accessor.Position();
@@ -929,7 +929,7 @@ void Cloth::RunClothDeformer(const MeshBase* mesh, MeshDeformationData& deformat
         return;
 #if WITH_CLOTH
     PROFILE_CPU_NAMED("Cloth");
-    PROFILE_MEM(Physics);
+    PROFILE_MEM(PhysicsCloth);
     PhysicsBackend::LockClothParticles(_cloth);
     const Span<const Float4> particles = PhysicsBackend::GetClothParticles(_cloth);
     auto vbCount = (uint32)mesh->GetVertexCount();
diff --git a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
index b5efa9d73..64fe6fd65 100644
--- a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
+++ b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
@@ -1177,6 +1177,7 @@ void ScenePhysX::UpdateVehicles(float dt)
 void ScenePhysX::PreSimulateCloth(int32 i)
 {
     PROFILE_CPU();
+    PROFILE_MEM(PhysicsCloth);
     auto clothPhysX = ClothsList[i];
     auto& clothSettings = Cloths[clothPhysX];
 
@@ -1379,6 +1380,7 @@ void ScenePhysX::UpdateCloths(float dt)
     if (!clothSolver || ClothsList.IsEmpty())
         return;
     PROFILE_CPU_NAMED("Physics.Cloth");
+    PROFILE_MEM(PhysicsCloth);
 
     {
         PROFILE_CPU_NAMED("Pre");
@@ -3994,7 +3996,7 @@ void PhysicsBackend::RemoveVehicle(void* scene, WheeledVehicle* actor)
 void* PhysicsBackend::CreateCloth(const PhysicsClothDesc& desc)
 {
     PROFILE_CPU();
-    PROFILE_MEM(Physics);
+    PROFILE_MEM(PhysicsCloth);
 #if USE_CLOTH_SANITY_CHECKS
     {
         // Sanity check
diff --git a/Source/Engine/Profiler/ProfilerMemory.cpp b/Source/Engine/Profiler/ProfilerMemory.cpp
index 6b8f18ce3..eaa6cbfcd 100644
--- a/Source/Engine/Profiler/ProfilerMemory.cpp
+++ b/Source/Engine/Profiler/ProfilerMemory.cpp
@@ -263,6 +263,7 @@ void InitProfilerMemory(const Char* cmdLine, int32 stage)
     INIT_PARENT(Level, LevelTerrain);
     INIT_PARENT(Navigation, NavigationMesh);
     INIT_PARENT(Navigation, NavigationBuilding);
+    INIT_PARENT(Physics, PhysicsCloth);
     INIT_PARENT(Scripting, ScriptingVisual);
     INIT_PARENT(Scripting, ScriptingCSharp);
     INIT_PARENT(ScriptingCSharp, ScriptingCSharpGCCommitted);
diff --git a/Source/Engine/Profiler/ProfilerMemory.h b/Source/Engine/Profiler/ProfilerMemory.h
index 9177ae6e7..ab33a42f3 100644
--- a/Source/Engine/Profiler/ProfilerMemory.h
+++ b/Source/Engine/Profiler/ProfilerMemory.h
@@ -120,6 +120,8 @@ public:
 
         // Total physics memory.
         Physics,
+        // Cloth simulation and particles data.
+        PhysicsCloth,
 
         // Total scripting memory allocated by game.
         Scripting,

From e8134803c40605d7b90001b043a3644925e08101 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 24 Mar 2026 23:13:50 +0100
Subject: [PATCH 157/203] Fix invalid index buffer format returned by
 `MeshAccessor` when model is not yet loaded

#4017
---
 Source/Engine/Graphics/Models/MeshAccessor.cs   | 12 +++++++++---
 Source/Engine/Graphics/Models/MeshBase.cpp      | 17 ++++++++++++++---
 Source/Engine/Graphics/Models/MeshBase.h        |  2 +-
 .../ModelTool/MeshAccelerationStructure.cpp     |  2 +-
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Source/Engine/Graphics/Models/MeshAccessor.cs b/Source/Engine/Graphics/Models/MeshAccessor.cs
index 29aa86c18..ffe509476 100644
--- a/Source/Engine/Graphics/Models/MeshAccessor.cs
+++ b/Source/Engine/Graphics/Models/MeshAccessor.cs
@@ -413,10 +413,16 @@ namespace FlaxEngine
                 return true;
             for (int i = 0; i < buffersLocal.Length; i++)
             {
-                _data[(int)buffersLocal[i]] = meshBuffers[i];
-                _layouts[(int)buffersLocal[i]] = meshLayouts[i];
+                int buffer = (int)buffersLocal[i];
+                _data[buffer] = meshBuffers[i];
+                _layouts[buffer] = meshLayouts[i];
+
+                // Get format if using a single item (eg. index buffer type)
+                var format = PixelFormat.Unknown;
+                if (meshLayouts[i] && meshLayouts[i].Elements.Length == 1)
+                    format = meshLayouts[i].Elements[0].Format;
+                _formats[buffer] = format;
             }
-            _formats[(int)MeshBufferType.Index] = mesh.Use16BitIndexBuffer ? PixelFormat.R16_UInt : PixelFormat.R32_UInt;
             return false;
         }
 
diff --git a/Source/Engine/Graphics/Models/MeshBase.cpp b/Source/Engine/Graphics/Models/MeshBase.cpp
index 275a072d1..81fffb3e7 100644
--- a/Source/Engine/Graphics/Models/MeshBase.cpp
+++ b/Source/Engine/Graphics/Models/MeshBase.cpp
@@ -218,10 +218,16 @@ bool MeshAccessor::LoadMesh(const MeshBase* mesh, bool forceGpu, Span<MeshBuffer
         return true;
     for (int32 i = 0; i < buffers.Length(); i++)
     {
-        _data[(int32)buffers[i]] = MoveTemp(meshBuffers[i]);
-        _layouts[(int32)buffers[i]] = meshLayouts[i];
+        const int32 buffer = (int32)buffers[i];
+        _data[buffer] = MoveTemp(meshBuffers[i]);
+        _layouts[buffer] = meshLayouts[i];
+
+        // Get format if using a single item (eg. index buffer type)
+        PixelFormat format = PixelFormat::Unknown;
+        if (meshLayouts[i] && meshLayouts[i]->GetElements().Count() == 1)
+            format = meshLayouts[i]->GetElements()[0].Format;
+        _formats[buffer] = format;
     }
-    _formats[(int32)MeshBufferType::Index] = mesh->Use16BitIndexBuffer() ? PixelFormat::R16_UInt : PixelFormat::R32_UInt;
     return false;
 }
 
@@ -732,6 +738,9 @@ bool MeshBase::DownloadDataCPU(MeshBufferType type, BytesContainer& result, int3
             _cachedVertexBufferCount = meshData.Vertices;
             _cachedIndexBufferCount = (int32)meshData.Triangles * 3;
             _cachedIndexBuffer.Copy((const byte*)meshData.IBData, _cachedIndexBufferCount * (int32)meshData.IBStride);
+            GPUVertexLayout::Elements ibLayout;
+            ibLayout.Add({ VertexElement::Types::Attribute, 0, 0, 0, meshData.IBStride == sizeof(uint16) ? PixelFormat::R16_UInt : PixelFormat::R32_UInt });
+            _cachedVertexLayouts[3] = GPUVertexLayout::Get(ibLayout);
             for (int32 vb = 0; vb < meshData.VBData.Count(); vb++)
             {
                 _cachedVertexBuffers[vb].Copy((const byte*)meshData.VBData[vb], (int32)(meshData.VBLayout[vb]->GetStride() * meshData.Vertices));
@@ -746,6 +755,8 @@ bool MeshBase::DownloadDataCPU(MeshBufferType type, BytesContainer& result, int3
     case MeshBufferType::Index:
         result.Link(_cachedIndexBuffer);
         count = _cachedIndexBufferCount;
+        if (layout)
+            *layout = _cachedVertexLayouts[3];
         break;
     case MeshBufferType::Vertex0:
         result.Link(_cachedVertexBuffers[0]);
diff --git a/Source/Engine/Graphics/Models/MeshBase.h b/Source/Engine/Graphics/Models/MeshBase.h
index 1c76df166..cb51f466b 100644
--- a/Source/Engine/Graphics/Models/MeshBase.h
+++ b/Source/Engine/Graphics/Models/MeshBase.h
@@ -50,7 +50,7 @@ protected:
     GPUBuffer* _indexBuffer = nullptr;
 
     mutable BytesContainer _cachedVertexBuffers[MODEL_MAX_VB];
-    mutable GPUVertexLayout* _cachedVertexLayouts[MODEL_MAX_VB] = {};
+    mutable GPUVertexLayout* _cachedVertexLayouts[MODEL_MAX_VB + 1] = {};
     mutable BytesContainer _cachedIndexBuffer;
     mutable int32 _cachedIndexBufferCount = 0, _cachedVertexBufferCount = 0;
 
diff --git a/Source/Engine/Tools/ModelTool/MeshAccelerationStructure.cpp b/Source/Engine/Tools/ModelTool/MeshAccelerationStructure.cpp
index 297a6f868..7dd33c12a 100644
--- a/Source/Engine/Tools/ModelTool/MeshAccelerationStructure.cpp
+++ b/Source/Engine/Tools/ModelTool/MeshAccelerationStructure.cpp
@@ -349,7 +349,7 @@ void MeshAccelerationStructure::Add(Model* model, int32 lodIndex)
         meshData.IndexBuffer.Copy(indexStream.GetData());
         meshData.VertexBuffer.Allocate(meshData.Vertices * sizeof(Float3));
         positionStream.CopyTo(ToSpan(meshData.VertexBuffer.Get<Float3>(), meshData.Vertices));
-        meshData.Use16BitIndexBuffer = mesh.Use16BitIndexBuffer();
+        meshData.Use16BitIndexBuffer = indexStream.GetFormat() == PixelFormat::R16_UInt;
         meshData.Bounds = mesh.GetBox();
     }
 }

From 3a3b997e973c93e9aa55d1d6d350116f9a5c1c21 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 24 Mar 2026 23:46:21 +0100
Subject: [PATCH 158/203] Fix compilation regression

---
 Source/Engine/Graphics/Models/MeshAccessor.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Source/Engine/Graphics/Models/MeshAccessor.h b/Source/Engine/Graphics/Models/MeshAccessor.h
index 820a6db43..595f76c6b 100644
--- a/Source/Engine/Graphics/Models/MeshAccessor.h
+++ b/Source/Engine/Graphics/Models/MeshAccessor.h
@@ -4,6 +4,7 @@
 
 #include "Types.h"
 #include "Engine/Core/Types/DataContainer.h"
+#include "Engine/Core/Collections/Array.h"
 #include "Engine/Graphics/PixelFormat.h"
 #include "Engine/Graphics/PixelFormatSampler.h"
 #include "Engine/Graphics/Shaders/VertexElement.h"
@@ -104,8 +105,8 @@ public:
         void Set(Span<Float2> src);
         void Set(Span<Float3> src);
         void Set(Span<Color> src);
-        template<typename T>
-        void Set(const Array<T>& dst) const
+        template<typename T, typename AllocationType = HeapAllocation>
+        void Set(const Array<T, AllocationType>& dst) const
         {
             Set(Span<T>(dst.Get(), dst.Count()));
         }
@@ -114,8 +115,8 @@ public:
         void CopyTo(Span<Float2> dst) const;
         void CopyTo(Span<Float3> dst) const;
         void CopyTo(Span<Color> dst) const;
-        template<typename T>
-        void CopyTo(Array<T>& dst) const
+        template<typename T, typename AllocationType = HeapAllocation>
+        void CopyTo(Array<T, AllocationType>& dst) const
         {
             dst.Resize(GetCount());
             CopyTo(Span<T>(dst.Get(), dst.Count()));

From 9d478b570ff95bf9bd57bfeefb2bf6dd3e04807a Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 09:11:26 +0100
Subject: [PATCH 159/203] Attempt to fix Github Action issues

---
 .github/workflows/build_android.yml                 |  6 ++++++
 .github/workflows/build_windows.yml                 | 12 ++++++++++++
 .github/workflows/cd.yml                            | 12 ++++++++++++
 .github/workflows/tests.yml                         |  6 ++++++
 Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs |  2 +-
 global.json                                         |  2 +-
 6 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index 772e3f67c..c5da53a0b 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -31,6 +31,12 @@ jobs:
       run: |
         git lfs version
         git lfs pull
+    - name: Configure .NET version
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: 'global.json'
+        search-text: 'latestMajor'
+        replacement-text: 'latestMinor'
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 85f4e0c79..6284a0263 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -28,6 +28,12 @@ jobs:
       run: |
         git lfs version
         git lfs pull
+    - name: Configure .NET version
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: 'global.json'
+        search-text: 'latestMajor'
+        replacement-text: 'latestMinor'
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
@@ -53,6 +59,12 @@ jobs:
       run: |
         git lfs version
         git lfs pull
+    - name: Configure .NET version
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: 'global.json'
+        search-text: 'latestMajor'
+        replacement-text: 'latestMinor'
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 9b7c5c965..a6995b8c8 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -32,6 +32,12 @@ jobs:
       run: |
         dotnet --info
         dotnet workload --info
+    - name: Configure .NET version
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: 'global.json'
+        search-text: 'latestMajor'
+        replacement-text: 'latestMinor'
     - name: Build
       run: |
         .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
@@ -65,6 +71,12 @@ jobs:
       run: |
         dotnet --info
         dotnet workload --info
+    - name: Configure .NET version
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: 'global.json'
+        search-text: 'latestMajor'
+        replacement-text: 'latestMinor'
     - name: Build
       run: |
         .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fdc8e80c9..40d1da844 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -68,6 +68,12 @@ jobs:
       run: |
         git lfs version
         git lfs pull
+    - name: Configure .NET version
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: 'global.json'
+        search-text: 'latestMajor'
+        replacement-text: 'latestMinor'
     - name: Build
       run: |
         .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=8
diff --git a/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs b/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs
index 98a9ef530..d45d0dd4c 100644
--- a/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs
+++ b/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs
@@ -201,7 +201,7 @@ namespace Flax.Deploy
                     Log.Info("Building disk image...");
                     if (File.Exists(dmgPath))
                         File.Delete(dmgPath);
-                    Utilities.Run("hdiutil", $"create -srcFolder \"{appPath}\" -o \"{dmgPath}\"", null, null, Utilities.RunOptions.Default | Utilities.RunOptions.ThrowExceptionOnError);
+                    Utilities.Run("hdiutil", $"create -srcFolder \"{appPath}\" -o \"{dmgPath}\" -force", null, null, Utilities.RunOptions.Default | Utilities.RunOptions.ThrowExceptionOnError);
                     CodeSign(dmgPath);
                     Log.Info("Output disk image size: " + Utilities.GetFileSize(dmgPath));
 
diff --git a/global.json b/global.json
index 9498eeef6..7da276347 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.0",
+    "version": "8.0.100",
     "rollForward": "latestMajor"
   }
 }
\ No newline at end of file

From 22ad2d1fab623134258efb27ba55d5c587da4585 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 09:34:50 +0100
Subject: [PATCH 160/203] Attempt to fix Github Action issues

---
 .github/workflows/build_android.yml |  8 +-------
 .github/workflows/build_windows.yml | 16 ++--------------
 .github/workflows/cd.yml            | 16 ++--------------
 .github/workflows/tests.yml         |  8 +-------
 global.json                         |  2 +-
 5 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index c5da53a0b..5da3767fd 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.419
     - name: Setup .NET Workload
       run: |
         dotnet workload install android
@@ -31,12 +31,6 @@ jobs:
       run: |
         git lfs version
         git lfs pull
-    - name: Configure .NET version
-      uses: richardrigutins/replace-in-files@v2
-      with:
-        files: 'global.json'
-        search-text: 'latestMajor'
-        replacement-text: 'latestMinor'
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 6284a0263..cebe141fb 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.419
     - name: Print .NET info
       run: |
         dotnet --info
@@ -28,12 +28,6 @@ jobs:
       run: |
         git lfs version
         git lfs pull
-    - name: Configure .NET version
-      uses: richardrigutins/replace-in-files@v2
-      with:
-        files: 'global.json'
-        search-text: 'latestMajor'
-        replacement-text: 'latestMinor'
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
@@ -50,7 +44,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.419
     - name: Print .NET info
       run: |
         dotnet --info
@@ -59,12 +53,6 @@ jobs:
       run: |
         git lfs version
         git lfs pull
-    - name: Configure .NET version
-      uses: richardrigutins/replace-in-files@v2
-      with:
-        files: 'global.json'
-        search-text: 'latestMajor'
-        replacement-text: 'latestMinor'
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index a6995b8c8..e515c5df3 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -27,17 +27,11 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.419
     - name: Print .NET info
       run: |
         dotnet --info
         dotnet workload --info
-    - name: Configure .NET version
-      uses: richardrigutins/replace-in-files@v2
-      with:
-        files: 'global.json'
-        search-text: 'latestMajor'
-        replacement-text: 'latestMinor'
     - name: Build
       run: |
         .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
@@ -66,17 +60,11 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.419
     - name: Print .NET info
       run: |
         dotnet --info
         dotnet workload --info
-    - name: Configure .NET version
-      uses: richardrigutins/replace-in-files@v2
-      with:
-        files: 'global.json'
-        search-text: 'latestMajor'
-        replacement-text: 'latestMinor'
     - name: Build
       run: |
         .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 40d1da844..1f2a25b11 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -59,7 +59,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.419
     - name: Print .NET info
       run: |
         dotnet --info
@@ -68,12 +68,6 @@ jobs:
       run: |
         git lfs version
         git lfs pull
-    - name: Configure .NET version
-      uses: richardrigutins/replace-in-files@v2
-      with:
-        files: 'global.json'
-        search-text: 'latestMajor'
-        replacement-text: 'latestMinor'
     - name: Build
       run: |
         .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=8
diff --git a/global.json b/global.json
index 7da276347..92278e8de 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "8.0.419",
     "rollForward": "latestMajor"
   }
 }
\ No newline at end of file

From 64005c2774c9ca5253dd02244800d7d3e80fefab Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 09:49:38 +0100
Subject: [PATCH 161/203] Attempt to fix Github Action issues

---
 .github/workflows/build_android.yml |  8 +++++++-
 .github/workflows/build_windows.yml | 16 ++++++++++++++--
 .github/workflows/cd.yml            | 16 ++++++++++++++--
 .github/workflows/tests.yml         |  8 +++++++-
 global.json                         |  2 +-
 5 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index 5da3767fd..a09af0fa7 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.419
+        dotnet-version: 8.0.x
     - name: Setup .NET Workload
       run: |
         dotnet workload install android
@@ -31,6 +31,12 @@ jobs:
       run: |
         git lfs version
         git lfs pull
+    - name: Configure .NET version
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: 'Source\Tools\Flax.Build\Flax.Build.csproj'
+        search-text: 'LatestMajor'
+        replacement-text: 'LatestMinor'
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index cebe141fb..3f8a8a989 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.419
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -28,6 +28,12 @@ jobs:
       run: |
         git lfs version
         git lfs pull
+    - name: Configure .NET version
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: 'Source\Tools\Flax.Build\Flax.Build.csproj'
+        search-text: 'LatestMajor'
+        replacement-text: 'LatestMinor'
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
@@ -44,7 +50,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.419
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -53,6 +59,12 @@ jobs:
       run: |
         git lfs version
         git lfs pull
+    - name: Configure .NET version
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: 'Source\Tools\Flax.Build\Flax.Build.csproj'
+        search-text: 'LatestMajor'
+        replacement-text: 'LatestMinor'
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index e515c5df3..e5038feb9 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -27,11 +27,17 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.419
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
         dotnet workload --info
+    - name: Configure .NET version
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: 'Source\Tools\Flax.Build\Flax.Build.csproj'
+        search-text: 'LatestMajor'
+        replacement-text: 'LatestMinor'
     - name: Build
       run: |
         .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
@@ -60,11 +66,17 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.419
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
         dotnet workload --info
+    - name: Configure .NET version
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: 'Source\Tools\Flax.Build\Flax.Build.csproj'
+        search-text: 'LatestMajor'
+        replacement-text: 'LatestMinor'
     - name: Build
       run: |
         .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1f2a25b11..08f96fdf4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -59,7 +59,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.419
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -68,6 +68,12 @@ jobs:
       run: |
         git lfs version
         git lfs pull
+    - name: Configure .NET version
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: 'Source\Tools\Flax.Build\Flax.Build.csproj'
+        search-text: 'LatestMajor'
+        replacement-text: 'LatestMinor'
     - name: Build
       run: |
         .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=8
diff --git a/global.json b/global.json
index 92278e8de..7da276347 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.419",
+    "version": "8.0.100",
     "rollForward": "latestMajor"
   }
 }
\ No newline at end of file

From 1e1f7ce56de5b5eade59855cf3407bfd947e4232 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 12:16:41 +0100
Subject: [PATCH 162/203] Attempt to fix Github Action issues

---
 .github/workflows/build_android.yml | 2 +-
 .github/workflows/build_windows.yml | 4 ++--
 .github/workflows/cd.yml            | 4 ++--
 .github/workflows/tests.yml         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index a09af0fa7..0ef942ed0 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Configure .NET version
       uses: richardrigutins/replace-in-files@v2
       with:
-        files: 'Source\Tools\Flax.Build\Flax.Build.csproj'
+        files: '*.csproj'
         search-text: 'LatestMajor'
         replacement-text: 'LatestMinor'
     - name: Build
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 3f8a8a989..aba96d3d6 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -31,7 +31,7 @@ jobs:
     - name: Configure .NET version
       uses: richardrigutins/replace-in-files@v2
       with:
-        files: 'Source\Tools\Flax.Build\Flax.Build.csproj'
+        files: '*.csproj'
         search-text: 'LatestMajor'
         replacement-text: 'LatestMinor'
     - name: Build
@@ -62,7 +62,7 @@ jobs:
     - name: Configure .NET version
       uses: richardrigutins/replace-in-files@v2
       with:
-        files: 'Source\Tools\Flax.Build\Flax.Build.csproj'
+        files: '*.csproj'
         search-text: 'LatestMajor'
         replacement-text: 'LatestMinor'
     - name: Build
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index e5038feb9..d20b6b92c 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Configure .NET version
       uses: richardrigutins/replace-in-files@v2
       with:
-        files: 'Source\Tools\Flax.Build\Flax.Build.csproj'
+        files: '*.csproj'
         search-text: 'LatestMajor'
         replacement-text: 'LatestMinor'
     - name: Build
@@ -74,7 +74,7 @@ jobs:
     - name: Configure .NET version
       uses: richardrigutins/replace-in-files@v2
       with:
-        files: 'Source\Tools\Flax.Build\Flax.Build.csproj'
+        files: '*.csproj'
         search-text: 'LatestMajor'
         replacement-text: 'LatestMinor'
     - name: Build
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 08f96fdf4..00e2d2a56 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -71,7 +71,7 @@ jobs:
     - name: Configure .NET version
       uses: richardrigutins/replace-in-files@v2
       with:
-        files: 'Source\Tools\Flax.Build\Flax.Build.csproj'
+        files: '*.csproj'
         search-text: 'LatestMajor'
         replacement-text: 'LatestMinor'
     - name: Build

From 9850761b5cc314242cdf58b1239b7342cd460efb Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 12:27:50 +0100
Subject: [PATCH 163/203] Fix crash when cloth sim is still active

---
 Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
index 64fe6fd65..02e23d890 100644
--- a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
+++ b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
@@ -1180,6 +1180,8 @@ void ScenePhysX::PreSimulateCloth(int32 i)
     PROFILE_MEM(PhysicsCloth);
     auto clothPhysX = ClothsList[i];
     auto& clothSettings = Cloths[clothPhysX];
+    if (!clothSettings.Actor)
+        return;
 
     if (clothSettings.Actor->OnPreUpdate())
     {

From 7c5b1942e63586c1d2102bb14104ceb6a3b330c1 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 12:44:42 +0100
Subject: [PATCH 164/203] Fix `MaterialBase::GetParameterValue` when parameter
 is not overridden

#3965
---
 Source/Engine/Content/Assets/MaterialBase.cpp | 4 ++--
 Source/Engine/Content/Assets/MaterialBase.h   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/Content/Assets/MaterialBase.cpp b/Source/Engine/Content/Assets/MaterialBase.cpp
index 6ef5f9429..1613ef59a 100644
--- a/Source/Engine/Content/Assets/MaterialBase.cpp
+++ b/Source/Engine/Content/Assets/MaterialBase.cpp
@@ -19,10 +19,10 @@ Variant MaterialBase::GetParameterValue(const StringView& name)
     if (!IsLoaded() && WaitForLoaded())
         return Variant::Null;
     const auto param = Params.Get(name);
+    if (IsMaterialInstance() && param && !param->IsOverride() && ((MaterialInstance*)this)->GetBaseMaterial())
+        return ((MaterialInstance*)this)->GetBaseMaterial()->GetParameterValue(name);
     if (param)
-    {
         return param->GetValue();
-    }
     LOG(Warning, "Missing material parameter '{0}' in material {1}", String(name), ToString());
     return Variant::Null;
 }
diff --git a/Source/Engine/Content/Assets/MaterialBase.h b/Source/Engine/Content/Assets/MaterialBase.h
index f0c32d66a..78f244cb7 100644
--- a/Source/Engine/Content/Assets/MaterialBase.h
+++ b/Source/Engine/Content/Assets/MaterialBase.h
@@ -57,6 +57,8 @@ public:
     /// <summary>
     /// Gets the material parameter value.
     /// </summary>
+    /// <remarks>For material instances that inherit a base material, returned value might come from base material if the current one doesn't override it.</remarks>
+    /// <param name="name">The parameter name.</param>
     /// <returns>The parameter value.</returns>
     API_FUNCTION() Variant GetParameterValue(const StringView& name);
 

From f3e23b6420819528c33e1432470a70df34f7b219 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 12:45:06 +0100
Subject: [PATCH 165/203] Attempt to fix Github Action issues

---
 .github/workflows/build_android.yml |  9 +++++----
 .github/workflows/build_windows.yml | 17 +++++++++--------
 .github/workflows/cd.yml            | 17 +++++++++--------
 .github/workflows/tests.yml         |  9 +++++----
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index 0ef942ed0..a75dc91bd 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
+  DOTNET_ROLL_FORWARD: 'LatestMinor'
 
 jobs:
 
@@ -32,11 +33,11 @@ jobs:
         git lfs version
         git lfs pull
     - name: Configure .NET version
-      uses: richardrigutins/replace-in-files@v2
+      uses: jacobtomlinson/gha-find-replace@3.0.5
       with:
-        files: '*.csproj'
-        search-text: 'LatestMajor'
-        replacement-text: 'LatestMinor'
+        find: "LatestMajor"
+        replace: "LatestMinor"
+        include: "**/*.csproj"
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index aba96d3d6..3c378a3e3 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
+  DOTNET_ROLL_FORWARD: 'LatestMinor'
 
 jobs:
 
@@ -29,11 +30,11 @@ jobs:
         git lfs version
         git lfs pull
     - name: Configure .NET version
-      uses: richardrigutins/replace-in-files@v2
+      uses: jacobtomlinson/gha-find-replace@3.0.5
       with:
-        files: '*.csproj'
-        search-text: 'LatestMajor'
-        replacement-text: 'LatestMinor'
+        find: "LatestMajor"
+        replace: "LatestMinor"
+        include: "**/*.csproj"
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
@@ -60,11 +61,11 @@ jobs:
         git lfs version
         git lfs pull
     - name: Configure .NET version
-      uses: richardrigutins/replace-in-files@v2
+      uses: jacobtomlinson/gha-find-replace@3.0.5
       with:
-        files: '*.csproj'
-        search-text: 'LatestMajor'
-        replacement-text: 'LatestMinor'
+        find: "LatestMajor"
+        replace: "LatestMinor"
+        include: "**/*.csproj"
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index d20b6b92c..fc57d7737 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -7,6 +7,7 @@ on:
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
+  DOTNET_ROLL_FORWARD: 'LatestMinor'
   GIT_LFS_PULL_OPTIONS: '-c lfs.concurrenttransfers=1 -c lfs.transfer.maxretries=2 -c http.version="HTTP/1.1" -c lfs.activitytimeout=60'
 
 jobs:
@@ -33,11 +34,11 @@ jobs:
         dotnet --info
         dotnet workload --info
     - name: Configure .NET version
-      uses: richardrigutins/replace-in-files@v2
+      uses: jacobtomlinson/gha-find-replace@3.0.5
       with:
-        files: '*.csproj'
-        search-text: 'LatestMajor'
-        replacement-text: 'LatestMinor'
+        find: "LatestMajor"
+        replace: "LatestMinor"
+        include: "**/*.csproj"
     - name: Build
       run: |
         .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
@@ -72,11 +73,11 @@ jobs:
         dotnet --info
         dotnet workload --info
     - name: Configure .NET version
-      uses: richardrigutins/replace-in-files@v2
+      uses: jacobtomlinson/gha-find-replace@3.0.5
       with:
-        files: '*.csproj'
-        search-text: 'LatestMajor'
-        replacement-text: 'LatestMinor'
+        find: "LatestMajor"
+        replace: "LatestMinor"
+        include: "**/*.csproj"
     - name: Build
       run: |
         .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 00e2d2a56..d3deba83d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
+  DOTNET_ROLL_FORWARD: 'LatestMinor'
 
 jobs:
 
@@ -69,11 +70,11 @@ jobs:
         git lfs version
         git lfs pull
     - name: Configure .NET version
-      uses: richardrigutins/replace-in-files@v2
+      uses: jacobtomlinson/gha-find-replace@3.0.5
       with:
-        files: '*.csproj'
-        search-text: 'LatestMajor'
-        replacement-text: 'LatestMinor'
+        find: "LatestMajor"
+        replace: "LatestMinor"
+        include: "**/*.csproj"
     - name: Build
       run: |
         .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=8

From aeecadffb073380a4530767e054c2cb507f13dfc Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 13:32:21 +0100
Subject: [PATCH 166/203] Attempt to fix Github Action issues

---
 .github/workflows/build_android.yml |  8 ++++----
 .github/workflows/build_windows.yml | 16 ++++++++--------
 .github/workflows/cd.yml            | 16 ++++++++--------
 .github/workflows/tests.yml         |  8 ++++----
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index a75dc91bd..a0b78225b 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -33,11 +33,11 @@ jobs:
         git lfs version
         git lfs pull
     - name: Configure .NET version
-      uses: jacobtomlinson/gha-find-replace@3.0.5
+      uses: MathieuSoysal/replace-string-in-file@v1.1.0
       with:
-        find: "LatestMajor"
-        replace: "LatestMinor"
-        include: "**/*.csproj"
+        old-string: "LatestMajor"
+        new-string: "LatestMinor"
+        file: Source/Tools/Flax.Build/Flax.Build.csproj
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 3c378a3e3..f66c7d2ec 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -30,11 +30,11 @@ jobs:
         git lfs version
         git lfs pull
     - name: Configure .NET version
-      uses: jacobtomlinson/gha-find-replace@3.0.5
+      uses: MathieuSoysal/replace-string-in-file@v1.1.0
       with:
-        find: "LatestMajor"
-        replace: "LatestMinor"
-        include: "**/*.csproj"
+        old-string: "LatestMajor"
+        new-string: "LatestMinor"
+        file: Source/Tools/Flax.Build/Flax.Build.csproj
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
@@ -61,11 +61,11 @@ jobs:
         git lfs version
         git lfs pull
     - name: Configure .NET version
-      uses: jacobtomlinson/gha-find-replace@3.0.5
+      uses: MathieuSoysal/replace-string-in-file@v1.1.0
       with:
-        find: "LatestMajor"
-        replace: "LatestMinor"
-        include: "**/*.csproj"
+        old-string: "LatestMajor"
+        new-string: "LatestMinor"
+        file: Source/Tools/Flax.Build/Flax.Build.csproj
     - name: Build
       run: |
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index fc57d7737..dd1d73c5f 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -34,11 +34,11 @@ jobs:
         dotnet --info
         dotnet workload --info
     - name: Configure .NET version
-      uses: jacobtomlinson/gha-find-replace@3.0.5
+      uses: MathieuSoysal/replace-string-in-file@v1.1.0
       with:
-        find: "LatestMajor"
-        replace: "LatestMinor"
-        include: "**/*.csproj"
+        old-string: "LatestMajor"
+        new-string: "LatestMinor"
+        file: Source/Tools/Flax.Build/Flax.Build.csproj
     - name: Build
       run: |
         .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
@@ -73,11 +73,11 @@ jobs:
         dotnet --info
         dotnet workload --info
     - name: Configure .NET version
-      uses: jacobtomlinson/gha-find-replace@3.0.5
+      uses: MathieuSoysal/replace-string-in-file@v1.1.0
       with:
-        find: "LatestMajor"
-        replace: "LatestMinor"
-        include: "**/*.csproj"
+        old-string: "LatestMajor"
+        new-string: "LatestMinor"
+        file: Source/Tools/Flax.Build/Flax.Build.csproj
     - name: Build
       run: |
         .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d3deba83d..62e306b4f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -70,11 +70,11 @@ jobs:
         git lfs version
         git lfs pull
     - name: Configure .NET version
-      uses: jacobtomlinson/gha-find-replace@3.0.5
+      uses: MathieuSoysal/replace-string-in-file@v1.1.0
       with:
-        find: "LatestMajor"
-        replace: "LatestMinor"
-        include: "**/*.csproj"
+        old-string: "LatestMajor"
+        new-string: "LatestMinor"
+        file: Source/Tools/Flax.Build/Flax.Build.csproj
     - name: Build
       run: |
         .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=8

From d06be3d1d621b071a945ad587d1d5b24165497b1 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 13:45:21 +0100
Subject: [PATCH 167/203] Fix crash on invalid prefab data size

#3979
---
 Source/Engine/Level/SceneObjectsFactory.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/Engine/Level/SceneObjectsFactory.cpp b/Source/Engine/Level/SceneObjectsFactory.cpp
index 576b95b46..59d23a994 100644
--- a/Source/Engine/Level/SceneObjectsFactory.cpp
+++ b/Source/Engine/Level/SceneObjectsFactory.cpp
@@ -448,8 +448,7 @@ void SceneObjectsFactory::PrefabSyncData::InitNewObjects()
 void SceneObjectsFactory::SetupPrefabInstances(Context& context, const PrefabSyncData& data)
 {
     PROFILE_CPU_NAMED("SetupPrefabInstances");
-    const int32 count = data.Data.Size();
-    ASSERT(count <= data.SceneObjects.Count());
+    const int32 count = Math::Min<int32>(data.Data.Size(), data.SceneObjects.Count());
     Dictionary<Guid, Guid> parentIdsLookup;
     for (int32 i = 0; i < count; i++)
     {

From ecc94069682bcb1141146247f47cce27a8639ad2 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 13:54:14 +0100
Subject: [PATCH 168/203] Attempt to fix Github Action issues

---
 .github/workflows/build_android.yml |  8 ++------
 .github/workflows/build_windows.yml | 16 ++++------------
 .github/workflows/cd.yml            | 16 ++++------------
 .github/workflows/tests.yml         |  8 ++------
 4 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index a0b78225b..931abd8a7 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -32,12 +32,8 @@ jobs:
       run: |
         git lfs version
         git lfs pull
-    - name: Configure .NET version
-      uses: MathieuSoysal/replace-string-in-file@v1.1.0
-      with:
-        old-string: "LatestMajor"
-        new-string: "LatestMinor"
-        file: Source/Tools/Flax.Build/Flax.Build.csproj
     - name: Build
       run: |
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestMinor') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestMinor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index f66c7d2ec..c64867f42 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -29,14 +29,10 @@ jobs:
       run: |
         git lfs version
         git lfs pull
-    - name: Configure .NET version
-      uses: MathieuSoysal/replace-string-in-file@v1.1.0
-      with:
-        old-string: "LatestMajor"
-        new-string: "LatestMinor"
-        file: Source/Tools/Flax.Build/Flax.Build.csproj
     - name: Build
       run: |
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestMinor') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestMinor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
 
   # Game
@@ -60,12 +56,8 @@ jobs:
       run: |
         git lfs version
         git lfs pull
-    - name: Configure .NET version
-      uses: MathieuSoysal/replace-string-in-file@v1.1.0
-      with:
-        old-string: "LatestMajor"
-        new-string: "LatestMinor"
-        file: Source/Tools/Flax.Build/Flax.Build.csproj
     - name: Build
       run: |
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestMinor') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestMinor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index dd1d73c5f..fd7da6d1b 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -33,14 +33,10 @@ jobs:
       run: |
         dotnet --info
         dotnet workload --info
-    - name: Configure .NET version
-      uses: MathieuSoysal/replace-string-in-file@v1.1.0
-      with:
-        old-string: "LatestMajor"
-        new-string: "LatestMinor"
-        file: Source/Tools/Flax.Build/Flax.Build.csproj
     - name: Build
       run: |
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestMinor') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestMinor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
     - name: Upload
       uses: actions/upload-artifact@v4
@@ -72,14 +68,10 @@ jobs:
       run: |
         dotnet --info
         dotnet workload --info
-    - name: Configure .NET version
-      uses: MathieuSoysal/replace-string-in-file@v1.1.0
-      with:
-        old-string: "LatestMajor"
-        new-string: "LatestMinor"
-        file: Source/Tools/Flax.Build/Flax.Build.csproj
     - name: Build
       run: |
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestMinor') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestMinor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
     - name: Upload
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 62e306b4f..7ca4e25a5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -69,14 +69,10 @@ jobs:
       run: |
         git lfs version
         git lfs pull
-    - name: Configure .NET version
-      uses: MathieuSoysal/replace-string-in-file@v1.1.0
-      with:
-        old-string: "LatestMajor"
-        new-string: "LatestMinor"
-        file: Source/Tools/Flax.Build/Flax.Build.csproj
     - name: Build
       run: |
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestMinor') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestMinor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=8
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxTestsTarget
         dotnet msbuild Source\Tools\Flax.Build.Tests\Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo

From 0c1da8e13be727b5bac4774dcdd47f6061ea2fde Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 15:02:58 +0100
Subject: [PATCH 169/203] Attempt to fix Github Action issues

---
 .github/workflows/build_android.yml |  9 +++++----
 .github/workflows/build_windows.yml | 16 +++++++++-------
 .github/workflows/cd.yml            | 16 +++++++++-------
 .github/workflows/tests.yml         |  9 +++++----
 Source/Tools/Flax.Build/global.json |  4 ++--
 global.json                         |  4 ++--
 6 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index 931abd8a7..a899bb933 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
-  DOTNET_ROLL_FORWARD: 'LatestMinor'
+  DOTNET_ROLL_FORWARD: 'disable'
 
 jobs:
 
@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.419
     - name: Setup .NET Workload
       run: |
         dotnet workload install android
@@ -34,6 +34,7 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestMinor') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestMinor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'disable') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'disable') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Disable') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index c64867f42..ab4f60704 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
-  DOTNET_ROLL_FORWARD: 'LatestMinor'
+  DOTNET_ROLL_FORWARD: 'disable'
 
 jobs:
 
@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.419
     - name: Print .NET info
       run: |
         dotnet --info
@@ -31,8 +31,9 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestMinor') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestMinor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'disable') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'disable') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Disable') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
 
   # Game
@@ -47,7 +48,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.419
     - name: Print .NET info
       run: |
         dotnet --info
@@ -58,6 +59,7 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestMinor') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestMinor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'disable') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'disable') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Disable') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index fd7da6d1b..ba5a8aff6 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -7,7 +7,7 @@ on:
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
-  DOTNET_ROLL_FORWARD: 'LatestMinor'
+  DOTNET_ROLL_FORWARD: 'disable'
   GIT_LFS_PULL_OPTIONS: '-c lfs.concurrenttransfers=1 -c lfs.transfer.maxretries=2 -c http.version="HTTP/1.1" -c lfs.activitytimeout=60'
 
 jobs:
@@ -28,15 +28,16 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.419
     - name: Print .NET info
       run: |
         dotnet --info
         dotnet workload --info
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestMinor') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestMinor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'disable') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'disable') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Disable') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
     - name: Upload
       uses: actions/upload-artifact@v4
@@ -63,15 +64,16 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.419
     - name: Print .NET info
       run: |
         dotnet --info
         dotnet workload --info
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestMinor') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestMinor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'disable') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'disable') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Disable') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
     - name: Upload
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7ca4e25a5..8e62c5551 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
-  DOTNET_ROLL_FORWARD: 'LatestMinor'
+  DOTNET_ROLL_FORWARD: 'disable'
 
 jobs:
 
@@ -60,7 +60,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.419
     - name: Print .NET info
       run: |
         dotnet --info
@@ -71,8 +71,9 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestMinor') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestMinor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'disable') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'disable') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Disable') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=8
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxTestsTarget
         dotnet msbuild Source\Tools\Flax.Build.Tests\Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo
diff --git a/Source/Tools/Flax.Build/global.json b/Source/Tools/Flax.Build/global.json
index 9498eeef6..51ccb9126 100644
--- a/Source/Tools/Flax.Build/global.json
+++ b/Source/Tools/Flax.Build/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.0",
+    "version": "8.0.419",
     "rollForward": "latestMajor"
   }
-}
\ No newline at end of file
+}
diff --git a/global.json b/global.json
index 7da276347..51ccb9126 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "8.0.419",
     "rollForward": "latestMajor"
   }
-}
\ No newline at end of file
+}

From 508ccb714cde9250273082a8cf1ae4f32f7cb55a Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 15:18:02 +0100
Subject: [PATCH 170/203] Attempt to fix Github Action issues

---
 .github/workflows/build_android.yml |  8 ++++----
 .github/workflows/build_windows.yml | 14 +++++++-------
 .github/workflows/cd.yml            | 14 +++++++-------
 .github/workflows/tests.yml         |  8 ++++----
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index a899bb933..a0fa73d8b 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
-  DOTNET_ROLL_FORWARD: 'disable'
+  DOTNET_ROLL_FORWARD: 'latestFeature'
 
 jobs:
 
@@ -34,7 +34,7 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'disable') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'disable') | Set-Content Source/Tools/Flax.Build/global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Disable') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestFeature') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'latestFeature') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestFeature') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index ab4f60704..6baec30ef 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
-  DOTNET_ROLL_FORWARD: 'disable'
+  DOTNET_ROLL_FORWARD: 'latestFeature'
 
 jobs:
 
@@ -31,9 +31,9 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'disable') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'disable') | Set-Content Source/Tools/Flax.Build/global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Disable') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestFeature') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'latestFeature') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestFeature') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
 
   # Game
@@ -59,7 +59,7 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'disable') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'disable') | Set-Content Source/Tools/Flax.Build/global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Disable') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestFeature') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'latestFeature') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestFeature') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index ba5a8aff6..4e83d04e2 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -7,7 +7,7 @@ on:
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
-  DOTNET_ROLL_FORWARD: 'disable'
+  DOTNET_ROLL_FORWARD: 'latestFeature'
   GIT_LFS_PULL_OPTIONS: '-c lfs.concurrenttransfers=1 -c lfs.transfer.maxretries=2 -c http.version="HTTP/1.1" -c lfs.activitytimeout=60'
 
 jobs:
@@ -35,9 +35,9 @@ jobs:
         dotnet workload --info
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'disable') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'disable') | Set-Content Source/Tools/Flax.Build/global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Disable') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestFeature') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'latestFeature') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestFeature') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
     - name: Upload
       uses: actions/upload-artifact@v4
@@ -71,9 +71,9 @@ jobs:
         dotnet workload --info
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'disable') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'disable') | Set-Content Source/Tools/Flax.Build/global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Disable') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestFeature') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'latestFeature') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestFeature') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
     - name: Upload
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8e62c5551..f233e51c6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
-  DOTNET_ROLL_FORWARD: 'disable'
+  DOTNET_ROLL_FORWARD: 'latestFeature'
 
 jobs:
 
@@ -71,9 +71,9 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'disable') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'disable') | Set-Content Source/Tools/Flax.Build/global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Disable') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestFeature') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'latestFeature') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestFeature') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=8
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxTestsTarget
         dotnet msbuild Source\Tools\Flax.Build.Tests\Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo

From 4d9898770a8f475b9e56e6b3fd46b562220e4349 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 15:45:51 +0100
Subject: [PATCH 171/203] Attempt to fix Github Action issues

---
 .github/workflows/build_android.yml |  8 ++++----
 .github/workflows/build_windows.yml | 14 +++++++-------
 .github/workflows/cd.yml            | 14 +++++++-------
 .github/workflows/tests.yml         |  8 ++++----
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index a0fa73d8b..741d446f7 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
-  DOTNET_ROLL_FORWARD: 'latestFeature'
+  DOTNET_ROLL_FORWARD: 'minor'
 
 jobs:
 
@@ -34,7 +34,7 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestFeature') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'latestFeature') | Set-Content Source/Tools/Flax.Build/global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestFeature') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'minor') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'minor') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Minor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 6baec30ef..f64e800b3 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
-  DOTNET_ROLL_FORWARD: 'latestFeature'
+  DOTNET_ROLL_FORWARD: 'minor'
 
 jobs:
 
@@ -31,9 +31,9 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestFeature') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'latestFeature') | Set-Content Source/Tools/Flax.Build/global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestFeature') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'minor') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'minor') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Minor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
 
   # Game
@@ -59,7 +59,7 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestFeature') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'latestFeature') | Set-Content Source/Tools/Flax.Build/global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestFeature') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'minor') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'minor') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Minor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 4e83d04e2..4155dca71 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -7,7 +7,7 @@ on:
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
-  DOTNET_ROLL_FORWARD: 'latestFeature'
+  DOTNET_ROLL_FORWARD: 'minor'
   GIT_LFS_PULL_OPTIONS: '-c lfs.concurrenttransfers=1 -c lfs.transfer.maxretries=2 -c http.version="HTTP/1.1" -c lfs.activitytimeout=60'
 
 jobs:
@@ -35,9 +35,9 @@ jobs:
         dotnet workload --info
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestFeature') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'latestFeature') | Set-Content Source/Tools/Flax.Build/global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestFeature') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'minor') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'minor') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Minor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
     - name: Upload
       uses: actions/upload-artifact@v4
@@ -71,9 +71,9 @@ jobs:
         dotnet workload --info
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestFeature') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'latestFeature') | Set-Content Source/Tools/Flax.Build/global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestFeature') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'minor') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'minor') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Minor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
     - name: Upload
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f233e51c6..5202bbb61 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: false
-  DOTNET_ROLL_FORWARD: 'latestFeature'
+  DOTNET_ROLL_FORWARD: 'minor'
 
 jobs:
 
@@ -71,9 +71,9 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        PowerShell "(Get-Content global.json).Replace('latestMajor', 'latestFeature') | Set-Content global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'latestFeature') | Set-Content Source/Tools/Flax.Build/global.json"
-        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'LatestFeature') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
+        PowerShell "(Get-Content global.json).Replace('latestMajor', 'minor') | Set-Content global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/global.json).Replace('latestMajor', 'minor') | Set-Content Source/Tools/Flax.Build/global.json"
+        PowerShell "(Get-Content Source/Tools/Flax.Build/Flax.Build.csproj).Replace('LatestMajor', 'Minor') | Set-Content Source/Tools/Flax.Build/Flax.Build.csproj"
         .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=8
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxTestsTarget
         dotnet msbuild Source\Tools\Flax.Build.Tests\Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo

From 0fe297c3900bb44d8fc5d37f8498094aebbb8cde Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 16:57:38 +0100
Subject: [PATCH 172/203] Minor fixes to #3669

Don't change imported model type, only Prefab can do it conditionally.
Add type of `PrefabObject` to extend it in future with Cameras, Lights, etc.
---
 .../Engine/ContentImporters/ImportModel.cpp   | 74 +++++++++++--------
 .../Tools/ModelTool/ModelTool.Assimp.cpp      |  2 +-
 .../Tools/ModelTool/ModelTool.OpenFBX.cpp     |  2 +-
 Source/Engine/Tools/ModelTool/ModelTool.cpp   | 15 +---
 4 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/Source/Engine/ContentImporters/ImportModel.cpp b/Source/Engine/ContentImporters/ImportModel.cpp
index 5448fe8fb..b2a9434c9 100644
--- a/Source/Engine/ContentImporters/ImportModel.cpp
+++ b/Source/Engine/ContentImporters/ImportModel.cpp
@@ -83,10 +83,14 @@ bool ImportModel::TryGetImportOptions(const StringView& path, Options& options)
 
 struct PrefabObject
 {
+    enum
+    {
+        Model,
+        SkinnedModel,
+    } Type;
     int32 NodeIndex;
     String Name;
     String AssetPath;
-    bool IsSkinned = false;
 };
 
 void RepackMeshLightmapUVs(ModelData& data)
@@ -282,7 +286,7 @@ CreateAssetResult ImportModel::Import(CreateAssetContext& context)
         options.SplitObjects = false;
         options.ObjectIndex = -1;
 
-        // Import all of the objects recursive but use current model data to skip loading file again
+        // Import all the objects recursive but use current model data to skip loading file again
         options.Cached = &cached;
         HashSet<String> objectNames;
         Function<bool(Options& splitOptions, const StringView& objectName, String& outputPath, MeshData* meshData)> splitImport = [&context, &autoImportOutput, &objectNames](Options& splitOptions, const StringView& objectName, String& outputPath, MeshData* meshData)
@@ -329,32 +333,32 @@ CreateAssetResult ImportModel::Import(CreateAssetContext& context)
 
             return AssetsImportingManager::Import(context.InputPath, outputPath, &splitOptions);
         };
-
         auto splitOptions = options;
         LOG(Info, "Splitting imported {0} meshes", meshesByName.Count());
-        
         PrefabObject prefabObject;
         for (int32 groupIndex = 0; groupIndex < meshesByName.Count(); groupIndex++)
         {
             auto& group = meshesByName[groupIndex];
 
             // Cache object options (nested sub-object import removes the meshes)
-            prefabObject.NodeIndex = group.First()->NodeIndex;
-            prefabObject.Name = group.First()->Name;
+            MeshData* firstMesh = group.First();
+            prefabObject.NodeIndex = firstMesh->NodeIndex;
+            prefabObject.Name = firstMesh->Name;
 
-            // Defaul value for ModelType
-            splitOptions.Type = ModelTool::ModelType::Model;
-
-            // Search for Skinned Model
-            if (group.First()->BlendWeights.HasItems() || group.First()->BlendShapes.HasItems() )
+            // Detect model type
+            if ((firstMesh->BlendIndices.HasItems() && firstMesh->BlendWeights.HasItems()) || firstMesh->BlendShapes.HasItems())
             {
-                LOG(Info, "Mesh {0} is Skinned", prefabObject.Name);
                 splitOptions.Type = ModelTool::ModelType::SkinnedModel;
-                prefabObject.IsSkinned = true;
+                prefabObject.Type = PrefabObject::SkinnedModel;
+            }
+            else
+            {
+                splitOptions.Type = ModelTool::ModelType::Model;
+                prefabObject.Type = PrefabObject::Model;
             }
             
             splitOptions.ObjectIndex = groupIndex;
-            if (!splitImport(splitOptions, group.GetKey(), prefabObject.AssetPath, group.First()))
+            if (!splitImport(splitOptions, group.GetKey(), prefabObject.AssetPath, firstMesh))
             {
                 prefabObjects.Add(prefabObject);
             }
@@ -748,26 +752,32 @@ CreateAssetResult ImportModel::CreatePrefab(CreateAssetContext& context, const M
         nodeActors.Clear();
         for (const PrefabObject& e : prefabObjects)
         {
-            if (e.NodeIndex == nodeIndex)
+            if (e.NodeIndex != nodeIndex)
+                continue;
+            Actor* a = nullptr;
+            switch (e.Type)
             {
-                if(e.IsSkinned)
-                {
-                    LOG(Info,"Creating animated model prefab {0}.", e.Name);
-                    auto* actor = New<AnimatedModel>();    
-                    actor->SetName(e.Name);  
-                    if (auto* skinnedModel = Content::LoadAsync<SkinnedModel>(e.AssetPath))
-                        actor->SkinnedModel = skinnedModel;
-                    nodeActors.Add(actor);   
-                }
-                else
-                {
-                    auto* actor = New<StaticModel>();
-                    actor->SetName(e.Name);
-                    if (auto* model = Content::LoadAsync<Model>(e.AssetPath))
-                        actor->Model = model;
-                    nodeActors.Add(actor);
-                }
+            case PrefabObject::Model:
+            {
+                auto* actor = New<StaticModel>();
+                if (auto* model = Content::LoadAsync<Model>(e.AssetPath))
+                    actor->Model = model;
+                a = actor;
+                break;
             }
+            case PrefabObject::SkinnedModel:
+            {
+                auto* actor = New<AnimatedModel>();
+                if (auto* skinnedModel = Content::LoadAsync<SkinnedModel>(e.AssetPath))
+                    actor->SkinnedModel = skinnedModel;
+                a = actor;
+                break;
+            }
+            default:
+                continue;
+            }
+            a->SetName(e.Name);
+            nodeActors.Add(a);
         }
         Actor* nodeActor = nodeActors.Count() == 1 ? nodeActors[0] : New<EmptyActor>();
         if (nodeActors.Count() > 1)
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp b/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
index b93220de4..b1340bfa7 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
@@ -786,7 +786,7 @@ bool ModelTool::ImportDataAssimp(const String& path, ModelData& data, Options& o
     }
 
     // Import skeleton
-    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton) && context.Bones.HasItems())
+    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton))
     {
         data.Skeleton.Nodes.Resize(context.Nodes.Count(), false);
         for (int32 i = 0; i < context.Nodes.Count(); i++)
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp b/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
index e530e7b7c..81ce46d6c 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
@@ -1404,7 +1404,7 @@ bool ModelTool::ImportDataOpenFBX(const String& path, ModelData& data, Options&
     }
 
     // Import skeleton
-    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton) && context.Bones.HasItems())
+    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton))
     {
         data.Skeleton.Nodes.Resize(context.Nodes.Count(), false);
         for (int32 i = 0; i < context.Nodes.Count(); i++)
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.cpp b/Source/Engine/Tools/ModelTool/ModelTool.cpp
index e15c45c5e..48322687c 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp
@@ -1012,12 +1012,6 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
             options.ImportTypes |= ImportDataTypes::Textures;
         break;
     case ModelType::SkinnedModel:
-        if (!data.Skeleton.Bones.HasItems())
-        {
-            LOG(Warning, "Model is not Skinned, it will be imported as Static");
-            options.ImportTypes = ImportDataTypes::Geometry | ImportDataTypes::Nodes;
-            options.Type = ModelType::Model;
-        }
         options.ImportTypes = ImportDataTypes::Geometry | ImportDataTypes::Nodes | ImportDataTypes::Skeleton;
         if (options.ImportMaterials)
             options.ImportTypes |= ImportDataTypes::Materials;
@@ -1058,7 +1052,6 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
             {
                 if (mesh->BlendShapes.IsEmpty())
                     continue;
-                
                 for (int32 blendShapeIndex = mesh->BlendShapes.Count() - 1; blendShapeIndex >= 0; blendShapeIndex--)
                 {
                     auto& blendShape = mesh->BlendShapes[blendShapeIndex];
@@ -1083,8 +1076,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
             }
         }
     }
-    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton) 
-        && (data.Skeleton.Bones.HasItems() || data.LODs[0].Meshes[0]->BlendShapes.HasItems()))
+    if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Skeleton))
     {
         LOG(Info, "Imported skeleton has {0} bones and {1} nodes", data.Skeleton.Bones.Count(), data.Nodes.Count());
 
@@ -1224,7 +1216,9 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
         for (int32 i = 0; i < meshesCount; i++)
         {
             const auto mesh = data.LODs[0].Meshes[i];
-            if ((mesh->BlendIndices.IsEmpty() || mesh->BlendWeights.IsEmpty()) && data.Skeleton.Bones.HasItems())
+
+            // If imported mesh has skeleton but no indices or weights then need to setup those (except in Prefab mode when we conditionally import meshes based on type)
+            if ((mesh->BlendIndices.IsEmpty() || mesh->BlendWeights.IsEmpty()) && data.Skeleton.Bones.HasItems() && (options.Type != ModelType::Prefab))
             {
                 auto indices = Int4::Zero;
                 auto weights = Float4::UnitX;
@@ -2101,7 +2095,6 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
         {
             if (mesh->BlendShapes.IsEmpty())
                 continue;
-
             for (auto& blendShape : mesh->BlendShapes)
             {
                 // Compute min/max for used vertex indices

From 5e6723aa226b112514ac283dcf6e1363f9cf07a3 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 17:16:01 +0100
Subject: [PATCH 173/203] Fix missing init and serialization #2977

---
 Source/Engine/Tools/ModelTool/ModelTool.cpp | 2 ++
 Source/Engine/Tools/ModelTool/ModelTool.h   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/Tools/ModelTool/ModelTool.cpp b/Source/Engine/Tools/ModelTool/ModelTool.cpp
index 1c766a70f..e3da92da2 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp
@@ -593,6 +593,7 @@ void ModelTool::Options::Serialize(SerializeStream& stream, const void* otherObj
     SERIALIZE(SloppyOptimization);
     SERIALIZE(LODTargetError);
     SERIALIZE(ImportMaterials);
+    SERIALIZE(CreateEmptyMaterialSlots);
     SERIALIZE(ImportMaterialsAsInstances);
     SERIALIZE(InstanceToImportAs);
     SERIALIZE(ImportTextures);
@@ -648,6 +649,7 @@ void ModelTool::Options::Deserialize(DeserializeStream& stream, ISerializeModifi
     DESERIALIZE(SloppyOptimization);
     DESERIALIZE(LODTargetError);
     DESERIALIZE(ImportMaterials);
+    DESERIALIZE(CreateEmptyMaterialSlots);
     DESERIALIZE(ImportMaterialsAsInstances);
     DESERIALIZE(InstanceToImportAs);
     DESERIALIZE(ImportTextures);
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.h b/Source/Engine/Tools/ModelTool/ModelTool.h
index ecc95c601..00d7028cf 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.h
+++ b/Source/Engine/Tools/ModelTool/ModelTool.h
@@ -313,9 +313,9 @@ public:
         // If checked, the importer will create materials for model meshes as specified in the file.
         API_FIELD(Attributes="EditorOrder(399), EditorDisplay(\"Materials\"), VisibleIf(nameof(ShowGeometry))")
         bool ImportMaterials = true;
-        // If checked, the importer will create empty material slots for every material.
+        // If checked, the importer will create empty material slots for every material without importing materials nor textures.
         API_FIELD(Attributes="EditorOrder(400), EditorDisplay(\"Materials\"), VisibleIf(nameof(ShowGeometry))")
-        bool CreateEmptyMaterialSlots;
+        bool CreateEmptyMaterialSlots = false;
         // If checked, the importer will create the model's materials as instances of a base material.
         API_FIELD(Attributes="EditorOrder(401), EditorDisplay(\"Materials\"), VisibleIf(nameof(ImportMaterials)), VisibleIf(nameof(ShowGeometry)), VisibleIf(nameof(CreateEmptyMaterialSlots), true)")
         bool ImportMaterialsAsInstances = false;

From 2c742bee41ae91056b2cc4ae7095c354564e4119 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 17:22:38 +0100
Subject: [PATCH 174/203] Fix typo from #3914

---
 Source/Engine/UI/GUI/Special/RadialMenu.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Engine/UI/GUI/Special/RadialMenu.cs b/Source/Engine/UI/GUI/Special/RadialMenu.cs
index 994d81ab2..d52294da8 100644
--- a/Source/Engine/UI/GUI/Special/RadialMenu.cs
+++ b/Source/Engine/UI/GUI/Special/RadialMenu.cs
@@ -130,7 +130,7 @@ namespace FlaxEngine.GUI
         }
 
         /// <summary>
-        /// The material instance of <paramref name="Material"/> used to draw the menu.
+        /// The material instance of <see cref="Material"/> used to draw the menu.
         /// </summary>
         [HideInEditor]
         public MaterialInstance MaterialInstance => _materialInstance;

From 914e0869b12bc1011a2453c6b04419ad534bd5c8 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Feb 2026 18:26:43 +0100
Subject: [PATCH 175/203] Fix warning when building C# lib with newer .NET than
 base version used on deps

---
 Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs b/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
index 54136b490..164cd412f 100644
--- a/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
+++ b/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
@@ -245,6 +245,8 @@ namespace Flax.Build
             args.Add(string.Format("/nullable:{0}", buildOptions.ScriptingAPI.CSharpNullableReferences.ToString().ToLowerInvariant()));
             if (buildOptions.ScriptingAPI.CSharpNullableReferences == CSharpNullableReferences.Disable)
                 args.Add("-nowarn:8632"); // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+            if (buildOptions.Configuration != TargetConfiguration.Release)
+                args.Add("-nowarn:1701"); // Assuming assembly reference 'XXX, Version=8.0.0.0' used by 'Y' matches identity 'X, Version=9.0.0.0' of 'X', you may need to supply runtime policy
 #else
             args.Add("/langversion:7.3");
 #endif

From 0ac5e85cd9e55729f818c5026965078d0ba3155b Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 17:29:25 +0100
Subject: [PATCH 176/203] Code cleanup #3857

---
 Source/Editor/Gizmo/DirectionGizmo.cs | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index 176832c5e..ce1ecee79 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -1,5 +1,6 @@
-using System.Collections.Generic;
-using FlaxEditor.Gizmo;
+// Copyright (c) Wojciech Figat. All rights reserved.
+
+using System.Collections.Generic;
 using FlaxEditor.Viewport;
 using FlaxEngine;
 using FlaxEngine.GUI;
@@ -7,7 +8,7 @@ using FlaxEngine.GUI;
 namespace FlaxEditor.Gizmo;
 
 [HideInEditor]
-public class DirectionGizmo : ContainerControl
+internal class DirectionGizmo : ContainerControl
 {
     private IGizmoOwner _owner;
     private ViewportProjection _viewportProjection;
@@ -88,11 +89,11 @@ public class DirectionGizmo : ContainerControl
         _owner = owner;
         _viewport = owner.Viewport;
         _viewportProjection.Init(owner.Viewport);
-        
+
         _xAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "X", AxisColor = new Color(1.0f, 0.0f, 0.02745f, 1.0f), Negative = false, Direction = AxisDirection.PosX };
         _yAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "Y", AxisColor = new Color(0.239215f, 1.0f, 0.047058f, 1.0f), Negative = false, Direction = AxisDirection.PosY };
         _zAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "Z", AxisColor = new Color(0.0f, 0.0235294f, 1.0f, 1.0f), Negative = false, Direction = AxisDirection.PosZ };
-        
+
         _negXAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-X", AxisColor = new Color(1.0f, 0.0f, 0.02745f, 1.0f), Negative = true, Direction = AxisDirection.NegX };
         _negYAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Y", AxisColor = new Color(0.239215f, 1.0f, 0.047058f, 1.0f), Negative = true, Direction = AxisDirection.NegY };
         _negZAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Z", AxisColor = new Color(0.0f, 0.0235294f, 1.0f, 1.0f), Negative = true, Direction = AxisDirection.NegZ };
@@ -101,7 +102,7 @@ public class DirectionGizmo : ContainerControl
 
         _posHandle = Editor.Instance.Icons.VisjectBoxClosed32;
         _negHandle = Editor.Instance.Icons.VisjectBoxOpen32;
-        
+
         _fontReference = new FontReference(Style.Current.FontSmall);
         _fontReference.Size = 8;
     }
@@ -128,7 +129,7 @@ public class DirectionGizmo : ContainerControl
                 break;
             }
         }
-        
+
         base.OnMouseMove(location);
     }
 
@@ -147,7 +148,7 @@ public class DirectionGizmo : ContainerControl
                 return true;
             }
         }
-        
+
         return false;
     }
 
@@ -166,14 +167,14 @@ public class DirectionGizmo : ContainerControl
 
         _viewport.ViewOrientation = orientation;
     }
-    
+
     /// <summary>
     /// Used to Draw the gizmo.
     /// </summary>
     public override void DrawSelf()
     {
         base.DrawSelf();
- 
+
         _viewportProjection.Init(_owner.Viewport);
         _gizmoCenter = _viewport.Task.View.WorldPosition + _viewport.Task.View.Direction * 1500;
         _viewportProjection.ProjectPoint(_gizmoCenter, out var gizmoCenterScreen);
@@ -223,7 +224,7 @@ public class DirectionGizmo : ContainerControl
         // Sort for correct draw order.
         _axisData.Clear();
         _axisData.AddRange([_xAxisData, _yAxisData, _zAxisData, _negXAxisData, _negYAxisData, _negZAxisData]);
-        _axisData.Sort( (a, b) => -a.Distance.CompareTo(b.Distance));
+        _axisData.Sort((a, b) => -a.Distance.CompareTo(b.Distance));
 
         // Rebuild sprite positions list for hover detection
         _spritePositions.Clear();
@@ -245,7 +246,7 @@ public class DirectionGizmo : ContainerControl
             {
                 Render2D.DrawLine(relativeCenter, tipScreen, axis.AxisColor, 2.0f);
                 Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axis.AxisColor);
-                
+
                 var font = _fontReference.GetFont();
                 Color textColor = isHovered ? Color.White : Color.Black;
                 Render2D.DrawText(font, axis.Label, textColor, tipTextScreen - font.MeasureText(axis.Label) * 0.5f);

From 0cbb2f0525e2eb6c0266327380419ef0d557206b Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 17:39:03 +0100
Subject: [PATCH 177/203] Add smooth viewport orientation movement to Direction
 Gizmo

#3857
---
 Source/Editor/Gizmo/DirectionGizmo.cs             | 3 +--
 Source/Editor/Viewport/EditorViewport.cs          | 4 ++--
 Source/Editor/Viewport/MainEditorGizmoViewport.cs | 2 +-
 Source/Editor/Viewport/PrefabWindowViewport.cs    | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index ce1ecee79..eb2e1777a 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -164,8 +164,7 @@ internal class DirectionGizmo : ContainerControl
             AxisDirection.NegZ => Quaternion.Euler(0, 180, 0),
             _ => Quaternion.Identity
         };
-
-        _viewport.ViewOrientation = orientation;
+        _viewport.OrientViewport(ref orientation);
     }
 
     /// <summary>
diff --git a/Source/Editor/Viewport/EditorViewport.cs b/Source/Editor/Viewport/EditorViewport.cs
index 2182c2f55..5f4c47447 100644
--- a/Source/Editor/Viewport/EditorViewport.cs
+++ b/Source/Editor/Viewport/EditorViewport.cs
@@ -1223,7 +1223,7 @@ namespace FlaxEditor.Viewport
         /// Orients the viewport.
         /// </summary>
         /// <param name="orientation">The orientation.</param>
-        protected void OrientViewport(Quaternion orientation)
+        public void OrientViewport(Quaternion orientation)
         {
             OrientViewport(ref orientation);
         }
@@ -1232,7 +1232,7 @@ namespace FlaxEditor.Viewport
         /// Orients the viewport.
         /// </summary>
         /// <param name="orientation">The orientation.</param>
-        protected virtual void OrientViewport(ref Quaternion orientation)
+        public virtual void OrientViewport(ref Quaternion orientation)
         {
             if (ViewportCamera is FPSCamera fpsCamera)
             {
diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index a76c8a16a..78e4f3eea 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -654,7 +654,7 @@ namespace FlaxEditor.Viewport
         }
 
         /// <inheritdoc />
-        protected override void OrientViewport(ref Quaternion orientation)
+        public override void OrientViewport(ref Quaternion orientation)
         {
             if (TransformGizmo.SelectedParents.Count != 0)
                 FocusSelection(ref orientation);
diff --git a/Source/Editor/Viewport/PrefabWindowViewport.cs b/Source/Editor/Viewport/PrefabWindowViewport.cs
index a8bdc8f20..a599615de 100644
--- a/Source/Editor/Viewport/PrefabWindowViewport.cs
+++ b/Source/Editor/Viewport/PrefabWindowViewport.cs
@@ -681,7 +681,7 @@ namespace FlaxEditor.Viewport
         }
 
         /// <inheritdoc />
-        protected override void OrientViewport(ref Quaternion orientation)
+        public override void OrientViewport(ref Quaternion orientation)
         {
             if (TransformGizmo.SelectedParents.Count != 0)
                 FocusSelection(ref orientation);

From 8356009526a81878a18dfe416dbf65a977de4540 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 17:41:29 +0100
Subject: [PATCH 178/203] Add button to hide direction gizmo

#3857
---
 Source/Editor/Viewport/MainEditorGizmoViewport.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index 78e4f3eea..6b0165190 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -115,7 +115,7 @@ namespace FlaxEditor.Viewport
         private ViewMode _preGameViewViewMode;
         private bool _gameViewWasGridShown;
         private bool _gameViewWasFpsCounterShown;
-        private bool _gameViewWasNagivationShown;
+        private bool _gameViewWasNavigationShown;
 
         /// <summary>
         /// Drag and drop handlers
@@ -251,6 +251,12 @@ namespace FlaxEditor.Viewport
             _showNavigationButton = ViewWidgetShowMenu.AddButton("Navigation", inputOptions.ToggleNavMeshVisibility, () => ShowNavigation = !ShowNavigation);
             _showNavigationButton.CloseMenuOnClick = false;
 
+            // Show direction gizmo widget
+            var showDirectionGizmoButton = ViewWidgetShowMenu.AddButton("Direction Gizmo", () => _directionGizmo.Visible = !_directionGizmo.Visible);
+            showDirectionGizmoButton.AutoCheck = true;
+            showDirectionGizmoButton.CloseMenuOnClick = false;
+            showDirectionGizmoButton.Checked = _directionGizmo.Visible;
+
             // Game View
             ViewWidgetButtonMenu.AddSeparator();
             _toggleGameViewButton = ViewWidgetButtonMenu.AddButton("Game View", inputOptions.ToggleGameView, ToggleGameView);
@@ -521,14 +527,14 @@ namespace FlaxEditor.Viewport
                 _preGameViewViewMode = Task.ViewMode;
                 _gameViewWasGridShown = Grid.Enabled;
                 _gameViewWasFpsCounterShown = ShowFpsCounter;
-                _gameViewWasNagivationShown = ShowNavigation;
+                _gameViewWasNavigationShown = ShowNavigation;
             }
 
             // Set flags & values
             Task.ViewFlags = _gameViewActive ? _preGameViewFlags : ViewFlags.DefaultGame;
             Task.ViewMode = _gameViewActive ? _preGameViewViewMode : ViewMode.Default;
             ShowFpsCounter = _gameViewActive ? _gameViewWasFpsCounterShown : false;
-            ShowNavigation = _gameViewActive ? _gameViewWasNagivationShown : false;
+            ShowNavigation = _gameViewActive ? _gameViewWasNavigationShown : false;
             Grid.Enabled = _gameViewActive ? _gameViewWasGridShown : false;
 
             _gameViewActive = !_gameViewActive;

From 27a1db617c94e3ca459486ec26c2e01d581596c4 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 17:47:56 +0100
Subject: [PATCH 179/203] Add hover color highlight to match transform gizmo in
 direction gizmo

Don't snap shapes to pixels to smooth movement during view rotation

#3857
---
 Source/Editor/Gizmo/DirectionGizmo.cs | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index eb2e1777a..a9a60ae5a 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -174,6 +174,8 @@ internal class DirectionGizmo : ContainerControl
     {
         base.DrawSelf();
 
+        var features = Render2D.Features;
+        Render2D.Features = features & ~Render2D.RenderingFeatures.VertexSnapping;
         _viewportProjection.Init(_owner.Viewport);
         _gizmoCenter = _viewport.Task.View.WorldPosition + _viewport.Task.View.Direction * 1500;
         _viewportProjection.ProjectPoint(_gizmoCenter, out var gizmoCenterScreen);
@@ -241,26 +243,23 @@ internal class DirectionGizmo : ContainerControl
             // Store sprite position for hover detection
             _spritePositions.Add((tipTextScreen, axis.Direction));
 
+            var axisColor = isHovered ? new Color(1.0f, 0.8980392f, 0.039215688f) : axis.AxisColor;
+            var font = _fontReference.GetFont();
             if (!axis.Negative)
             {
-                Render2D.DrawLine(relativeCenter, tipScreen, axis.AxisColor, 2.0f);
-                Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axis.AxisColor);
-
-                var font = _fontReference.GetFont();
-                Color textColor = isHovered ? Color.White : Color.Black;
-                Render2D.DrawText(font, axis.Label, textColor, tipTextScreen - font.MeasureText(axis.Label) * 0.5f);
+                Render2D.DrawLine(relativeCenter, tipScreen, axisColor, 2.0f);
+                Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axisColor);
+                Render2D.DrawText(font, axis.Label, isHovered ? Color.Gray : Color.Black, tipTextScreen - font.MeasureText(axis.Label) * 0.5f);
             }
             else
             {
-                Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axis.AxisColor.RGBMultiplied(0.65f));
-                Render2D.DrawSprite(_negHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axis.AxisColor);
-
+                Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axisColor.RGBMultiplied(0.65f));
+                Render2D.DrawSprite(_negHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axisColor);
                 if (isHovered)
-                {
-                    var font = _fontReference.GetFont();
-                    Render2D.DrawText(font, axis.Label, Color.White, tipTextScreen - font.MeasureText(axis.Label) * 0.5f);
-                }
+                    Render2D.DrawText(font, axis.Label, Color.Black, tipTextScreen - font.MeasureText(axis.Label) * 0.5f);
             }
         }
+
+        Render2D.Features = features;
     }
 }

From 842b25f80fa33b2e5979f14fb7e6bc6763939693 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 18:11:31 +0100
Subject: [PATCH 180/203] Fix Direction Gizmo axes placement in ortho view

#3857
---
 Source/Editor/Gizmo/DirectionGizmo.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index a9a60ae5a..babebbd5b 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -192,6 +192,8 @@ internal class DirectionGizmo : ContainerControl
 
         // Normalize by viewport height to keep size independent of FOV and viewport dimensions
         float heightNormalization = _viewport.Height / 720.0f; // 720 = reference height
+        if (_owner.Viewport.UseOrthographicProjection)
+            heightNormalization /= _owner.Viewport.OrthographicScale * 0.5f; // Fix in ortho view to keep consistent size regardless of zoom level
 
         Float2 xDelta = (xProjected - gizmoCenterScreen) / heightNormalization;
         Float2 yDelta = (yProjected - gizmoCenterScreen) / heightNormalization;

From 3f2e6d82c90d3895e6c7601c3365d7cb6e35c0ec Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 18:44:56 +0100
Subject: [PATCH 181/203] Fix regression from
 21e2c830e5e85f3e8cb852658fdc7930c74d3208 when reimport Animation

#3937
---
 Source/Editor/Windows/Assets/AnimationWindow.cs   |  3 +++
 Source/Editor/Windows/Assets/AssetEditorWindow.cs | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/Source/Editor/Windows/Assets/AnimationWindow.cs b/Source/Editor/Windows/Assets/AnimationWindow.cs
index 8dbcc5921..69da1f9e9 100644
--- a/Source/Editor/Windows/Assets/AnimationWindow.cs
+++ b/Source/Editor/Windows/Assets/AnimationWindow.cs
@@ -431,6 +431,9 @@ namespace FlaxEditor.Windows.Assets
             _isWaitingForTimelineLoad = true;
 
             base.OnItemReimported(item);
+
+            // Drop virtual asset state and get a new one from the reimported file
+            LoadFromOriginal();
         }
 
         /// <inheritdoc />
diff --git a/Source/Editor/Windows/Assets/AssetEditorWindow.cs b/Source/Editor/Windows/Assets/AssetEditorWindow.cs
index eeac84b60..93d6c850c 100644
--- a/Source/Editor/Windows/Assets/AssetEditorWindow.cs
+++ b/Source/Editor/Windows/Assets/AssetEditorWindow.cs
@@ -527,6 +527,16 @@ namespace FlaxEditor.Windows.Assets
             return false;
         }
 
+        /// <summary>
+        /// Loads the asset from the original location to reflect the state (eg. after original asset reimport).
+        /// </summary>
+        protected virtual void LoadFromOriginal()
+        {
+            _asset = LoadAsset();
+            OnAssetLoaded();
+            ClearEditedFlag();
+        }
+
         /// <inheritdoc />
         protected override T LoadAsset()
         {

From 9d0e4e9768b91e33bfeb2739038bfb0724f3c855 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 18:51:12 +0100
Subject: [PATCH 182/203] Fix potential stack overflow inside
 `CustomEditor.RebuildLayout`

#3720
---
 Source/Editor/CustomEditors/CustomEditor.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/Editor/CustomEditors/CustomEditor.cs b/Source/Editor/CustomEditors/CustomEditor.cs
index ff9a14ea3..253fbc590 100644
--- a/Source/Editor/CustomEditors/CustomEditor.cs
+++ b/Source/Editor/CustomEditors/CustomEditor.cs
@@ -52,6 +52,7 @@ namespace FlaxEditor.CustomEditors
         private readonly List<CustomEditor> _children = new List<CustomEditor>();
         private ValueContainer _values;
         private bool _isSetBlocked;
+        private bool _isRebuilding;
         private bool _skipChildrenRefresh;
         private bool _hasValueDirty;
         private bool _rebuildOnRefresh;
@@ -178,7 +179,7 @@ namespace FlaxEditor.CustomEditors
         public void RebuildLayout()
         {
             // Skip rebuilding during init
-            if (CurrentCustomEditor == this)
+            if (CurrentCustomEditor == this || _isRebuilding)
                 return;
 
             // Special case for root objects to run normal layout build
@@ -197,6 +198,7 @@ namespace FlaxEditor.CustomEditors
                 _parent?.RebuildLayout();
                 return;
             }
+            _isRebuilding = true;
             var control = layout.ContainerControl;
             var parent = _parent;
             var parentScrollV = (_presenter?.Panel.Parent as Panel)?.VScrollBar?.Value ?? -1;
@@ -216,6 +218,7 @@ namespace FlaxEditor.CustomEditors
             // Restore scroll value
             if (parentScrollV > -1 && _presenter != null && _presenter.Panel.Parent is Panel panel && panel.VScrollBar != null)
                 panel.VScrollBar.Value = parentScrollV;
+            _isRebuilding = false;
         }
 
         /// <summary>

From a84109df2c1ce625e355e179246dcea39c339aca Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 21:30:07 +0100
Subject: [PATCH 183/203] Add `UnusedStorageLifetime` for asset file TTL

#3931
---
 Source/Engine/Content/Storage/ContentStorageManager.cpp | 1 +
 Source/Engine/Content/Storage/ContentStorageManager.h   | 7 ++++++-
 Source/Engine/Content/Storage/FlaxStorage.cpp           | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Source/Engine/Content/Storage/ContentStorageManager.cpp b/Source/Engine/Content/Storage/ContentStorageManager.cpp
index 80744ae45..8aa36c7be 100644
--- a/Source/Engine/Content/Storage/ContentStorageManager.cpp
+++ b/Source/Engine/Content/Storage/ContentStorageManager.cpp
@@ -46,6 +46,7 @@ namespace
 
 ContentStorageService ContentStorageServiceInstance;
 
+TimeSpan ContentStorageManager::UnusedStorageLifetime = TimeSpan::FromSeconds(0.5f);
 TimeSpan ContentStorageManager::UnusedDataChunksLifetime = TimeSpan::FromSeconds(10);
 
 FlaxStorageReference ContentStorageManager::GetStorage(const StringView& path, bool loadIt)
diff --git a/Source/Engine/Content/Storage/ContentStorageManager.h b/Source/Engine/Content/Storage/ContentStorageManager.h
index 0d56855ea..fac27aa7f 100644
--- a/Source/Engine/Content/Storage/ContentStorageManager.h
+++ b/Source/Engine/Content/Storage/ContentStorageManager.h
@@ -15,7 +15,12 @@ class FLAXENGINE_API ContentStorageManager
 {
 public:
     /// <summary>
-    /// Auto-release timeout for unused asset chunks.
+    /// Auto-release timeout for unused asset files.
+    /// </summary>
+    static TimeSpan UnusedStorageLifetime;
+
+    /// <summary>
+    /// Auto-release timeout for unused asset data chunks.
     /// </summary>
     static TimeSpan UnusedDataChunksLifetime;
 
diff --git a/Source/Engine/Content/Storage/FlaxStorage.cpp b/Source/Engine/Content/Storage/FlaxStorage.cpp
index 6967bb5ad..e286ee326 100644
--- a/Source/Engine/Content/Storage/FlaxStorage.cpp
+++ b/Source/Engine/Content/Storage/FlaxStorage.cpp
@@ -286,14 +286,14 @@ FlaxStorage::LockData FlaxStorage::LockSafe()
 
 uint32 FlaxStorage::GetRefCount() const
 {
-    return (uint32)Platform::AtomicRead((int64*)&_refCount);
+    return (uint32)Platform::AtomicRead(&_refCount);
 }
 
 bool FlaxStorage::ShouldDispose() const
 {
-    return Platform::AtomicRead((int64*)&_refCount) == 0 &&
-            Platform::AtomicRead((int64*)&_chunksLock) == 0 &&
-            Platform::GetTimeSeconds() - _lastRefLostTime >= 0.5; // TTL in seconds
+    return Platform::AtomicRead(&_refCount) == 0 &&
+            Platform::AtomicRead(&_chunksLock) == 0 &&
+            Platform::GetTimeSeconds() - _lastRefLostTime >= ContentStorageManager::UnusedStorageLifetime.GetTotalSeconds();
 }
 
 uint32 FlaxStorage::GetMemoryUsage() const

From c71e1d78e02ef5c284d68c77df8dea8c657638a3 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 25 Mar 2026 22:12:16 +0100
Subject: [PATCH 184/203] polish direction gizmo

- slightly change appearance to be more functional and more pleasant on the eyes
- add options to customize appearance in Viewport editor options
---
 Source/Editor/Gizmo/DirectionGizmo.cs         | 52 +++++++++++++------
 Source/Editor/Options/ViewportOptions.cs      | 28 ++++++++++
 Source/Editor/Viewport/EditorViewport.cs      |  1 -
 .../Viewport/MainEditorGizmoViewport.cs       | 41 ++++++++++-----
 4 files changed, 93 insertions(+), 29 deletions(-)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index babebbd5b..3620f452f 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
+using System;
 using System.Collections.Generic;
+using FlaxEditor.Options;
 using FlaxEditor.Viewport;
 using FlaxEngine;
 using FlaxEngine.GUI;
@@ -10,13 +12,19 @@ namespace FlaxEditor.Gizmo;
 [HideInEditor]
 internal class DirectionGizmo : ContainerControl
 {
+    public const float DefaultGizmoSize = 112.5f;
+
+    private const float AxisLength = 71.25f;
+    private const float SpriteRadius = 10.85f;
+
     private IGizmoOwner _owner;
     private ViewportProjection _viewportProjection;
     private EditorViewport _viewport;
     private Vector3 _gizmoCenter;
-    private float _axisLength = 75.0f;
-    private float _textAxisLength = 95.0f;
-    private float _spriteRadius = 12.0f;
+    private float _gizmoOpacity;
+    private float _backgroundOpacity;
+    private float _axisLength;
+    private float _spriteRadius;
 
     private AxisData _xAxisData;
     private AxisData _yAxisData;
@@ -100,11 +108,26 @@ internal class DirectionGizmo : ContainerControl
         _axisData.EnsureCapacity(6);
         _spritePositions.EnsureCapacity(6);
 
-        _posHandle = Editor.Instance.Icons.VisjectBoxClosed32;
-        _negHandle = Editor.Instance.Icons.VisjectBoxOpen32;
+        var editor = Editor.Instance;
+        _posHandle = editor.Icons.VisjectBoxClosed32;
+        _negHandle = editor.Icons.VisjectBoxOpen32;
 
         _fontReference = new FontReference(Style.Current.FontSmall);
-        _fontReference.Size = 8;
+
+        editor.Options.OptionsChanged += OnEditorOptionsChanged;
+        OnEditorOptionsChanged(editor.Options.Options);
+    }
+
+    private void OnEditorOptionsChanged(EditorOptions options)
+    {
+        float gizmoScale = options.Viewport.DirectionGizmoScale;
+        _axisLength = AxisLength * gizmoScale;
+        _spriteRadius = SpriteRadius * gizmoScale;
+
+        _gizmoOpacity = options.Viewport.DirectionGizmoOpacity;
+        _backgroundOpacity = options.Viewport.DirectionGizmoBackgroundOpacity;
+
+        _fontReference.Size = 8.25f * gizmoScale;
     }
 
     private bool IsPointInSprite(Float2 point, Float2 spriteCenter)
@@ -232,33 +255,32 @@ internal class DirectionGizmo : ContainerControl
         // Rebuild sprite positions list for hover detection
         _spritePositions.Clear();
 
-        Render2D.DrawSprite(_posHandle, new Rectangle(0, 0, Size), Color.Black.AlphaMultiplied(0.1f));
+        Render2D.DrawSprite(_posHandle, new Rectangle(0, 0, Size), Color.Black.AlphaMultiplied(_backgroundOpacity));
 
         // Draw in order from farthest to closest
         for (int i = 0; i < _axisData.Count; i++)
         {
             var axis = _axisData[i];
             Float2 tipScreen = relativeCenter + axis.Delta * _axisLength;
-            Float2 tipTextScreen = relativeCenter + axis.Delta * _textAxisLength;
             bool isHovered = _hoveredAxisIndex == i;
 
             // Store sprite position for hover detection
-            _spritePositions.Add((tipTextScreen, axis.Direction));
+            _spritePositions.Add((tipScreen, axis.Direction));
 
             var axisColor = isHovered ? new Color(1.0f, 0.8980392f, 0.039215688f) : axis.AxisColor;
+            axisColor.A *= _gizmoOpacity;
             var font = _fontReference.GetFont();
             if (!axis.Negative)
             {
-                Render2D.DrawLine(relativeCenter, tipScreen, axisColor, 2.0f);
-                Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axisColor);
-                Render2D.DrawText(font, axis.Label, isHovered ? Color.Gray : Color.Black, tipTextScreen - font.MeasureText(axis.Label) * 0.5f);
+                Render2D.DrawLine(relativeCenter, tipScreen, axisColor, 1.5f);
+                Render2D.DrawSprite(_posHandle, new Rectangle(tipScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axisColor);
+                Render2D.DrawText(font, axis.Label, Color.Black, tipScreen - font.MeasureText(axis.Label) * 0.5f);
             }
             else
             {
-                Render2D.DrawSprite(_posHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axisColor.RGBMultiplied(0.65f));
-                Render2D.DrawSprite(_negHandle, new Rectangle(tipTextScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axisColor);
+                Render2D.DrawSprite(_posHandle, new Rectangle(tipScreen - new Float2(_spriteRadius), new Float2(_spriteRadius * 2)), axisColor.RGBMultiplied(0.85f).AlphaMultiplied(0.8f));
                 if (isHovered)
-                    Render2D.DrawText(font, axis.Label, Color.Black, tipTextScreen - font.MeasureText(axis.Label) * 0.5f);
+                    Render2D.DrawText(font, axis.Label, Color.Black, tipScreen - font.MeasureText(axis.Label) * 0.5f);
             }
         }
 
diff --git a/Source/Editor/Options/ViewportOptions.cs b/Source/Editor/Options/ViewportOptions.cs
index aed633672..6e8903bab 100644
--- a/Source/Editor/Options/ViewportOptions.cs
+++ b/Source/Editor/Options/ViewportOptions.cs
@@ -171,5 +171,33 @@ namespace FlaxEditor.Options
         [DefaultValue(1000.0f), Limit(0.0f, 20000.0f, 5.0f)]
         [EditorDisplay("Viewport Icons"), EditorOrder(410)]
         public float MaxSizeDistance { get; set; } = 1000.0f;
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether the main viewports <see cref="Gizmo.DirectionGizmo"/> is visible.
+        /// </summary>
+        [DefaultValue(true)]
+        [EditorDisplay("Direction Gizmo"), EditorOrder(500), Tooltip("Sets the visibility of the direction gizmo in the main editor viewport.")]
+        public bool ShowDirectionGizmo { get; set; } = true;
+
+        /// <summary>
+        /// Gets or sets a value by which the main viewports <see cref="Gizmo.DirectionGizmo"/> size is multiplied with.
+        /// </summary>
+        [DefaultValue(1f), Limit(0.0f, 2.0f)]
+        [EditorDisplay("Direction Gizmo"), EditorOrder(501), Tooltip("The scale of the direction gizmo in the main viewport.")]
+        public float DirectionGizmoScale { get; set; } = 1f;
+
+        /// <summary>
+        /// Gets or sets a value for the opacity of the main viewports <see cref="Gizmo.DirectionGizmo"/> background.
+        /// </summary>
+        [DefaultValue(0.05f), Limit(0.0f, 1.0f)]
+        [EditorDisplay("Direction Gizmo"), EditorOrder(502), Tooltip("The background opacity of the of the direction gizmo in the main viewport.")]
+        public float DirectionGizmoBackgroundOpacity { get; set; } = 0.05f;
+
+        /// <summary>
+        /// Gets or sets a value for the opacity of the main viewports <see cref="Gizmo.DirectionGizmo"/>.
+        /// </summary>
+        [DefaultValue(0.6f), Limit(0.0f, 1.0f)]
+        [EditorDisplay("Direction Gizmo"), EditorOrder(503), Tooltip("The opacity of the of the direction gizmo in the main viewport.")]
+        public float DirectionGizmoOpacity { get; set; } = 0.6f;
     }
 }
diff --git a/Source/Editor/Viewport/EditorViewport.cs b/Source/Editor/Viewport/EditorViewport.cs
index 5f4c47447..ddcee7084 100644
--- a/Source/Editor/Viewport/EditorViewport.cs
+++ b/Source/Editor/Viewport/EditorViewport.cs
@@ -163,7 +163,6 @@ namespace FlaxEditor.Viewport
         private bool _useMouseAcceleration;
 
         // Input
-
         internal bool _disableInputUpdate;
         private bool _isControllingMouse, _isViewportControllingMouse, _wasVirtualMouseRightDown, _isVirtualMouseRightDown;
         private int _deltaFilteringStep;
diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index 6b0165190..08a4614ac 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -1,17 +1,19 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
-using System;
-using System.Collections.Generic;
 using FlaxEditor.Content;
 using FlaxEditor.Gizmo;
 using FlaxEditor.GUI.ContextMenu;
+using FlaxEditor.Options;
 using FlaxEditor.SceneGraph;
 using FlaxEditor.Scripting;
 using FlaxEditor.Viewport.Modes;
+using FlaxEditor.Viewport.Widgets;
 using FlaxEditor.Windows;
 using FlaxEngine;
 using FlaxEngine.Gizmo;
 using FlaxEngine.GUI;
+using System;
+using System.Collections.Generic;
 using Object = FlaxEngine.Object;
 
 namespace FlaxEditor.Viewport
@@ -26,6 +28,7 @@ namespace FlaxEditor.Viewport
         private readonly ContextMenuButton _showGridButton;
         private readonly ContextMenuButton _showNavigationButton;
         private readonly ContextMenuButton _toggleGameViewButton;
+        private readonly ContextMenuButton _showDirectionGizmoButton;
         private SelectionOutline _customSelectionOutline;
 
         /// <summary>
@@ -226,12 +229,13 @@ namespace FlaxEditor.Viewport
 
             // Add rubber band selector
             _rubberBandSelector = new ViewportRubberBandSelector(this);
-            _directionGizmo = new DirectionGizmo(this);
-            _directionGizmo.AnchorPreset = AnchorPresets.TopRight;
-            _directionGizmo.Parent = this;
-            _directionGizmo.LocalY += 25;
-            _directionGizmo.LocalX -= 150;
-            _directionGizmo.Size = new Float2(150, 150);
+
+            // Add direction gizmo
+            _directionGizmo = new DirectionGizmo(this)
+            {
+                AnchorPreset = AnchorPresets.TopRight,
+                Parent = this,
+            };
 
             // Add grid
             Grid = new GridGizmo(this);
@@ -252,11 +256,10 @@ namespace FlaxEditor.Viewport
             _showNavigationButton.CloseMenuOnClick = false;
 
             // Show direction gizmo widget
-            var showDirectionGizmoButton = ViewWidgetShowMenu.AddButton("Direction Gizmo", () => _directionGizmo.Visible = !_directionGizmo.Visible);
-            showDirectionGizmoButton.AutoCheck = true;
-            showDirectionGizmoButton.CloseMenuOnClick = false;
-            showDirectionGizmoButton.Checked = _directionGizmo.Visible;
-
+            _showDirectionGizmoButton = ViewWidgetShowMenu.AddButton("Direction Gizmo", () => _directionGizmo.Visible = !_directionGizmo.Visible);
+            _showDirectionGizmoButton.AutoCheck = true;
+            _showDirectionGizmoButton.CloseMenuOnClick = false;
+            
             // Game View
             ViewWidgetButtonMenu.AddSeparator();
             _toggleGameViewButton = ViewWidgetButtonMenu.AddButton("Game View", inputOptions.ToggleGameView, ToggleGameView);
@@ -290,6 +293,18 @@ namespace FlaxEditor.Viewport
 
             // Game View
             InputActions.Add(options => options.ToggleGameView, ToggleGameView);
+
+            editor.Options.OptionsChanged += OnEditorOptionsChanged;
+            OnEditorOptionsChanged(editor.Options.Options);
+        }
+
+        private void OnEditorOptionsChanged(EditorOptions options)
+        {
+            _directionGizmo.Visible = options.Viewport.ShowDirectionGizmo;
+            _showDirectionGizmoButton.Checked = _directionGizmo.Visible;
+            _directionGizmo.Size = new Float2(DirectionGizmo.DefaultGizmoSize * options.Viewport.DirectionGizmoScale);
+            _directionGizmo.LocalX = -_directionGizmo.Size.X * 0.5f;
+            _directionGizmo.LocalY = _directionGizmo.Size.Y * 0.5f + ViewportWidgetsContainer.WidgetsHeight;
         }
 
         /// <inheritdoc />

From c9df03d29371d0a899ecc568bb7c212737f6d9cc Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 25 Mar 2026 22:15:38 +0100
Subject: [PATCH 185/203] fix viewport orientation when clicking on axis

---
 Source/Editor/Gizmo/DirectionGizmo.cs             | 13 ++++++-------
 Source/Editor/Viewport/MainEditorGizmoViewport.cs |  5 ++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index 3620f452f..282ebc974 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using FlaxEditor.Options;
 using FlaxEditor.Viewport;
@@ -179,12 +178,12 @@ internal class DirectionGizmo : ContainerControl
     {
         Quaternion orientation = direction switch
         {
-            AxisDirection.PosX => Quaternion.Euler(0, 90, 0),
-            AxisDirection.NegX => Quaternion.Euler(0, -90, 0),
-            AxisDirection.PosY => Quaternion.Euler(-90, 0, 0),
-            AxisDirection.NegY => Quaternion.Euler(90, 0, 0),
-            AxisDirection.PosZ => Quaternion.Euler(0, 0, 0),
-            AxisDirection.NegZ => Quaternion.Euler(0, 180, 0),
+            AxisDirection.PosX => Quaternion.Euler(0, -90, 0),
+            AxisDirection.NegX => Quaternion.Euler(0, 90, 0),
+            AxisDirection.PosY => Quaternion.Euler(90, 0, 0),
+            AxisDirection.NegY => Quaternion.Euler(-90, 0, 0),
+            AxisDirection.PosZ => Quaternion.Euler(0, 180, 0),
+            AxisDirection.NegZ => Quaternion.Euler(0, 0, 0),
             _ => Quaternion.Identity
         };
         _viewport.OrientViewport(ref orientation);
diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index 08a4614ac..6a2a78543 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -1,5 +1,7 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
+using System.Collections.Generic;
+using Object = FlaxEngine.Object;
 using FlaxEditor.Content;
 using FlaxEditor.Gizmo;
 using FlaxEditor.GUI.ContextMenu;
@@ -12,9 +14,6 @@ using FlaxEditor.Windows;
 using FlaxEngine;
 using FlaxEngine.Gizmo;
 using FlaxEngine.GUI;
-using System;
-using System.Collections.Generic;
-using Object = FlaxEngine.Object;
 
 namespace FlaxEditor.Viewport
 {

From c12553812cd74acf177175206980884f426931fc Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 22:31:36 +0100
Subject: [PATCH 186/203] Update `Terrain` scripting API

---
 Source/Editor/Editor.Build.cs                 |  1 +
 .../Editor/Tools/Terrain/EditTerrainGizmo.cs  |  2 +-
 Source/Editor/Tools/Terrain/Paint/Mode.cs     |  4 +--
 Source/Editor/Tools/Terrain/Sculpt/Mode.cs    |  4 +--
 .../Terrain/Undo/EditTerrainMapAction.cs      |  3 +-
 .../Viewport/Previews/MaterialPreview.cs      |  3 +-
 .../Materials/TerrainMaterialShader.cpp       |  5 ++-
 Source/Engine/Terrain/Terrain.Build.cs        | 11 ++++++-
 Source/Engine/Terrain/Terrain.cpp             | 10 ++++++
 Source/Engine/Terrain/Terrain.h               | 24 ++++++++++----
 Source/Engine/Terrain/TerrainPatch.cpp        | 29 +++++++++--------
 Source/Engine/Terrain/TerrainPatch.h          | 32 +++++++++++--------
 12 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/Source/Editor/Editor.Build.cs b/Source/Editor/Editor.Build.cs
index e75954909..3fd8ea98c 100644
--- a/Source/Editor/Editor.Build.cs
+++ b/Source/Editor/Editor.Build.cs
@@ -61,6 +61,7 @@ public class Editor : EditorModule
         options.PrivateDependencies.Add("Renderer");
         options.PrivateDependencies.Add("TextureTool");
         options.PrivateDependencies.Add("Particles");
+        options.PrivateDependencies.Add("Terrain");
 
         var platformToolsRoot = Path.Combine(FolderPath, "Cooker", "Platform");
         var platformToolsRootExternal = Path.Combine(Globals.EngineRoot, "Source", "Platforms");
diff --git a/Source/Editor/Tools/Terrain/EditTerrainGizmo.cs b/Source/Editor/Tools/Terrain/EditTerrainGizmo.cs
index 5fc0e894f..c6926f32e 100644
--- a/Source/Editor/Tools/Terrain/EditTerrainGizmo.cs
+++ b/Source/Editor/Tools/Terrain/EditTerrainGizmo.cs
@@ -89,7 +89,7 @@ namespace FlaxEditor.Tools.Terrain
                 if (!terrain.HasPatch(ref patchCoord) && _planeModel)
                 {
                     var planeSize = 100.0f;
-                    var patchSize = terrain.ChunkSize * FlaxEngine.Terrain.UnitsPerVertex * FlaxEngine.Terrain.PatchEdgeChunksCount;
+                    var patchSize = terrain.PatchSize;
                     Matrix world = Matrix.RotationX(-Mathf.PiOverTwo) *
                                    Matrix.Scaling(patchSize / planeSize) *
                                    Matrix.Translation(patchSize * (0.5f + patchCoord.X), 0, patchSize * (0.5f + patchCoord.Y)) *
diff --git a/Source/Editor/Tools/Terrain/Paint/Mode.cs b/Source/Editor/Tools/Terrain/Paint/Mode.cs
index cee3157d3..624a74c3f 100644
--- a/Source/Editor/Tools/Terrain/Paint/Mode.cs
+++ b/Source/Editor/Tools/Terrain/Paint/Mode.cs
@@ -69,9 +69,9 @@ namespace FlaxEditor.Tools.Terrain.Paint
             var splatmapIndex = ActiveSplatmapIndex;
             var splatmapIndexOther = (splatmapIndex + 1) % 2;
             var chunkSize = terrain.ChunkSize;
-            var heightmapSize = chunkSize * FlaxEngine.Terrain.PatchEdgeChunksCount + 1;
+            var heightmapSize = terrain.HeightmapSize;
             var heightmapLength = heightmapSize * heightmapSize;
-            var patchSize = chunkSize * FlaxEngine.Terrain.UnitsPerVertex * FlaxEngine.Terrain.PatchEdgeChunksCount;
+            var patchSize = terrain.PatchSize;
             var tempBuffer = (Color32*)gizmo.GetSplatmapTempBuffer(heightmapLength * Color32.SizeInBytes, splatmapIndex).ToPointer();
             var tempBufferOther = (Color32*)gizmo.GetSplatmapTempBuffer(heightmapLength * Color32.SizeInBytes, (splatmapIndex + 1) % 2).ToPointer();
             var unitsPerVertexInv = 1.0f / FlaxEngine.Terrain.UnitsPerVertex;
diff --git a/Source/Editor/Tools/Terrain/Sculpt/Mode.cs b/Source/Editor/Tools/Terrain/Sculpt/Mode.cs
index f37902f39..55d11b21a 100644
--- a/Source/Editor/Tools/Terrain/Sculpt/Mode.cs
+++ b/Source/Editor/Tools/Terrain/Sculpt/Mode.cs
@@ -70,9 +70,9 @@ namespace FlaxEditor.Tools.Terrain.Sculpt
 
             // Prepare
             var chunkSize = terrain.ChunkSize;
-            var heightmapSize = chunkSize * FlaxEngine.Terrain.PatchEdgeChunksCount + 1;
+            var heightmapSize = terrain.HeightmapSize;
             var heightmapLength = heightmapSize * heightmapSize;
-            var patchSize = chunkSize * FlaxEngine.Terrain.UnitsPerVertex * FlaxEngine.Terrain.PatchEdgeChunksCount;
+            var patchSize = terrain.PatchSize;
             var tempBuffer = (float*)gizmo.GetHeightmapTempBuffer(heightmapLength * sizeof(float)).ToPointer();
             var unitsPerVertexInv = 1.0f / FlaxEngine.Terrain.UnitsPerVertex;
 
diff --git a/Source/Editor/Tools/Terrain/Undo/EditTerrainMapAction.cs b/Source/Editor/Tools/Terrain/Undo/EditTerrainMapAction.cs
index afac0948e..93fc0470e 100644
--- a/Source/Editor/Tools/Terrain/Undo/EditTerrainMapAction.cs
+++ b/Source/Editor/Tools/Terrain/Undo/EditTerrainMapAction.cs
@@ -85,8 +85,7 @@ namespace FlaxEditor.Tools.Terrain.Undo
         {
             _terrain = terrain.ID;
             _patches = new List<PatchData>(4);
-            var chunkSize = terrain.ChunkSize;
-            var heightmapSize = chunkSize * FlaxEngine.Terrain.PatchEdgeChunksCount + 1;
+            var heightmapSize = terrain.HeightmapSize;
             _heightmapLength = heightmapSize * heightmapSize;
             _heightmapDataSize = _heightmapLength * stride;
 
diff --git a/Source/Editor/Viewport/Previews/MaterialPreview.cs b/Source/Editor/Viewport/Previews/MaterialPreview.cs
index 8ba8a00ee..e494df14a 100644
--- a/Source/Editor/Viewport/Previews/MaterialPreview.cs
+++ b/Source/Editor/Viewport/Previews/MaterialPreview.cs
@@ -303,8 +303,7 @@ namespace FlaxEditor.Viewport.Previews
             {
                 _terrain = new Terrain();
                 _terrain.Setup(1, 63);
-                var chunkSize = _terrain.ChunkSize;
-                var heightMapSize = chunkSize * Terrain.PatchEdgeChunksCount + 1;
+                var heightMapSize = _terrain.HeightmapSize;
                 var heightMapLength = heightMapSize * heightMapSize;
                 var heightmap = new float[heightMapLength];
                 var patchCoord = new Int2(0, 0);
diff --git a/Source/Engine/Graphics/Materials/TerrainMaterialShader.cpp b/Source/Engine/Graphics/Materials/TerrainMaterialShader.cpp
index b6b455f20..30aa8b280 100644
--- a/Source/Engine/Graphics/Materials/TerrainMaterialShader.cpp
+++ b/Source/Engine/Graphics/Materials/TerrainMaterialShader.cpp
@@ -88,9 +88,8 @@ void TerrainMaterialShader::Bind(BindParameters& params)
     }
 
     // Bind terrain textures
-    const auto heightmap = drawCall.Terrain.Patch->Heightmap->GetTexture();
-    const auto splatmap0 = drawCall.Terrain.Patch->Splatmap[0] ? drawCall.Terrain.Patch->Splatmap[0]->GetTexture() : nullptr;
-    const auto splatmap1 = drawCall.Terrain.Patch->Splatmap[1] ? drawCall.Terrain.Patch->Splatmap[1]->GetTexture() : nullptr;
+    GPUTexture* heightmap, *splatmap0, *splatmap1;
+    drawCall.Terrain.Patch->GetTextures(heightmap, splatmap0, splatmap1);
     context->BindSR(0, heightmap);
     context->BindSR(1, splatmap0);
     context->BindSR(2, splatmap1);
diff --git a/Source/Engine/Terrain/Terrain.Build.cs b/Source/Engine/Terrain/Terrain.Build.cs
index 178938da8..55a590dd2 100644
--- a/Source/Engine/Terrain/Terrain.Build.cs
+++ b/Source/Engine/Terrain/Terrain.Build.cs
@@ -8,13 +8,22 @@ using Flax.Build.NativeCpp;
 /// </summary>
 public class Terrain : EngineModule
 {
+    /// <summary>
+    /// Enables terrain editing and changing at runtime. If your game doesn't use procedural terrain in game then disable this option to reduce build size.
+    /// </summary>
+    public static bool WithEditing = true;
+
     /// <inheritdoc />
     public override void Setup(BuildOptions options)
     {
         base.Setup(options);
 
-        options.PrivateDependencies.Add("Physics");
+        if (!WithEditing)
+        {
+            options.PublicDefinitions.Add("TERRAIN_EDITING=0");
+        }
 
+        options.PrivateDependencies.Add("Physics");
         if (options.Target.IsEditor)
         {
             options.PrivateDependencies.Add("ContentImporters");
diff --git a/Source/Engine/Terrain/Terrain.cpp b/Source/Engine/Terrain/Terrain.cpp
index f0ad65894..9185f71a9 100644
--- a/Source/Engine/Terrain/Terrain.cpp
+++ b/Source/Engine/Terrain/Terrain.cpp
@@ -306,6 +306,16 @@ void Terrain::SetPhysicalMaterials(const Array<JsonAssetReference<PhysicalMateri
     }
 }
 
+int32 Terrain::GetHeightmapSize() const
+{
+    return GetChunkSize() * ChunksCountEdge + 1;
+}
+
+float Terrain::GetPatchSize() const
+{
+    return TERRAIN_UNITS_PER_VERTEX * ChunksCountEdge * GetChunkSize();
+}
+
 TerrainPatch* Terrain::GetPatch(const Int2& patchCoord) const
 {
     return GetPatch(patchCoord.X, patchCoord.Y);
diff --git a/Source/Engine/Terrain/Terrain.h b/Source/Engine/Terrain/Terrain.h
index 5c671629d..984f3d388 100644
--- a/Source/Engine/Terrain/Terrain.h
+++ b/Source/Engine/Terrain/Terrain.h
@@ -21,11 +21,14 @@ struct RenderView;
 // Amount of units per terrain geometry vertex (can be adjusted per terrain instance using non-uniform scale factor)
 #define TERRAIN_UNITS_PER_VERTEX 100.0f
 
-// Enable/disable terrain editing and changing at runtime. If your game doesn't use procedural terrain in game then disable this option to reduce build size.
+#ifndef TERRAIN_EDITING
+// Enables terrain editing and changing at runtime. If your game doesn't use procedural terrain in game then disable this option to reduce build size.
 #define TERRAIN_EDITING 1
+#endif
 
 // Enable/disable terrain heightmap samples modification and gather. Used by the editor to modify the terrain with the brushes.
-#define TERRAIN_UPDATING 1
+// [Deprecated in 1.12, use TERRAIN_EDITING instead]
+#define TERRAIN_UPDATING (TERRAIN_EDITING)
 
 // Enable/disable terrain physics collision drawing
 #define TERRAIN_USE_PHYSICS_DEBUG (USE_EDITOR && 1)
@@ -240,6 +243,18 @@ public:
         return static_cast<int32>(_chunkSize);
     }
 
+    /// <summary>
+    /// Gets the heightmap texture size (square) used by a single patch (shared by all chunks within that patch).
+    /// </summary>
+    /// <remarks>ChunkSize * ChunksCountEdge + 1</remarks>
+    API_PROPERTY() int32 GetHeightmapSize() const;
+
+    /// <summary>
+    /// Gets the size of the patch in world-units (square) without actor scale.
+    /// </summary>
+    /// <remarks>UnitsPerVertex * ChunksCountEdge * ChunkSize</remarks>
+    API_PROPERTY() float GetPatchSize() const;
+
     /// <summary>
     /// Gets the terrain patches count. Each patch contains 16 chunks arranged into a 4x4 square.
     /// </summary>
@@ -329,7 +344,6 @@ public:
     API_FUNCTION() void SetChunkOverrideMaterial(API_PARAM(Ref) const Int2& patchCoord, API_PARAM(Ref) const Int2& chunkCoord, MaterialBase* value);
 
 #if TERRAIN_EDITING
-
     /// <summary>
     /// Setups the terrain patch using the specified heightmap data.
     /// </summary>
@@ -352,10 +366,6 @@ public:
     /// <returns>True if failed, otherwise false.</returns>
     API_FUNCTION() bool SetupPatchSplatMap(API_PARAM(Ref) const Int2& patchCoord, int32 index, int32 splatMapLength, const Color32* splatMap, bool forceUseVirtualStorage = false);
 
-#endif
-
-public:
-#if TERRAIN_EDITING
     /// <summary>
     /// Setups the terrain. Clears the existing data.
     /// </summary>
diff --git a/Source/Engine/Terrain/TerrainPatch.cpp b/Source/Engine/Terrain/TerrainPatch.cpp
index 61bbf7e3c..cadc9821c 100644
--- a/Source/Engine/Terrain/TerrainPatch.cpp
+++ b/Source/Engine/Terrain/TerrainPatch.cpp
@@ -17,6 +17,7 @@
 #include "Engine/Threading/Threading.h"
 #if TERRAIN_EDITING
 #include "Engine/Core/Math/Packed.h"
+#include "Engine/Core/Collections/ArrayExtensions.h"
 #include "Engine/Graphics/PixelFormatExtensions.h"
 #include "Engine/Graphics/RenderTools.h"
 #include "Engine/Graphics/RenderView.h"
@@ -27,11 +28,6 @@
 #include "Editor/Editor.h"
 #include "Engine/ContentImporters/AssetsImportingManager.h"
 #endif
-#endif
-#if TERRAIN_EDITING || TERRAIN_UPDATING
-#include "Engine/Core/Collections/ArrayExtensions.h"
-#endif
-#if USE_EDITOR
 #include "Engine/Debug/DebugDraw.h"
 #endif
 #if TERRAIN_USE_PHYSICS_DEBUG
@@ -90,7 +86,7 @@ void TerrainPatch::Init(Terrain* terrain, int16 x, int16 z)
         Splatmap[i] = nullptr;
     }
     _heightfield = nullptr;
-#if TERRAIN_UPDATING
+#if TERRAIN_EDITING
     _cachedHeightMap.Resize(0);
     _cachedHolesMask.Resize(0);
     _wasHeightModified = false;
@@ -114,7 +110,7 @@ void TerrainPatch::Init(Terrain* terrain, int16 x, int16 z)
 
 TerrainPatch::~TerrainPatch()
 {
-#if TERRAIN_UPDATING
+#if TERRAIN_EDITING
     SAFE_DELETE(_dataHeightmap);
     for (int32 i = 0; i < TERRAIN_MAX_SPLATMAPS_COUNT; i++)
     {
@@ -134,6 +130,13 @@ RawDataAsset* TerrainPatch::GetHeightfield() const
     return _heightfield.Get();
 }
 
+void TerrainPatch::GetTextures(GPUTexture*& heightmap, GPUTexture*& splatmap0, GPUTexture*& splatmap1) const
+{
+    heightmap = Heightmap->GetTexture();
+    splatmap0 = Splatmap[0] ? Splatmap[0]->GetTexture() : nullptr;
+    splatmap1 = Splatmap[1] ? Splatmap[1]->GetTexture() : nullptr;
+}
+
 void TerrainPatch::RemoveLightmap()
 {
     for (auto& chunk : Chunks)
@@ -178,7 +181,7 @@ void TerrainPatch::UpdateTransform()
     _collisionVertices.Resize(0);
 }
 
-#if TERRAIN_EDITING || TERRAIN_UPDATING
+#if TERRAIN_EDITING
 
 bool IsValidMaterial(const JsonAssetReference<PhysicalMaterial>& e)
 {
@@ -217,7 +220,7 @@ struct TerrainDataUpdateInfo
     // When using physical materials, then get splatmaps data required for per-triangle material indices
     void GetSplatMaps()
     {
-#if TERRAIN_UPDATING
+#if TERRAIN_EDITING
         if (SplatMaps[0])
             return;
         if (UsePhysicalMaterials())
@@ -1021,7 +1024,7 @@ bool TerrainPatch::SetupHeightMap(int32 heightMapLength, const float* heightMap,
     _terrain->UpdateBounds();
     _terrain->UpdateLayerBits();
 
-#if TERRAIN_UPDATING
+#if TERRAIN_EDITING
     // Invalidate cache
     _cachedHeightMap.Resize(0);
     _cachedHolesMask.Resize(0);
@@ -1169,7 +1172,7 @@ bool TerrainPatch::SetupSplatMap(int32 index, int32 splatMapLength, const Color3
     }
 #endif
 
-#if TERRAIN_UPDATING
+#if TERRAIN_EDITING
     // Invalidate cache
     _cachedSplatMap[index].Resize(0);
     _wasSplatmapModified[index] = false;
@@ -1191,7 +1194,7 @@ bool TerrainPatch::InitializeHeightMap()
     return SetupHeightMap(heightmap.Count(), heightmap.Get());
 }
 
-#if TERRAIN_UPDATING
+#if TERRAIN_EDITING
 
 float* TerrainPatch::GetHeightmapData()
 {
@@ -2631,7 +2634,7 @@ void TerrainPatch::Serialize(SerializeStream& stream, const void* otherObj)
     }
     stream.EndArray();
 
-#if TERRAIN_UPDATING
+#if TERRAIN_EDITING
     SaveHeightData();
     SaveSplatData();
 #endif
diff --git a/Source/Engine/Terrain/TerrainPatch.h b/Source/Engine/Terrain/TerrainPatch.h
index 7d85c5b1c..79e56e6da 100644
--- a/Source/Engine/Terrain/TerrainPatch.h
+++ b/Source/Engine/Terrain/TerrainPatch.h
@@ -12,6 +12,10 @@
 struct RayCastHit;
 class TerrainMaterialShader;
 
+#ifndef TERRAIN_EDITING
+#define TERRAIN_EDITING 1
+#endif
+
 /// <summary>
 /// Represents single terrain patch made of 16 terrain chunks.
 /// </summary>
@@ -34,7 +38,7 @@ private:
     void* _physicsHeightField;
     CriticalSection _collisionLocker;
     float _collisionScaleXZ;
-#if TERRAIN_UPDATING
+#if TERRAIN_EDITING
     Array<float> _cachedHeightMap;
     Array<byte> _cachedHolesMask;
     Array<Color32> _cachedSplatMap[TERRAIN_MAX_SPLATMAPS_COUNT];
@@ -189,6 +193,8 @@ public:
         return _bounds;
     }
 
+    void GetTextures(GPUTexture*& heightmap, GPUTexture*& splatmap0, GPUTexture*& splatmap1) const;
+
 public:
     /// <summary>
     /// Removes the lightmap data from the terrain patch.
@@ -220,7 +226,7 @@ public:
     /// <param name="holesMask">The holes mask (optional). Normalized to 0-1 range values with holes mask per-vertex. Must match the heightmap dimensions.</param>
     /// <param name="forceUseVirtualStorage">If set to <c>true</c> patch will use virtual storage by force. Otherwise it can use normal texture asset storage on drive (valid only during Editor). Runtime-created terrain can only use virtual storage (in RAM).</param>
     /// <returns>True if failed, otherwise false.</returns>
-    API_FUNCTION() bool SetupHeightMap(int32 heightMapLength, API_PARAM(Ref) const float* heightMap, API_PARAM(Ref) const byte* holesMask = nullptr, bool forceUseVirtualStorage = false);
+    API_FUNCTION() bool SetupHeightMap(int32 heightMapLength, const float* heightMap, const byte* holesMask = nullptr, bool forceUseVirtualStorage = false);
 
     /// <summary>
     /// Setups the terrain patch layer weights using the specified splatmaps data.
@@ -230,14 +236,12 @@ public:
     /// <param name="splatMap">The splat map. Each array item contains 4 layer weights.</param>
     /// <param name="forceUseVirtualStorage">If set to <c>true</c> patch will use virtual storage by force. Otherwise it can use normal texture asset storage on drive (valid only during Editor). Runtime-created terrain can only use virtual storage (in RAM).</param>
     /// <returns>True if failed, otherwise false.</returns>
-    API_FUNCTION() bool SetupSplatMap(int32 index, int32 splatMapLength, API_PARAM(Ref) const Color32* splatMap, bool forceUseVirtualStorage = false);
-#endif
+    API_FUNCTION() bool SetupSplatMap(int32 index, int32 splatMapLength, const Color32* splatMap, bool forceUseVirtualStorage = false);
 
-#if TERRAIN_UPDATING
     /// <summary>
-    /// Gets the raw pointer to the heightmap data.
+    /// Gets the raw pointer to the heightmap data. Array size is square of Terrain.HeightmapSize.
     /// </summary>
-    /// <returns>The heightmap data.</returns>
+    /// <returns>The heightmap data. Null if empty or failed to access it.</returns>
     API_FUNCTION() float* GetHeightmapData();
 
     /// <summary>
@@ -246,9 +250,9 @@ public:
     API_FUNCTION() void ClearHeightmapCache();
 
     /// <summary>
-    /// Gets the raw pointer to the holes mask data.
+    /// Gets the raw pointer to the holes mask data. Array size is square of Terrain.HeightmapSize.
     /// </summary>
-    /// <returns>The holes mask data.</returns>
+    /// <returns>The holes mask data. Null if empty/unused or failed to access it.</returns>
     API_FUNCTION() byte* GetHolesMaskData();
 
     /// <summary>
@@ -257,10 +261,10 @@ public:
     API_FUNCTION() void ClearHolesMaskCache();
 
     /// <summary>
-    /// Gets the raw pointer to the splat map data.
+    /// Gets the raw pointer to the splat map data. Array size is square of Terrain.HeightmapSize.
     /// </summary>
     /// <param name="index">The zero-based index of the splatmap texture.</param>
-    /// <returns>The splat map data.</returns>
+    /// <returns>The splat map data. Null if empty/unused or failed to access it.</returns>
     API_FUNCTION() Color32* GetSplatMapData(int32 index);
 
     /// <summary>
@@ -280,7 +284,7 @@ public:
     /// <param name="modifiedOffset">The offset from the first row and column of the heightmap data (offset destination x and z start position).</param>
     /// <param name="modifiedSize">The size of the heightmap to modify (x and z). Amount of samples in each direction.</param>
     /// <returns>True if failed, otherwise false.</returns>
-    API_FUNCTION() bool ModifyHeightMap(API_PARAM(Ref) const float* samples, API_PARAM(Ref) const Int2& modifiedOffset, API_PARAM(Ref) const Int2& modifiedSize);
+    API_FUNCTION() bool ModifyHeightMap(const float* samples, const Int2& modifiedOffset, const Int2& modifiedSize);
 
     /// <summary>
     /// Modifies the terrain patch holes mask with the given samples.
@@ -289,7 +293,7 @@ public:
     /// <param name="modifiedOffset">The offset from the first row and column of the holes map data (offset destination x and z start position).</param>
     /// <param name="modifiedSize">The size of the holes map to modify (x and z). Amount of samples in each direction.</param>
     /// <returns>True if failed, otherwise false.</returns>
-    API_FUNCTION() bool ModifyHolesMask(API_PARAM(Ref) const byte* samples, API_PARAM(Ref) const Int2& modifiedOffset, API_PARAM(Ref) const Int2& modifiedSize);
+    API_FUNCTION() bool ModifyHolesMask(const byte* samples, const Int2& modifiedOffset, const Int2& modifiedSize);
 
     /// <summary>
     /// Modifies the terrain patch splat map (layers mask) with the given samples.
@@ -299,7 +303,7 @@ public:
     /// <param name="modifiedOffset">The offset from the first row and column of the splat map data (offset destination x and z start position).</param>
     /// <param name="modifiedSize">The size of the splat map to modify (x and z). Amount of samples in each direction.</param>
     /// <returns>True if failed, otherwise false.</returns>
-    API_FUNCTION() bool ModifySplatMap(int32 index, API_PARAM(Ref) const Color32* samples, API_PARAM(Ref) const Int2& modifiedOffset, API_PARAM(Ref) const Int2& modifiedSize);
+    API_FUNCTION() bool ModifySplatMap(int32 index, const Color32* samples, const Int2& modifiedOffset, const Int2& modifiedSize);
 
 private:
     bool UpdateHeightData(struct TerrainDataUpdateInfo& info, const Int2& modifiedOffset, const Int2& modifiedSize, bool wasHeightRangeChanged, bool wasHeightChanged);

From 32af903a2dba8cb0084d35acb1febfd4f27dc3f3 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 25 Mar 2026 22:31:53 +0100
Subject: [PATCH 187/203] Fix crash when exporting terrain that has missing
 patch data

---
 Source/Editor/Tools/Terrain/TerrainTools.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/Tools/Terrain/TerrainTools.cpp b/Source/Editor/Tools/Terrain/TerrainTools.cpp
index 861cb975b..8e83e77cf 100644
--- a/Source/Editor/Tools/Terrain/TerrainTools.cpp
+++ b/Source/Editor/Tools/Terrain/TerrainTools.cpp
@@ -382,7 +382,8 @@ bool TerrainTools::ExportTerrain(Terrain* terrain, String outputFolder)
     const Int2 heightmapSize = size * Terrain::ChunksCountEdge * terrain->GetChunkSize() + 1;
     Array<float> heightmap;
     heightmap.Resize(heightmapSize.X * heightmapSize.Y);
-    heightmap.SetAll(firstPatch->GetHeightmapData()[0]);
+    if (const float* heightmapData = firstPatch->GetHeightmapData())
+        heightmap.SetAll(heightmapData[0]);
 
     // Fill heightmap with data from all patches
     const int32 rowSize = terrain->GetChunkSize() * Terrain::ChunksCountEdge + 1;
@@ -392,8 +393,16 @@ bool TerrainTools::ExportTerrain(Terrain* terrain, String outputFolder)
         const Int2 pos(patch->GetX() - start.X, patch->GetZ() - start.Y);
         const float* src = patch->GetHeightmapData();
         float* dst = heightmap.Get() + pos.X * (rowSize - 1) + pos.Y * heightmapSize.X * (rowSize - 1);
-        for (int32 row = 0; row < rowSize; row++)
-            Platform::MemoryCopy(dst + row * heightmapSize.X, src + row * rowSize, rowSize * sizeof(float));
+        if (src)
+        {
+            for (int32 row = 0; row < rowSize; row++)
+                Platform::MemoryCopy(dst + row * heightmapSize.X, src + row * rowSize, rowSize * sizeof(float));
+        }
+        else
+        {
+            for (int32 row = 0; row < rowSize; row++)
+                Platform::MemoryClear(dst + row * heightmapSize.X, rowSize * sizeof(float));
+        }
     }
 
     // Interpolate to 16-bit int

From e455c874c6a57119173ea347b47f09d1fd9e8a68 Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 25 Mar 2026 22:57:17 +0100
Subject: [PATCH 188/203] tweak Z axis color and add brightness option

https://discord.com/channels/437989205315158016/509056735844106251/1486480204242096369
---
 Source/Editor/Gizmo/DirectionGizmo.cs    |  9 +++++----
 Source/Editor/Options/ViewportOptions.cs | 11 +++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index 282ebc974..b04eb8d8d 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -20,6 +20,7 @@ internal class DirectionGizmo : ContainerControl
     private ViewportProjection _viewportProjection;
     private EditorViewport _viewport;
     private Vector3 _gizmoCenter;
+    private float _gizmoBrightness;
     private float _gizmoOpacity;
     private float _backgroundOpacity;
     private float _axisLength;
@@ -99,11 +100,11 @@ internal class DirectionGizmo : ContainerControl
 
         _xAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "X", AxisColor = new Color(1.0f, 0.0f, 0.02745f, 1.0f), Negative = false, Direction = AxisDirection.PosX };
         _yAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "Y", AxisColor = new Color(0.239215f, 1.0f, 0.047058f, 1.0f), Negative = false, Direction = AxisDirection.PosY };
-        _zAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "Z", AxisColor = new Color(0.0f, 0.0235294f, 1.0f, 1.0f), Negative = false, Direction = AxisDirection.PosZ };
+        _zAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "Z", AxisColor = new Color(0.0f, 0.3607f, 0.9f, 1.0f), Negative = false, Direction = AxisDirection.PosZ };
 
         _negXAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-X", AxisColor = new Color(1.0f, 0.0f, 0.02745f, 1.0f), Negative = true, Direction = AxisDirection.NegX };
         _negYAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Y", AxisColor = new Color(0.239215f, 1.0f, 0.047058f, 1.0f), Negative = true, Direction = AxisDirection.NegY };
-        _negZAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Z", AxisColor = new Color(0.0f, 0.0235294f, 1.0f, 1.0f), Negative = true, Direction = AxisDirection.NegZ };
+        _negZAxisData = new AxisData { Delta = new Float2(0, 0), Distance = 0, Label = "-Z", AxisColor = new Color(0.0f, 0.3607f, 0.9f, 1.0f), Negative = true, Direction = AxisDirection.NegZ };
         _axisData.EnsureCapacity(6);
         _spritePositions.EnsureCapacity(6);
 
@@ -122,7 +123,7 @@ internal class DirectionGizmo : ContainerControl
         float gizmoScale = options.Viewport.DirectionGizmoScale;
         _axisLength = AxisLength * gizmoScale;
         _spriteRadius = SpriteRadius * gizmoScale;
-
+        _gizmoBrightness = options.Viewport.DirectionGizmoBrightness;
         _gizmoOpacity = options.Viewport.DirectionGizmoOpacity;
         _backgroundOpacity = options.Viewport.DirectionGizmoBackgroundOpacity;
 
@@ -267,7 +268,7 @@ internal class DirectionGizmo : ContainerControl
             _spritePositions.Add((tipScreen, axis.Direction));
 
             var axisColor = isHovered ? new Color(1.0f, 0.8980392f, 0.039215688f) : axis.AxisColor;
-            axisColor.A *= _gizmoOpacity;
+            axisColor = axisColor.RGBMultiplied(_gizmoBrightness).AlphaMultiplied(_gizmoOpacity);
             var font = _fontReference.GetFont();
             if (!axis.Negative)
             {
diff --git a/Source/Editor/Options/ViewportOptions.cs b/Source/Editor/Options/ViewportOptions.cs
index 6e8903bab..c7f6ba544 100644
--- a/Source/Editor/Options/ViewportOptions.cs
+++ b/Source/Editor/Options/ViewportOptions.cs
@@ -189,9 +189,9 @@ namespace FlaxEditor.Options
         /// <summary>
         /// Gets or sets a value for the opacity of the main viewports <see cref="Gizmo.DirectionGizmo"/> background.
         /// </summary>
-        [DefaultValue(0.05f), Limit(0.0f, 1.0f)]
+        [DefaultValue(0.1f), Limit(0.0f, 1.0f)]
         [EditorDisplay("Direction Gizmo"), EditorOrder(502), Tooltip("The background opacity of the of the direction gizmo in the main viewport.")]
-        public float DirectionGizmoBackgroundOpacity { get; set; } = 0.05f;
+        public float DirectionGizmoBackgroundOpacity { get; set; } = 0.1f;
 
         /// <summary>
         /// Gets or sets a value for the opacity of the main viewports <see cref="Gizmo.DirectionGizmo"/>.
@@ -199,5 +199,12 @@ namespace FlaxEditor.Options
         [DefaultValue(0.6f), Limit(0.0f, 1.0f)]
         [EditorDisplay("Direction Gizmo"), EditorOrder(503), Tooltip("The opacity of the of the direction gizmo in the main viewport.")]
         public float DirectionGizmoOpacity { get; set; } = 0.6f;
+
+        /// <summary>
+        /// Gets or sets a value for the opacity of the main viewports <see cref="Gizmo.DirectionGizmo"/>.
+        /// </summary>
+        [DefaultValue(1f), Limit(0.0f, 2.0f)]
+        [EditorDisplay("Direction Gizmo"), EditorOrder(504), Tooltip("The brightness of the of the direction gizmo in the main viewport.")]
+        public float DirectionGizmoBrightness{ get; set; } = 1f;
     }
 }

From 3db3eb58a34ed8519cc1058ac8c79315af95326b Mon Sep 17 00:00:00 2001
From: Saas <kaktusreiniger@gmail.com>
Date: Wed, 25 Mar 2026 23:16:27 +0100
Subject: [PATCH 189/203] add Flax 1.12 to bug report template and tweak
 wording for some things

---
 .github/ISSUE_TEMPLATE/1-bug.yaml             | 8 ++++----
 .github/ISSUE_TEMPLATE/2-feature-request.yaml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/1-bug.yaml b/.github/ISSUE_TEMPLATE/1-bug.yaml
index a75003f63..7e6150557 100644
--- a/.github/ISSUE_TEMPLATE/1-bug.yaml
+++ b/.github/ISSUE_TEMPLATE/1-bug.yaml
@@ -5,7 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this bug report! Please attach any minimal reproduction projects!
+        Thanks for taking the time to fill out this bug report! Please attach a minimal reproduction project if available!
   - type: textarea
     id: description-area
     attributes:
@@ -17,19 +17,19 @@ body:
     id: steps-area
     attributes:
       label: Steps to reproduce
-      description: Please provide reproduction steps if possible.
+      description: Please provide reproduction steps if available.
     validations:
       required: true
   - type: dropdown
     id: version
     attributes:
       label: Version
-      description: What version of Flax are you running?
+      description: What version of Flax did you experience the bug in?
       options:
-        - '1.8'
         - '1.9'
         - '1.10'
         - '1.11'
+        - '1.12'
         - master branch
       default: 3
     validations:
diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.yaml b/.github/ISSUE_TEMPLATE/2-feature-request.yaml
index 338c9aea0..7ad43bf5b 100644
--- a/.github/ISSUE_TEMPLATE/2-feature-request.yaml
+++ b/.github/ISSUE_TEMPLATE/2-feature-request.yaml
@@ -5,7 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out a feature request!
+        Thank you for taking the time to submit this feature request!
   - type: textarea
     id: description-area
     attributes:
@@ -17,6 +17,6 @@ body:
     id: benefits-area
     attributes:
       label: Benefits
-      description: Please provide what benefits this feature would provide to the engine!
+      description: Please list what benefits this feature would provide to the engine!
     validations:
       required: true
\ No newline at end of file

From a9fbbaa88e5908948d8f93c9145d2d894d9bd511 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 26 Mar 2026 09:21:54 +0100
Subject: [PATCH 190/203] Fix spawned in Editor actor RigidBody to never be
 static

---
 .../Editor/SceneGraph/Actors/RigidBodyNode.cs | 29 +++++++++++++++++++
 Source/Editor/SceneGraph/SceneGraphFactory.cs |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 Source/Editor/SceneGraph/Actors/RigidBodyNode.cs

diff --git a/Source/Editor/SceneGraph/Actors/RigidBodyNode.cs b/Source/Editor/SceneGraph/Actors/RigidBodyNode.cs
new file mode 100644
index 000000000..9f9a38258
--- /dev/null
+++ b/Source/Editor/SceneGraph/Actors/RigidBodyNode.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Wojciech Figat. All rights reserved.
+
+using FlaxEngine;
+
+namespace FlaxEditor.SceneGraph.Actors
+{
+    /// <summary>
+    /// Scene tree node for <see cref="RigidBody"/> actor type.
+    /// </summary>
+    [HideInEditor]
+    public sealed class RigidBodyNode : ActorNode
+    {
+        /// <inheritdoc />
+        public RigidBodyNode(Actor actor)
+        : base(actor)
+        {
+        }
+
+        /// <inheritdoc />
+        public override void PostSpawn()
+        {
+            base.PostSpawn();
+
+            if (HasPrefabLink)
+                return;
+            Actor.StaticFlags = StaticFlags.None;
+        }
+    }
+}
diff --git a/Source/Editor/SceneGraph/SceneGraphFactory.cs b/Source/Editor/SceneGraph/SceneGraphFactory.cs
index bd465aad2..8437167aa 100644
--- a/Source/Editor/SceneGraph/SceneGraphFactory.cs
+++ b/Source/Editor/SceneGraph/SceneGraphFactory.cs
@@ -74,6 +74,7 @@ namespace FlaxEditor.SceneGraph
             CustomNodesTypes.Add(typeof(NavMesh), typeof(ActorNode));
             CustomNodesTypes.Add(typeof(SpriteRender), typeof(SpriteRenderNode));
             CustomNodesTypes.Add(typeof(Joint), typeof(JointNode));
+            CustomNodesTypes.Add(typeof(RigidBody), typeof(RigidBodyNode));
         }
 
         /// <summary>

From f92ec30e1b7ffcf849b6739f7f963234a2e5fce5 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 26 Mar 2026 09:26:42 +0100
Subject: [PATCH 191/203] Fix crash when using convex mesh collider with
 negative scale

#3853
---
 Source/Engine/Physics/Colliders/Collider.cpp  | 31 ++++++++++++-------
 .../Physics/PhysX/PhysicsBackendPhysX.cpp     |  7 +++--
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/Source/Engine/Physics/Colliders/Collider.cpp b/Source/Engine/Physics/Colliders/Collider.cpp
index 96bd9c7ae..28588e2a6 100644
--- a/Source/Engine/Physics/Colliders/Collider.cpp
+++ b/Source/Engine/Physics/Colliders/Collider.cpp
@@ -209,6 +209,13 @@ void Collider::CreateShape()
     // Create shape
     const bool isTrigger = _isTrigger && CanBeTrigger();
     _shape = PhysicsBackend::CreateShape(this, shape, Material, IsActiveInHierarchy(), isTrigger);
+    if (!_shape)
+    {
+        LOG(Error, "Failed to create physics shape for actor '{}'", GetNamePath());
+        if (shape.Type == CollisionShape::Types::ConvexMesh && Float3(shape.ConvexMesh.Scale).MinValue() <= 0)
+            LOG(Warning, "Convex Mesh colliders cannot have negative scale");
+        return;
+    }
     PhysicsBackend::SetShapeContactOffset(_shape, _contactOffset);
     UpdateLayerBits();
 }
@@ -293,18 +300,20 @@ void Collider::BeginPlay(SceneBeginData* data)
     if (_shape == nullptr)
     {
         CreateShape();
-
-        // Check if parent is a rigidbody
-        const auto rigidBody = dynamic_cast<RigidBody*>(GetParent());
-        if (rigidBody && CanAttach(rigidBody))
+        if (_shape)
         {
-            // Attach to the rigidbody
-            Attach(rigidBody);
-        }
-        else
-        {
-            // Be a static collider
-            CreateStaticActor();
+            // Check if parent is a rigidbody
+            const auto rigidBody = dynamic_cast<RigidBody*>(GetParent());
+            if (rigidBody && CanAttach(rigidBody))
+            {
+                // Attach to the rigidbody
+                Attach(rigidBody);
+            }
+            else
+            {
+                // Be a static collider
+                CreateStaticActor();
+            }
         }
     }
 
diff --git a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
index 02e23d890..5aba5343b 100644
--- a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
+++ b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
@@ -2653,10 +2653,13 @@ void* PhysicsBackend::CreateShape(PhysicsColliderActor* collider, const Collisio
     PxGeometryHolder geometryPhysX;
     GetShapeGeometry(geometry, geometryPhysX);
     PxShape* shapePhysX = PhysX->createShape(geometryPhysX.any(), materialsPhysX.Get(), materialsPhysX.Count(), true, shapeFlags);
-    shapePhysX->userData = collider;
+    if (shapePhysX)
+    {
+        shapePhysX->userData = collider;
 #if PHYSX_DEBUG_NAMING
-    shapePhysX->setName("Shape");
+        shapePhysX->setName("Shape");
 #endif
+    }
     return shapePhysX;
 }
 

From 0f09cad1cfb4a4318be12c7c0bcf9b44b3236fa1 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 26 Mar 2026 09:33:56 +0100
Subject: [PATCH 192/203] Update PhysX with new slim Build

Rebuild for win64 and android only
---
 .../ARM64/libPhysXCharacterKinematic_static_64.a |  4 ++--
 .../ThirdParty/ARM64/libPhysXCommon_static_64.a  |  4 ++--
 .../ThirdParty/ARM64/libPhysXCooking_static_64.a |  4 ++--
 .../ARM64/libPhysXExtensions_static_64.a         |  4 ++--
 .../ARM64/libPhysXFoundation_static_64.a         |  4 ++--
 .../ThirdParty/ARM64/libPhysXPvdSDK_static_64.a  |  3 ---
 .../ARM64/libPhysXVehicle2_static_64.a           |  4 ++--
 .../ThirdParty/ARM64/libPhysXVehicle_static_64.a |  4 ++--
 .../ThirdParty/ARM64/libPhysX_static_64.a        |  4 ++--
 .../Binaries/ThirdParty/x64/FastXml_64.pdb       |  2 +-
 .../Binaries/ThirdParty/x64/LowLevelAABB_64.pdb  |  4 ++--
 .../ThirdParty/x64/LowLevelDynamics_64.pdb       |  4 ++--
 .../Binaries/ThirdParty/x64/LowLevel_64.pdb      |  4 ++--
 .../x64/PhysXCharacterKinematic_static_64.lib    |  4 ++--
 .../x64/PhysXCharacterKinematic_static_64.pdb    |  4 ++--
 .../ThirdParty/x64/PhysXCommon_static_64.lib     |  4 ++--
 .../ThirdParty/x64/PhysXCommon_static_64.pdb     |  4 ++--
 .../ThirdParty/x64/PhysXCooking_static_64.lib    |  4 ++--
 .../ThirdParty/x64/PhysXCooking_static_64.pdb    |  4 ++--
 .../ThirdParty/x64/PhysXExtensions_static_64.lib |  4 ++--
 .../ThirdParty/x64/PhysXExtensions_static_64.pdb |  4 ++--
 .../ThirdParty/x64/PhysXFoundation_static_64.lib |  4 ++--
 .../ThirdParty/x64/PhysXFoundation_static_64.pdb |  4 ++--
 .../ThirdParty/x64/PhysXPvdSDK_static_64.lib     |  3 ---
 .../ThirdParty/x64/PhysXPvdSDK_static_64.pdb     |  3 ---
 .../Binaries/ThirdParty/x64/PhysXTask_64.pdb     |  2 +-
 .../ThirdParty/x64/PhysXVehicle2_static_64.lib   |  4 ++--
 .../ThirdParty/x64/PhysXVehicle2_static_64.pdb   |  4 ++--
 .../ThirdParty/x64/PhysXVehicle_static_64.lib    |  4 ++--
 .../ThirdParty/x64/PhysXVehicle_static_64.pdb    |  4 ++--
 .../Binaries/ThirdParty/x64/PhysX_static_64.lib  |  4 ++--
 .../Binaries/ThirdParty/x64/PhysX_static_64.pdb  |  4 ++--
 .../Binaries/ThirdParty/x64/SceneQuery_64.pdb    |  2 +-
 .../ThirdParty/x64/SimulationController_64.pdb   |  4 ++--
 .../PhysX/extensions/PxRepXSerializer.h          |  3 +++
 Source/ThirdParty/PhysX/foundation/PxHash.h      |  2 +-
 Source/ThirdParty/PhysX/foundation/PxMath.h      |  2 +-
 .../ThirdParty/PhysX/foundation/PxPreprocessor.h | 10 +++++++++-
 .../Tools/Flax.Build/Deps/Dependencies/PhysX.cs  | 16 ++++++++++++++--
 39 files changed, 87 insertions(+), 73 deletions(-)
 delete mode 100644 Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXPvdSDK_static_64.a
 delete mode 100644 Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.lib
 delete mode 100644 Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.pdb

diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCharacterKinematic_static_64.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCharacterKinematic_static_64.a
index 884943f02..b532d98dc 100644
--- a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCharacterKinematic_static_64.a
+++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCharacterKinematic_static_64.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c07afaaa62724f7f8f532a1bc65a5fc50753e266495248a608d9f4b9476aa0b
-size 2025020
+oid sha256:7b0ec52b292d42f583822883a7275bf1f311bd46866dd5e9ab3489c025a4fd5b
+size 2024932
diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCommon_static_64.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCommon_static_64.a
index 59899248c..8ea5ddcca 100644
--- a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCommon_static_64.a
+++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCommon_static_64.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9817730bdeae1cfeb5207470d721b27f448cdd36b9eba85da73dec59e8a5bf99
-size 52205712
+oid sha256:1f3e7321d444eb054d7ce10e71be4deee9d58133157557e7b839ecd9ac48fc98
+size 52204304
diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCooking_static_64.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCooking_static_64.a
index 37e24dc4c..e0f395e4f 100644
--- a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCooking_static_64.a
+++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXCooking_static_64.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:524ded53592c687bc834c9db24c6ccfa8449f3392ec3fd99627c87cf7f069368
-size 111200
+oid sha256:d322d65623ce682730f28c0b390b36102eabc4ae453af9dfd813cc1e189c1628
+size 111192
diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXExtensions_static_64.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXExtensions_static_64.a
index b13b12074..697046535 100644
--- a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXExtensions_static_64.a
+++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXExtensions_static_64.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:759aa0379faa5f010c66654e46d352f24c1f837507ffa0178022546540f4ca0f
-size 31683652
+oid sha256:5981d7ce59540fe829bab21485dbb83ab82f860ed15ca720f8c0d621bcd1296b
+size 7873980
diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXFoundation_static_64.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXFoundation_static_64.a
index 19216936b..7a4e611b4 100644
--- a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXFoundation_static_64.a
+++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXFoundation_static_64.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6738a094c3dbe50a5820c83944b3992211bd3e372b1ccfbd2f3acb0541c04d2b
-size 570452
+oid sha256:e915aa5a013c099fe6ced91c50f1fa8b5e46e3778b08d09d0a12d59f6252d87f
+size 570404
diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXPvdSDK_static_64.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXPvdSDK_static_64.a
deleted file mode 100644
index e681dfc1b..000000000
--- a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXPvdSDK_static_64.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7369e2822a705f592c67942c0ba354694b857fa9d83db6bed4dc0dcf3a4875f0
-size 3405028
diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle2_static_64.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle2_static_64.a
index edb89c6a0..78008e4b2 100644
--- a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle2_static_64.a
+++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle2_static_64.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7bbb5ba66f5e47ee53fd099c805e94d66f47cb66c44ec2339f06b66ea89c6100
-size 1543576
+oid sha256:f6a43c86163970f92cb49f508c175e8cbd80ee83fc193d10011eb5905f20e0ab
+size 1543440
diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle_static_64.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle_static_64.a
index 815ea1e4a..81b2061c1 100644
--- a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle_static_64.a
+++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle_static_64.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4eff2cf32d6bfed5f32d26b5478ec4e1eda31d3959e71f79fa6e205905b1e67c
-size 12277380
+oid sha256:cd5d1083b5479d322b98b56b94dc42139c5965a5c7434fe058382f760708273b
+size 2364570
diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysX_static_64.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysX_static_64.a
index a37ba9028..7fc068ccb 100644
--- a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysX_static_64.a
+++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysX_static_64.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee3f4e2cc3160b7556dd8678c49f27160d401fbef729c81568dbc184b07fbab5
-size 37483230
+oid sha256:ae10a05b256896db3868df5d9914d5ffd10efbcc64dea046ba11946514625b7e
+size 34853698
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/FastXml_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/FastXml_64.pdb
index 43a87a79d..ab822e5d2 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/FastXml_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/FastXml_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:132883c177c47a532afd6fa33b5a2f498cd310001400062a6df33743c4d5e784
+oid sha256:dc758a8cf6f50caf75476128ceffc41afbb6b8aaa45e81cd17ef694c18bec1a3
 size 118784
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelAABB_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelAABB_64.pdb
index 819f1d896..acf9b53bc 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelAABB_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelAABB_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7668042f2a51ef982925d28ec57efe89f3adfc0f0bdd45c0d836ea810010d0a1
-size 593920
+oid sha256:0356328c34bc457903e70c6f3c9d984f288ff3917564cb5f5bd2efb84c8a0b9f
+size 585728
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelDynamics_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelDynamics_64.pdb
index e96418eed..5c8c6b364 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelDynamics_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelDynamics_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5eb77e8531012b27e7616f097e17bd15a0d30f0314f311bacefa67610eb873c
-size 1339392
+oid sha256:8a2a326575d5b6b468dc896399bb9bcb324a44f9097cb6b78457875737df7356
+size 1323008
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevel_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevel_64.pdb
index a6f6b58f8..2a28827ee 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevel_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevel_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5ed568ad39c0d14de2e51b413657cc965ee2e831b4b6bc7e6418d16fa697163
-size 1257472
+oid sha256:7313a497a5a851d86d7a2f2161f5d4a01274b031bb3d3d0ccb279fc9db199e24
+size 1241088
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.lib
index c9e7b5dfe..4258cc709 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.lib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:603e6025b22349137e7244bf6ca4056e09e6947660469269da1944d9f92e02fb
-size 1306220
+oid sha256:46f69808637c2a42353e3935f2f6b3c3babb3bf0853e4551b70ce7e1f63a19ec
+size 1319326
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.pdb
index b82c855c8..2f9cdc350 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c870f987df7407b2edc5615a5fb4d3cb942af801d0260a13de1d27e52eac4fb
-size 675840
+oid sha256:4cfb89b2836af0efe36f6e062262d4720153c9c3c396bfc6adb5098eb89e46c3
+size 667648
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.lib
index 56a97a846..130cfe8a1 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.lib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2b2093cf1f72c4135f653875f0fe0fa33d6696d34c29b6ac8d4ac3bb7aa92c1
-size 26130976
+oid sha256:935f6ea3bc1162acabadeaec6b34cc81445f8039afbdc0edd284e7200cf662d8
+size 24990306
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.pdb
index 4c3883939..24e7628a4 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0c09e6550a0ab319a7cde6382cc31ba31113d54d8d779444435e56213d07285
-size 1822720
+oid sha256:65352f47a3e32ca16ae6c5cb672ff9a5ea5098a4ade33a080accf5e57054f679
+size 1781760
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.lib
index 7a47a2ddb..03a130cf4 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.lib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea85451d201ceeea71fd46bb01b5dc3501a05c77538bb85ae665ec6c0385c350
-size 130200
+oid sha256:3f786c5d71caa92ad50e186da67ea1564213d593c709134a25cbced5c1184338
+size 128984
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.pdb
index c79307c68..2ae2ecf13 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f18f710748a40b3be245f1027748ed6c9fe6058e049c3926632c0658dd983f4
-size 397312
+oid sha256:e22e8f2cf72d6c4d5fa35e426e6e0cc41e63402dc85aad5a1e65bc34bfd0146c
+size 389120
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.lib
index 7d543561d..4207c354d 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.lib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f880ee07970656a19ac9a811f16be3edeed06834886606f2385bbcce9389ea4c
-size 17300374
+oid sha256:0fce079940f5641113cb0d27c874923ab47a2e8ee286764c5711159c0e5f5bea
+size 5639208
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.pdb
index b6401abd3..178fb18f8 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abd53b7899e7bce0b2180189d8c28df8b38107bb90cdd6078069c9d869169d9a
-size 5156864
+oid sha256:7f28ef88132564ade7d813a9bfa667ce4c50e407ce3d6bcf2f386e8f5da98e16
+size 1740800
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.lib
index dcb1935ee..3f08fa2c4 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.lib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f84c317ca2181e564fd7f6814898f9a1c738e3f157e5974da1fcf72d6abe8f9
-size 585126
+oid sha256:8685d51d5b7b69ee945da97e026cad77b98f91c564aae73176ca86c0d5f1d1b4
+size 571940
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.pdb
index f784a8e8e..e074d0436 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c4094a92b9252e8f0dee08600ef5f93fa01abb9b21fe4a2944114d41cd143ec
-size 299008
+oid sha256:e0c44d3c2b487797eaefed7708d5389a366fa5217f3c5d6d06fdca00871de942
+size 315392
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.lib
deleted file mode 100644
index 52b0147b0..000000000
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.lib
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:747ed5f9e098e9c8e0a75cdfdfd09e82b338904b5916cc60df45d585f398b215
-size 2073834
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.pdb
deleted file mode 100644
index 3778728ef..000000000
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:227c4cddf1a1326c6f6a9cfb106c592f75433fcf047971f63c8bc992c6f16369
-size 946176
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXTask_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXTask_64.pdb
index ed9215af3..06bee0418 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXTask_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXTask_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea9f74cc743bf588cbb9e6a5dbe544551eefe6be2ffa1c0232908159f3fd2612
+oid sha256:9898aebf247d35e2b27b0107fc7833abb5b2cc45a7bb5581f1f5d25a40e61fbf
 size 143360
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.lib
index 1c7cb3bc0..b5abd5493 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.lib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c0c1865cba540abc026208ebf09653bb30f1ab9f800d65d53ea716e9b21ba64
-size 1125480
+oid sha256:56a251bf1d01a66e728618bbc53c3e54a8039c40465152f76868e37802137172
+size 1142828
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.pdb
index 11ae60a06..79025e37d 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f83d273d0419023214b3f5094bfc23bd567c495bcf262fb6b2d696427a390f19
-size 733184
+oid sha256:32f10a769eb31b14338b8f858b7a4d462fbc02d3b96c9f3ecc12f12aa8ccb4ce
+size 724992
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.lib
index c71216d38..4784302b8 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.lib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64d9bd9c981905263b5d10ab9a9b2153785b58d6405ad99ed5119d4b70b55f51
-size 5843352
+oid sha256:5ae79e8eaee91bc6db4b0b99d5c814b9609d323f7b2c0ffaeeccf8e09b4cd4be
+size 1550810
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.pdb
index 67447c121..47b31ec74 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eba825400abc8140c3d496ff0ad6df25ae9b4d4d2acb63db81171250d874e8b9
-size 3862528
+oid sha256:dcecb48dfed2969626a61197f6edc95dee1bdaf598c4567278704d0babffe812
+size 602112
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.lib
index 8a0399bd7..beed86282 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.lib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8311b062fb2153604f3eddee2d2a5720beb7f571159e8b1ed8c9fa89d3a3d6c5
-size 34826088
+oid sha256:4d2c83f579a3c96adc604f20ad0219016cad04c21a78ac539cd38686b2556de8
+size 33511310
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.pdb
index 6b3fbcb2d..1a0ffa3b8 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a332f82798acafc6423c40e09223d7781abc43fbe5cbe1aed9069937ed7de180
-size 4558848
+oid sha256:0522612dd80ec1739c244136e42221e25a17db0d8d94bc860aa78469c0d0b329
+size 3502080
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SceneQuery_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SceneQuery_64.pdb
index c6196ff06..1ce7cb454 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SceneQuery_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SceneQuery_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac1251babb3766e7e9bc2efc40873b43aa1ae55b331918c9dc790f82b9e77d4f
+oid sha256:b3c3204aaded5ae0ea1acc502ca15597a2884658957ec36c778395e70321e853
 size 544768
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SimulationController_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SimulationController_64.pdb
index 92b08e4bc..d42fb5191 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SimulationController_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SimulationController_64.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b11081d87071515d65544c9265b9bd09bb66af0810fbd6ec03bd28512892466b
-size 2699264
+oid sha256:b2986a02de98efa5ae0f1883d6ed5af91d042d3bad136c8883f6e6a47d2e91a8
+size 2674688
diff --git a/Source/ThirdParty/PhysX/extensions/PxRepXSerializer.h b/Source/ThirdParty/PhysX/extensions/PxRepXSerializer.h
index 92f8211d0..0effba190 100644
--- a/Source/ThirdParty/PhysX/extensions/PxRepXSerializer.h
+++ b/Source/ThirdParty/PhysX/extensions/PxRepXSerializer.h
@@ -35,6 +35,8 @@
 #include "common/PxBase.h"
 #include "extensions/PxRepXSimpleType.h"
 
+#if PX_SERIALIZATION
+
 #if !PX_DOXYGEN
 namespace physx
 {
@@ -147,3 +149,4 @@ PX_INLINE physx::PxRepXObject PxCreateRepXObject(const TDataType* inType)
 /** @} */
 #endif
 
+#endif
diff --git a/Source/ThirdParty/PhysX/foundation/PxHash.h b/Source/ThirdParty/PhysX/foundation/PxHash.h
index 43ea55215..c85756b0a 100644
--- a/Source/ThirdParty/PhysX/foundation/PxHash.h
+++ b/Source/ThirdParty/PhysX/foundation/PxHash.h
@@ -86,7 +86,7 @@ PX_FORCE_INLINE uint32_t PxComputeHash(const uint64_t key)
 	return uint32_t(UINT32_MAX & k);
 }
 
-#if PX_APPLE_FAMILY
+#if PX_APPLE_FAMILY || PX_EMSCRIPTEN
 // hash for size_t, to make gcc happy
 PX_INLINE uint32_t PxComputeHash(const size_t key)
 {
diff --git a/Source/ThirdParty/PhysX/foundation/PxMath.h b/Source/ThirdParty/PhysX/foundation/PxMath.h
index cff5b1795..8b071fa32 100644
--- a/Source/ThirdParty/PhysX/foundation/PxMath.h
+++ b/Source/ThirdParty/PhysX/foundation/PxMath.h
@@ -45,7 +45,7 @@
 #pragma warning(pop)
 #endif
 
-#if (PX_LINUX_FAMILY && !PX_ARM_FAMILY)
+#if (PX_LINUX_FAMILY && !PX_ARM_FAMILY && !PX_EMSCRIPTEN)
 // Force linking against nothing newer than glibc v2.17 to remain compatible with platforms with older glibc versions
 __asm__(".symver expf,expf@GLIBC_2.2.5");
 __asm__(".symver powf,powf@GLIBC_2.2.5");
diff --git a/Source/ThirdParty/PhysX/foundation/PxPreprocessor.h b/Source/ThirdParty/PhysX/foundation/PxPreprocessor.h
index 2b23aa222..6ca05cee3 100644
--- a/Source/ThirdParty/PhysX/foundation/PxPreprocessor.h
+++ b/Source/ThirdParty/PhysX/foundation/PxPreprocessor.h
@@ -437,8 +437,16 @@ Use these macro definitions to create warnings for deprecated functions
 General defines
 */
 
+// Customization to exclude serialization code
+#define PX_SERIALIZATION 0
+
+// Customization to exclude soft-bodies (incl. tetrahedral meshes)
+#define PX_SOFT_BODY 0
+
 // static assert
-#if(defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) || (PX_APPLE_FAMILY) || (PX_SWITCH || PX_PS4 || PX_PS5) || (PX_CLANG && PX_ARM) || (PX_CLANG && PX_A64)
+#if PX_EMSCRIPTEN
+	#define PX_COMPILE_TIME_ASSERT(exp)
+#elif(defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) || (PX_APPLE_FAMILY) || (PX_SWITCH || PX_PS4 || PX_PS5) || (PX_CLANG && PX_ARM) || (PX_CLANG && PX_A64)
 	#define PX_COMPILE_TIME_ASSERT(exp) typedef char PX_CONCAT(PxCompileTimeAssert_Dummy, __COUNTER__)[(exp) ? 1 : -1] __attribute__((unused))
 #else
 	#define PX_COMPILE_TIME_ASSERT(exp) typedef char PxCompileTimeAssert_Dummy[(exp) ? 1 : -1]
diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs b/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs
index 18bb4e69f..deaaa8fc5 100644
--- a/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs
@@ -48,6 +48,7 @@ namespace Flax.Deps.Dependencies
                 throw new Exception(string.Format("Missing PhysX preset {0} (file: {1})", preset, presetPath));
             var presetXml = new XmlDocument();
             presetXml.Load(presetPath);
+            var usePVD = false;
 
             // Configure preset
             var cmakeSwitches = presetXml["preset"]["CMakeSwitches"];
@@ -59,6 +60,11 @@ namespace Flax.Deps.Dependencies
             ConfigureCmakeSwitch(cmakeSwitches, "NV_USE_STATIC_WINCRT", "False");
             ConfigureCmakeSwitch(cmakeSwitches, "NV_USE_DEBUG_WINCRT", "False");
             ConfigureCmakeSwitch(cmakeSwitches, "PX_FLOAT_POINT_PRECISE_MATH", "False");
+            if (usePVD)
+            {
+                // PVD depends on metadata and serialization code striped from shipping builds
+                ConfigureCmakeSwitch(cmakeSwitches, "PX_SERIALIZATION", "True");
+            }
             var cmakeParams = presetXml["preset"]["CMakeParams"];
             switch (targetPlatform)
             {
@@ -286,12 +292,18 @@ namespace Flax.Deps.Dependencies
             Log.Verbose("Copy PhysX binaries from " + srcBinaries);
             foreach (var physXLib in defaultPhysXLibs)
             {
+                var remove = !usePVD && physXLib.Contains("Pvd");
                 var filename = suppressBitsPostfix ? string.Format("{0}{1}_static", binariesPrefix, physXLib) : string.Format("{0}{1}_static_{2}", binariesPrefix, physXLib, bits);
                 filename += binariesExtension;
-                Utilities.FileCopy(Path.Combine(srcBinaries, filename), Path.Combine(dstBinaries, filename));
+                if (remove)
+                    Utilities.FileDelete(Path.Combine(dstBinaries, filename));
+                else
+                    Utilities.FileCopy(Path.Combine(srcBinaries, filename), Path.Combine(dstBinaries, filename));
 
                 var filenamePdb = Path.ChangeExtension(filename, "pdb");
-                if (File.Exists(Path.Combine(srcBinaries, filenamePdb)))
+                if (remove)
+                    Utilities.FileDelete(Path.Combine(dstBinaries, filenamePdb));
+                else if (File.Exists(Path.Combine(srcBinaries, filenamePdb)))
                     Utilities.FileCopy(Path.Combine(srcBinaries, filenamePdb), Path.Combine(dstBinaries, filenamePdb));
 
                 // Strip debug symbols to reduce binaries size

From a48ce78733ec1b286d72f8c61ba6e30ff3e39d09 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 26 Mar 2026 12:28:31 +0100
Subject: [PATCH 193/203] Fix crash when loading `CollisionData` before physics
 init

#3971
---
 Source/Engine/Content/Asset.cpp           | 34 +++++++++++++++++++++++
 Source/Engine/Content/Asset.h             |  4 +++
 Source/Engine/Content/Assets/Material.cpp | 13 ++-------
 Source/Engine/Physics/CollisionData.cpp   |  2 ++
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/Source/Engine/Content/Asset.cpp b/Source/Engine/Content/Asset.cpp
index 7a35d3b28..a9b1a7fc9 100644
--- a/Source/Engine/Content/Asset.cpp
+++ b/Source/Engine/Content/Asset.cpp
@@ -8,6 +8,8 @@
 #include "Loading/Tasks/LoadAssetTask.h"
 #include "Engine/Core/Log.h"
 #include "Engine/Core/LogContext.h"
+#include "Engine/Graphics/GPUDevice.h"
+#include "Engine/Physics/Physics.h"
 #include "Engine/Profiler/ProfilerCPU.h"
 #include "Engine/Profiler/ProfilerMemory.h"
 #include "Engine/Scripting/ManagedCLR/MCore.h"
@@ -703,6 +705,38 @@ void Asset::onUnload_MainThread()
     OnUnloaded(this);
 }
 
+bool Asset::WaitForInitGraphics()
+{
+#define IS_GPU_NOT_READY() (GPUDevice::Instance == nullptr || GPUDevice::Instance->GetState() != GPUDevice::DeviceState::Ready)
+    if (!IsInMainThread() && IS_GPU_NOT_READY())
+    {
+        PROFILE_CPU();
+        ZoneColor(TracyWaitZoneColor);
+        int32 timeout = 1000;
+        while (IS_GPU_NOT_READY() && timeout-- > 0)
+            Platform::Sleep(1);
+        if (IS_GPU_NOT_READY())
+            return true;
+    }
+#undef IS_GPU_NOT_READY
+    return false;
+}
+
+bool Asset::WaitForInitPhysics()
+{
+    if (!IsInMainThread() && !Physics::DefaultScene)
+    {
+        PROFILE_CPU();
+        ZoneColor(TracyWaitZoneColor);
+        int32 timeout = 1000;
+        while (!Physics::DefaultScene && timeout-- > 0)
+            Platform::Sleep(1);
+        if (!Physics::DefaultScene)
+            return true;
+    }
+    return false;
+}
+
 #if USE_EDITOR
 
 bool Asset::OnCheckSave(const StringView& path) const
diff --git a/Source/Engine/Content/Asset.h b/Source/Engine/Content/Asset.h
index e6607e62c..a7913a5a5 100644
--- a/Source/Engine/Content/Asset.h
+++ b/Source/Engine/Content/Asset.h
@@ -285,6 +285,10 @@ protected:
     virtual void onRename(const StringView& newPath) = 0;
 #endif
 
+    // Utilities to ensure specific engine systems are initialized before loading asset (eg. assets can be loaded during engine startup).
+    static bool WaitForInitGraphics();
+    static bool WaitForInitPhysics();
+
 public:
     // [ManagedScriptingObject]
     String ToString() const override;
diff --git a/Source/Engine/Content/Assets/Material.cpp b/Source/Engine/Content/Assets/Material.cpp
index b4cf55d4d..e46060397 100644
--- a/Source/Engine/Content/Assets/Material.cpp
+++ b/Source/Engine/Content/Assets/Material.cpp
@@ -5,7 +5,6 @@
 #include "Engine/Core/Types/DataContainer.h"
 #include "Engine/Content/Upgraders/ShaderAssetUpgrader.h"
 #include "Engine/Content/Factories/BinaryAssetFactory.h"
-#include "Engine/Graphics/GPUDevice.h"
 #include "Engine/Graphics/RenderTools.h"
 #include "Engine/Graphics/Materials/MaterialShader.h"
 #include "Engine/Graphics/Shaders/Cache/ShaderCacheManager.h"
@@ -156,16 +155,8 @@ Asset::LoadResult Material::load()
     FlaxChunk* materialParamsChunk;
 
     // Wait for the GPU Device to be ready (eg. case when loading material before GPU init)
-#define IS_GPU_NOT_READY() (GPUDevice::Instance == nullptr || GPUDevice::Instance->GetState() != GPUDevice::DeviceState::Ready)
-    if (!IsInMainThread() && IS_GPU_NOT_READY())
-    {
-        int32 timeout = 1000;
-        while (IS_GPU_NOT_READY() && timeout-- > 0)
-            Platform::Sleep(1);
-        if (IS_GPU_NOT_READY())
-            return LoadResult::InvalidData;
-    }
-#undef IS_GPU_NOT_READY
+    if (WaitForInitGraphics())
+        return LoadResult::CannotLoadData;
 
     // If engine was compiled with shaders compiling service:
     // - Material should be changed in need to convert it to the newer version (via Visject Surface)
diff --git a/Source/Engine/Physics/CollisionData.cpp b/Source/Engine/Physics/CollisionData.cpp
index c65ea8a6b..94cef111e 100644
--- a/Source/Engine/Physics/CollisionData.cpp
+++ b/Source/Engine/Physics/CollisionData.cpp
@@ -257,6 +257,8 @@ Asset::LoadResult CollisionData::load()
 
 CollisionData::LoadResult CollisionData::load(const SerializedOptions* options, byte* dataPtr, int32 dataSize)
 {
+    if (WaitForInitPhysics())
+        return LoadResult::CannotLoadData;
     PROFILE_MEM(Physics);
 
     // Load options

From d0cc88f82a0fd3b1f4bc98257fde274e2e6c69b3 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 26 Mar 2026 14:08:03 +0100
Subject: [PATCH 194/203] Try to fix random `hdiutil` failure in Continuous
 Delivery on Github Action

---
 Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs b/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs
index d45d0dd4c..253d9cc14 100644
--- a/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs
+++ b/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
+using System.Threading;
 using Flax.Build;
 using Flax.Build.Platforms;
 
@@ -199,9 +200,14 @@ namespace Flax.Deploy
                     var dmgPath = Path.Combine(Deployer.PackageOutputPath, "FlaxEditor.dmg");
                     Log.Info(string.Empty);
                     Log.Info("Building disk image...");
+                    Thread.Sleep(100);
                     if (File.Exists(dmgPath))
+                    {
+                        Log.Verbose("Removing old image");
                         File.Delete(dmgPath);
-                    Utilities.Run("hdiutil", $"create -srcFolder \"{appPath}\" -o \"{dmgPath}\" -force", null, null, Utilities.RunOptions.Default | Utilities.RunOptions.ThrowExceptionOnError);
+                        Thread.Sleep(100);
+                    }
+                    Utilities.Run("hdiutil", $"create -srcFolder \"{appPath}\" -o \"{dmgPath}\"", null, null, Utilities.RunOptions.Default | Utilities.RunOptions.ThrowExceptionOnError);
                     CodeSign(dmgPath);
                     Log.Info("Output disk image size: " + Utilities.GetFileSize(dmgPath));
 

From e624e1ba699e40deb05a2d63c74587d380271bd8 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 26 Mar 2026 14:14:15 +0100
Subject: [PATCH 195/203] Fix missing `Custom Global Code` code generation in
 `Defines` stage

---
 Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp
index c473f940c..707c24416 100644
--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp
@@ -456,8 +456,8 @@ bool MaterialGenerator::Generate(WriteStream& source, MaterialInfo& materialInfo
             _writer.Write(TEXT("#define MATERIAL_REFLECTIONS_SSR_COLOR ({0})\n"), sceneColorTexture.ShaderName);
         }
         WRITE_FEATURES(Defines);
-        inputs[In_Defines] = _writer.ToString();
         WriteCustomGlobalCode(customGlobalCodeNodes, In_Defines);
+        inputs[In_Defines] = _writer.ToString();
         _writer.Clear();
     }
 

From ccc8d209da4ac2d2591fd9fe68ec64681671f9f1 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 26 Mar 2026 15:33:14 +0100
Subject: [PATCH 196/203] Fix `MeshAccessor` to validate buffer existence in C#
 API

---
 Source/Engine/Graphics/Models/MeshAccessor.cs | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/Source/Engine/Graphics/Models/MeshAccessor.cs b/Source/Engine/Graphics/Models/MeshAccessor.cs
index ffe509476..1db33b5ba 100644
--- a/Source/Engine/Graphics/Models/MeshAccessor.cs
+++ b/Source/Engine/Graphics/Models/MeshAccessor.cs
@@ -76,6 +76,10 @@ namespace FlaxEngine
             /// <returns>Loaded value.</returns>
             public int GetInt(int index)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 fixed (byte* data = _data)
                     return (int)_sampler.Read(data + index * _stride).X;
             }
@@ -87,6 +91,10 @@ namespace FlaxEngine
             /// <returns>Loaded value.</returns>
             public float GetFloat(int index)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 fixed (byte* data = _data)
                     return _sampler.Read(data + index * _stride).X;
             }
@@ -98,6 +106,10 @@ namespace FlaxEngine
             /// <returns>Loaded value.</returns>
             public Float2 GetFloat2(int index)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 fixed (byte* data = _data)
                     return new Float2(_sampler.Read(data + index * _stride));
             }
@@ -109,6 +121,10 @@ namespace FlaxEngine
             /// <returns>Loaded value.</returns>
             public Float3 GetFloat3(int index)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 fixed (byte* data = _data)
                     return new Float3(_sampler.Read(data + index * _stride));
             }
@@ -120,6 +136,10 @@ namespace FlaxEngine
             /// <returns>Loaded value.</returns>
             public Float4 GetFloat4(int index)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 fixed (byte* data = _data)
                     return _sampler.Read(data + index * _stride);
             }
@@ -131,6 +151,10 @@ namespace FlaxEngine
             /// <param name="value">Value to assign.</param>
             public void SetInt(int index, int value)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 var v = new Float4(value);
                 fixed (byte* data = _data)
                     _sampler.Write(data + index * _stride, ref v);
@@ -143,6 +167,10 @@ namespace FlaxEngine
             /// <param name="value">Value to assign.</param>
             public void SetFloat(int index, float value)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 var v = new Float4(value);
                 fixed (byte* data = _data)
                     _sampler.Write(data + index * _stride, ref v);
@@ -155,6 +183,10 @@ namespace FlaxEngine
             /// <param name="value">Value to assign.</param>
             public void SetFloat2(int index, Float2 value)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 var v = new Float4(value, 0.0f, 0.0f);
                 fixed (byte* data = _data)
                     _sampler.Write(data + index * _stride, ref v);
@@ -167,6 +199,10 @@ namespace FlaxEngine
             /// <param name="value">Value to assign.</param>
             public void SetFloat3(int index, Float3 value)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 var v = new Float4(value, 0.0f);
                 fixed (byte* data = _data)
                     _sampler.Write(data + index * _stride, ref v);
@@ -179,6 +215,10 @@ namespace FlaxEngine
             /// <param name="value">Value to assign.</param>
             public void SetFloat4(int index, Float4 value)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 fixed (byte* data = _data)
                     _sampler.Write(data + index * _stride, ref value);
             }
@@ -190,6 +230,10 @@ namespace FlaxEngine
             /// <param name="data">Pointer to the source data.</param>
             public void SetLinear(IntPtr data)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 new Span<byte>(data.ToPointer(), _data.Length).CopyTo(_data);
             }
 
@@ -199,6 +243,10 @@ namespace FlaxEngine
             /// <param name="src">The source <see cref="T:System.Span`1"/>.</param>
             public void Set(Span<Float2> src)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 if (IsLinear(PixelFormat.R32G32_Float))
                 {
                     src.CopyTo(MemoryMarshal.Cast<byte, Float2>(_data));
@@ -223,6 +271,10 @@ namespace FlaxEngine
             /// <param name="src">The source <see cref="T:System.Span`1"/>.</param>
             public void Set(Span<Float3> src)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 if (IsLinear(PixelFormat.R32G32B32_Float))
                 {
                     src.CopyTo(MemoryMarshal.Cast<byte, Float3>(_data));
@@ -247,6 +299,10 @@ namespace FlaxEngine
             /// <param name="src">The source <see cref="T:System.Span`1"/>.</param>
             public void Set(Span<Color> src)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 if (IsLinear(PixelFormat.R32G32B32A32_Float))
                 {
                     src.CopyTo(MemoryMarshal.Cast<byte, Color>(_data));
@@ -271,6 +327,10 @@ namespace FlaxEngine
             /// <param name="src">The source <see cref="T:System.Span`1"/>.</param>
             public void Set(Span<uint> src)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 if (IsLinear(PixelFormat.R32_UInt))
                 {
                     src.CopyTo(MemoryMarshal.Cast<byte, uint>(_data));
@@ -304,6 +364,10 @@ namespace FlaxEngine
             /// <param name="dst">The destination <see cref="T:System.Span`1" />.</param>
             public void CopyTo(Span<Float2> dst)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 if (IsLinear(PixelFormat.R32G32_Float))
                 {
                     _data.CopyTo(MemoryMarshal.Cast<Float2, byte>(dst));
@@ -325,6 +389,10 @@ namespace FlaxEngine
             /// <param name="dst">The destination <see cref="T:System.Span`1" />.</param>
             public void CopyTo(Span<Float3> dst)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 if (IsLinear(PixelFormat.R32G32B32_Float))
                 {
                     _data.CopyTo(MemoryMarshal.Cast<Float3, byte>(dst));
@@ -346,6 +414,10 @@ namespace FlaxEngine
             /// <param name="dst">The destination <see cref="T:System.Span`1" />.</param>
             public void CopyTo(Span<Color> dst)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 if (IsLinear(PixelFormat.R32G32B32A32_Float))
                 {
                     _data.CopyTo(MemoryMarshal.Cast<Color, byte>(dst));
@@ -367,6 +439,10 @@ namespace FlaxEngine
             /// <param name="dst">The destination <see cref="T:System.Span`1" />.</param>
             public void CopyTo(Span<uint> dst)
             {
+#if !BUILD_RELEASE
+                if (_data == null)
+                    throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
+#endif
                 if (IsLinear(PixelFormat.R32_UInt))
                 {
                     _data.CopyTo(MemoryMarshal.Cast<uint, byte>(dst));

From f1b6c13ba9d63e2634c5f6206cc5252b01ea70a0 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 26 Mar 2026 15:33:55 +0100
Subject: [PATCH 197/203] Fix PixelFormatSampler.Write` in C# to actually work

---
 Source/Engine/Graphics/Models/MeshAccessor.cs | 18 +++++++++---------
 Source/Engine/Graphics/PixelFormatSampler.cs  |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Source/Engine/Graphics/Models/MeshAccessor.cs b/Source/Engine/Graphics/Models/MeshAccessor.cs
index 1db33b5ba..8e9050e5a 100644
--- a/Source/Engine/Graphics/Models/MeshAccessor.cs
+++ b/Source/Engine/Graphics/Models/MeshAccessor.cs
@@ -157,7 +157,7 @@ namespace FlaxEngine
 #endif
                 var v = new Float4(value);
                 fixed (byte* data = _data)
-                    _sampler.Write(data + index * _stride, ref v);
+                    _sampler.Write(data + index * _stride, &v);
             }
 
             /// <summary>
@@ -173,7 +173,7 @@ namespace FlaxEngine
 #endif
                 var v = new Float4(value);
                 fixed (byte* data = _data)
-                    _sampler.Write(data + index * _stride, ref v);
+                    _sampler.Write(data + index * _stride, &v);
             }
 
             /// <summary>
@@ -189,7 +189,7 @@ namespace FlaxEngine
 #endif
                 var v = new Float4(value, 0.0f, 0.0f);
                 fixed (byte* data = _data)
-                    _sampler.Write(data + index * _stride, ref v);
+                    _sampler.Write(data + index * _stride, &v);
             }
 
             /// <summary>
@@ -205,7 +205,7 @@ namespace FlaxEngine
 #endif
                 var v = new Float4(value, 0.0f);
                 fixed (byte* data = _data)
-                    _sampler.Write(data + index * _stride, ref v);
+                    _sampler.Write(data + index * _stride, &v);
             }
 
             /// <summary>
@@ -220,7 +220,7 @@ namespace FlaxEngine
                     throw new NullReferenceException("Missing stream data. Ensure to allocate mesh buffer or check for its existence.");
 #endif
                 fixed (byte* data = _data)
-                    _sampler.Write(data + index * _stride, ref value);
+                    _sampler.Write(data + index * _stride, &value);
             }
 
             /// <summary>
@@ -259,7 +259,7 @@ namespace FlaxEngine
                         for (int i = 0; i < count; i++)
                         {
                             var v = new Float4(src[i], 0.0f, 0.0f);
-                            _sampler.Write(data + i * _stride, ref v);
+                            _sampler.Write(data + i * _stride, &v);
                         }
                     }
                 }
@@ -287,7 +287,7 @@ namespace FlaxEngine
                         for (int i = 0; i < count; i++)
                         {
                             var v = new Float4(src[i], 0.0f);
-                            _sampler.Write(data + i * _stride, ref v);
+                            _sampler.Write(data + i * _stride, &v);
                         }
                     }
                 }
@@ -315,7 +315,7 @@ namespace FlaxEngine
                         for (int i = 0; i < count; i++)
                         {
                             var v = (Float4)src[i];
-                            _sampler.Write(data + i * _stride, ref v);
+                            _sampler.Write(data + i * _stride, &v);
                         }
                     }
                 }
@@ -352,7 +352,7 @@ namespace FlaxEngine
                         for (int i = 0; i < count; i++)
                         {
                             var v = new Float4(src[i]);
-                            _sampler.Write(data + i * _stride, ref v);
+                            _sampler.Write(data + i * _stride, &v);
                         }
                     }
                 }
diff --git a/Source/Engine/Graphics/PixelFormatSampler.cs b/Source/Engine/Graphics/PixelFormatSampler.cs
index 8ff5a32fb..62046b2a5 100644
--- a/Source/Engine/Graphics/PixelFormatSampler.cs
+++ b/Source/Engine/Graphics/PixelFormatSampler.cs
@@ -22,7 +22,7 @@ namespace FlaxEngine
         /// <summary>
         /// Write data function.
         /// </summary>
-        public delegate* unmanaged<void*, ref Float4, void> Write;
+        public delegate* unmanaged<void*, Float4*, void> Write;
 
         /// <summary>
         /// Tries to get a sampler tool for the specified format to read pixels.
@@ -38,7 +38,7 @@ namespace FlaxEngine
                 Format = format,
                 PixelSize = pixelSize,
                 Read = (delegate* unmanaged<void*, Float4>)read.ToPointer(),
-                Write = (delegate* unmanaged<void*, ref Float4, void>)write.ToPointer(),
+                Write = (delegate* unmanaged<void*, Float4*, void>)write.ToPointer(),
             };
             return pixelSize != 0;
         }

From b6789ee5236ad953eaf10bf8f43ff670a81bb00f Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 26 Mar 2026 17:13:46 +0100
Subject: [PATCH 198/203] Add various improvements to `MeshAccessor` such as
 `ComputeNormals` and `ComputeTangents`

https://forum.flaxengine.com/t/how-to-create-procedural-generated-geometry-using-meshaccessor/2420
---
 .../Engine/Graphics/GPUBufferDescription.cs   | 14 +++
 Source/Engine/Graphics/Models/MeshAccessor.cs | 92 ++++++++++++++++++-
 Source/Engine/Graphics/Models/MeshAccessor.h  |  5 +
 Source/Engine/Graphics/RenderTools.cpp        |  7 ++
 Source/Engine/Graphics/RenderTools.h          | 12 +--
 5 files changed, 119 insertions(+), 11 deletions(-)

diff --git a/Source/Engine/Graphics/GPUBufferDescription.cs b/Source/Engine/Graphics/GPUBufferDescription.cs
index 107d17b3e..43fcf94bf 100644
--- a/Source/Engine/Graphics/GPUBufferDescription.cs
+++ b/Source/Engine/Graphics/GPUBufferDescription.cs
@@ -428,6 +428,20 @@ namespace FlaxEngine
 
     partial struct VertexElement : IEquatable<VertexElement>
     {
+        /// <summary>
+        /// Creates the vertex element description.
+        /// </summary>
+        /// <param name="type">Element type.</param>
+        /// <param name="format">Data format.</param>
+        public VertexElement(Types type, PixelFormat format)
+        {
+            Type = type;
+            Slot = 0;
+            Offset = 0;
+            PerInstance = 0;
+            Format = format;
+        }
+
         /// <summary>
         /// Creates the vertex element description.
         /// </summary>
diff --git a/Source/Engine/Graphics/Models/MeshAccessor.cs b/Source/Engine/Graphics/Models/MeshAccessor.cs
index 8e9050e5a..b1a7eebd4 100644
--- a/Source/Engine/Graphics/Models/MeshAccessor.cs
+++ b/Source/Engine/Graphics/Models/MeshAccessor.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
 using System;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace FlaxEngine
@@ -466,6 +467,17 @@ namespace FlaxEngine
                     }
                 }
             }
+
+            /// <summary>
+            /// Checks if stream is valid.
+            /// </summary>
+            /// <param name="stream">The stream to check.</param>
+            /// <returns>True if stream is valid, otherwise false.</returns>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public static implicit operator bool(Stream stream)
+            {
+                return stream.IsValid;
+            }
         }
 
         private byte[][] _data = new byte[(int)MeshBufferType.MAX][];
@@ -586,19 +598,19 @@ namespace FlaxEngine
                 bool use16BitIndexBuffer = false;
                 IntPtr[] vbData = new IntPtr[3];
                 GPUVertexLayout[] vbLayout = new GPUVertexLayout[3];
-                if (_data[VB0] != null)
+                if (_data[VB0] != null && _data[VB0].Length != 0)
                 {
                     vbData[0] = dataPtr[VB0];
                     vbLayout[0] = _layouts[VB0];
                     vertices = (uint)_data[VB0].Length / _layouts[VB0].Stride;
                 }
-                if (_data[VB1] != null)
+                if (_data[VB1] != null && _data[VB1].Length != 0)
                 {
                     vbData[1] = dataPtr[VB1];
                     vbLayout[1] = _layouts[VB1];
                     vertices = (uint)_data[VB1].Length / _layouts[VB1].Stride;
                 }
-                if (_data[VB2] != null)
+                if (_data[VB2] != null && _data[VB2].Length != 0)
                 {
                     vbData[2] = dataPtr[VB2];
                     vbLayout[2] = _layouts[VB2];
@@ -798,6 +810,16 @@ namespace FlaxEngine
             set => SetStreamFloat3(VertexElement.Types.Normal, value, PackNormal);
         }
 
+        /// <summary>
+        /// Gets or sets the vertex tangent vectors (unpacked, normalized). Null if <see cref="VertexElement.Types.Tangent"/> does not exist in vertex buffers of the mesh.
+        /// </summary>
+        /// <remarks>Uses <see cref="Tangent"/> stream to read or write data to the vertex buffer.</remarks>
+        public Float3[] Tangents
+        {
+            get => GetStreamFloat3(VertexElement.Types.Tangent, UnpackNormal);
+            set => SetStreamFloat3(VertexElement.Types.Tangent, value, PackNormal);
+        }
+
         /// <summary>
         /// Gets or sets the vertex UVs (texcoord channel 0). Null if <see cref="VertexElement.Types.TexCoord"/> does not exist in vertex buffers of the mesh.
         /// </summary>
@@ -808,6 +830,70 @@ namespace FlaxEngine
             set => SetStreamFloat2(VertexElement.Types.TexCoord, value);
         }
 
+        /// <summary>
+        /// Recalculates normal vectors for all vertices.
+        /// </summary>
+        public void ComputeNormals()
+        {
+            var positions = Position();
+            var indices = Index();
+            if (!positions)
+                throw new Exception("Cannot compute tangents without positions.");
+            if (!indices)
+                throw new Exception("Cannot compute tangents without indices.");
+            if (!Normal())
+                throw new Exception("Cannot compute tangents without Normal vertex element.");
+            var vertexCount = positions.Count;
+            if (vertexCount == 0)
+                return;
+            var indexCount = indices.Count;
+
+            // Compute per-face normals but store them per-vertex
+            var normals = new Float3[vertexCount];
+            for (int i = 0; i < indexCount; i += 3)
+            {
+                var i1 = indices.GetInt(i + 0);
+                var i2 = indices.GetInt(i + 1);
+                var i3 = indices.GetInt(i + 2);
+                Float3 v1 = positions.GetFloat3(i1);
+                Float3 v2 = positions.GetFloat3(i2);
+                Float3 v3 = positions.GetFloat3(i3);
+                Float3 n = Float3.Cross((v2 - v1), (v3 - v1)).Normalized;
+
+                normals[i1] += n;
+                normals[i2] += n;
+                normals[i3] += n;
+            }
+
+            // Average normals
+            for (int i = 0; i < normals.Length; i++)
+                normals[i] = normals[i].Normalized;
+
+            // Write back to the buffer
+            Normals = normals;
+        }
+
+        /// <summary>
+        /// Recalculates tangent vectors for all vertices based on normals.
+        /// </summary>
+        public void ComputeTangents()
+        {
+            var normals = Normal();
+            var tangents = Tangent();
+            if (!normals)
+                throw new Exception("Cannot compute tangents without normals.");
+            if (!tangents)
+                throw new Exception("Cannot compute tangents without Tangent vertex element.");
+            var count = normals.Count;
+            for (int i = 0; i < count; i++)
+            {
+                Float3 normal = normals.GetFloat3(i);
+                UnpackNormal(ref normal);
+                RenderTools.CalculateTangentFrame(out var n, out var t, ref normal);
+                tangents.SetFloat4(i, t);
+            }
+        }
+
         private uint[] GetStreamUInt(Stream stream)
         {
             uint[] result = null;
diff --git a/Source/Engine/Graphics/Models/MeshAccessor.h b/Source/Engine/Graphics/Models/MeshAccessor.h
index 595f76c6b..8bedfdc7f 100644
--- a/Source/Engine/Graphics/Models/MeshAccessor.h
+++ b/Source/Engine/Graphics/Models/MeshAccessor.h
@@ -38,6 +38,11 @@ public:
         bool IsValid() const;
         bool IsLinear(PixelFormat expectedFormat) const;
 
+        FORCE_INLINE operator bool() const
+        {
+            return IsValid();
+        }
+
         FORCE_INLINE int32 GetInt(int32 index) const
         {
             ASSERT_LOW_LAYER(index * _stride < _data.Length());
diff --git a/Source/Engine/Graphics/RenderTools.cpp b/Source/Engine/Graphics/RenderTools.cpp
index effbe6e1b..2cf1c9707 100644
--- a/Source/Engine/Graphics/RenderTools.cpp
+++ b/Source/Engine/Graphics/RenderTools.cpp
@@ -548,6 +548,13 @@ void RenderTools::ComputeCascadeUpdateFrequency(int32 cascadeIndex, int32 cascad
     }
 }
 
+bool RenderTools::ShouldUpdateCascade(int32 frameIndex, int32 cascadeIndex, int32 cascadeCount, int32 updateMaxCountPerFrame, bool updateForce)
+{
+    int32 updateFrequency, updatePhrase;
+    ComputeCascadeUpdateFrequency(cascadeIndex, cascadeCount, updateFrequency, updatePhrase, updateMaxCountPerFrame);
+    return (frameIndex % updateFrequency == updatePhrase) || updateForce;
+}
+
 float RenderTools::ComputeTemporalTime()
 {
     const float time = Time::Draw.UnscaledTime.GetTotalSeconds();
diff --git a/Source/Engine/Graphics/RenderTools.h b/Source/Engine/Graphics/RenderTools.h
index 5f0dc23dc..0608c4338 100644
--- a/Source/Engine/Graphics/RenderTools.h
+++ b/Source/Engine/Graphics/RenderTools.h
@@ -119,12 +119,7 @@ public:
     static void ComputeCascadeUpdateFrequency(int32 cascadeIndex, int32 cascadeCount, int32& updateFrequency, int32& updatePhrase, int32 updateMaxCountPerFrame = 1);
 
     // Checks if cached data should be updated during the given frame.
-    FORCE_INLINE static bool ShouldUpdateCascade(int32 frameIndex, int32 cascadeIndex, int32 cascadeCount, int32 updateMaxCountPerFrame = 1, bool updateForce = false)
-    {
-        int32 updateFrequency, updatePhrase;
-        ComputeCascadeUpdateFrequency(cascadeIndex, cascadeCount, updateFrequency, updatePhrase, updateMaxCountPerFrame);
-        return (frameIndex % updateFrequency == updatePhrase) || updateForce;
-    }
+    static bool ShouldUpdateCascade(int32 frameIndex, int32 cascadeIndex, int32 cascadeCount, int32 updateMaxCountPerFrame = 1, bool updateForce = false);
 
     // Calculates temporal offset in the dithering factor that gets cleaned out by TAA.
     // Returns 0-1 value based on unscaled draw time for temporal effects to reduce artifacts from screen-space dithering when using Temporal Anti-Aliasing.
@@ -136,8 +131,9 @@ public:
     DEPRECATED("Use CalculateTangentFrame with unpacked Float3/Float4.") static void CalculateTangentFrame(FloatR10G10B10A2& resultNormal, FloatR10G10B10A2& resultTangent, const Float3& normal, const Float3& tangent);
 
     // Result normal/tangent are already packed into [0;1] range.
-    static void CalculateTangentFrame(Float3& resultNormal, Float4& resultTangent, const Float3& normal);
-    static void CalculateTangentFrame(Float3& resultNormal, Float4& resultTangent, const Float3& normal, const Float3& tangent);
+    API_FUNCTION() static void CalculateTangentFrame(API_PARAM(Out) Float3& resultNormal, API_PARAM(Out) Float4& resultTangent, API_PARAM(Ref) const Float3& normal);
+    // Result normal/tangent are already packed into [0;1] range.
+    API_FUNCTION() static void CalculateTangentFrame(API_PARAM(Out) Float3& resultNormal, API_PARAM(Out) Float4& resultTangent, API_PARAM(Ref) const Float3& normal, API_PARAM(Ref) const Float3& tangent);
 
     static void ComputeSphereModelDrawMatrix(const RenderView& view, const Float3& position, float radius, Matrix& resultWorld, bool& resultIsViewInside);
 

From 09a05739321a5793ce6eb1b3e56e202059e92603 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 26 Mar 2026 17:14:14 +0100
Subject: [PATCH 199/203] Fix `MeshAccessor.Stream` count for items not aligned
 to buffer start

---
 Source/Engine/Graphics/Models/MeshAccessor.cs | 17 ++++++++++-------
 Source/Engine/Graphics/Models/MeshAccessor.h  |  4 ++--
 Source/Engine/Graphics/Models/MeshBase.cpp    | 15 +++++++++------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Source/Engine/Graphics/Models/MeshAccessor.cs b/Source/Engine/Graphics/Models/MeshAccessor.cs
index b1a7eebd4..cd216cdf5 100644
--- a/Source/Engine/Graphics/Models/MeshAccessor.cs
+++ b/Source/Engine/Graphics/Models/MeshAccessor.cs
@@ -18,13 +18,14 @@ namespace FlaxEngine
         {
             private Span<byte> _data;
             private PixelFormat _format;
-            private int _stride;
+            private int _stride, _count;
             private readonly PixelFormatSampler _sampler;
 
-            internal Stream(Span<byte> data, PixelFormat format, int stride)
+            internal Stream(Span<byte> data, PixelFormat format, int stride, int count)
             {
                 _data = data;
                 _stride = stride;
+                _count = count;
                 if (PixelFormatSampler.Get(format, out _sampler))
                 {
                     _format = format;
@@ -53,7 +54,7 @@ namespace FlaxEngine
             /// <summary>
             /// Gets the count of the items in the stride.
             /// </summary>
-            public int Count => _data.Length / _stride;
+            public int Count => _count;
 
             /// <summary>
             /// Returns true if stream is valid.
@@ -664,15 +665,16 @@ namespace FlaxEngine
         {
             Span<byte> data = new Span<byte>();
             PixelFormat format = PixelFormat.Unknown;
-            int stride = 0;
+            int stride = 0, count = 0;
             var ib = _data[(int)MeshBufferType.Index];
             if (ib != null)
             {
                 data = ib;
                 format = _formats[(int)MeshBufferType.Index];
                 stride = PixelFormatExtensions.SizeInBytes(format);
+                count = data.Length / stride;
             }
-            return new Stream(data, format, stride);
+            return new Stream(data, format, stride, count);
         }
 
         /// <summary>
@@ -684,7 +686,7 @@ namespace FlaxEngine
         {
             Span<byte> data = new Span<byte>();
             PixelFormat format = PixelFormat.Unknown;
-            int stride = 0;
+            int stride = 0, count = 0;
             for (int vbIndex = 0; vbIndex < 3 && format == PixelFormat.Unknown; vbIndex++)
             {
                 int idx = vbIndex + 1;
@@ -699,11 +701,12 @@ namespace FlaxEngine
                         data = new Span<byte>(vb).Slice(e.Offset);
                         format = e.Format;
                         stride = (int)layout.Stride;
+                        count = vb.Length / stride;
                         break;
                     }
                 }
             }
-            return new Stream(data, format, stride);
+            return new Stream(data, format, stride, count);
         }
 
         /// <summary>
diff --git a/Source/Engine/Graphics/Models/MeshAccessor.h b/Source/Engine/Graphics/Models/MeshAccessor.h
index 8bedfdc7f..f0b40b623 100644
--- a/Source/Engine/Graphics/Models/MeshAccessor.h
+++ b/Source/Engine/Graphics/Models/MeshAccessor.h
@@ -25,10 +25,10 @@ public:
     private:
         Span<byte> _data;
         PixelFormat _format;
-        int32 _stride;
+        int32 _stride, _count;
         PixelFormatSampler _sampler;
 
-        Stream(Span<byte> data, PixelFormat format, int32 stride);
+        Stream(Span<byte> data, PixelFormat format, int32 stride, int32 count);
 
     public:
         Span<byte> GetData() const;
diff --git a/Source/Engine/Graphics/Models/MeshBase.cpp b/Source/Engine/Graphics/Models/MeshBase.cpp
index 81fffb3e7..435f6d0c8 100644
--- a/Source/Engine/Graphics/Models/MeshBase.cpp
+++ b/Source/Engine/Graphics/Models/MeshBase.cpp
@@ -38,10 +38,11 @@ namespace
 #endif
 }
 
-MeshAccessor::Stream::Stream(Span<byte> data, PixelFormat format, int32 stride)
+MeshAccessor::Stream::Stream(Span<byte> data, PixelFormat format, int32 stride, int32 count)
     : _data(data)
     , _format(PixelFormat::Unknown)
     , _stride(stride)
+    , _count(count)
 {
     auto sampler = PixelFormatSampler::Get(format);
     if (sampler)
@@ -72,7 +73,7 @@ int32 MeshAccessor::Stream::GetStride() const
 
 int32 MeshAccessor::Stream::GetCount() const
 {
-    return _data.Length() / _stride;
+    return _count;
 }
 
 bool MeshAccessor::Stream::IsValid() const
@@ -368,22 +369,23 @@ MeshAccessor::Stream MeshAccessor::Index()
 {
     Span<byte> data;
     PixelFormat format = PixelFormat::Unknown;
-    int32 stride = 0;
+    int32 stride = 0, count = 0;
     auto& ib = _data[(int32)MeshBufferType::Index];
     if (ib.IsValid())
     {
         data = ib;
         format = _formats[(int32)MeshBufferType::Index];
         stride = PixelFormatExtensions::SizeInBytes(format);
+        count = data.Length() / stride;
     }
-    return Stream(data, format, stride);
+    return Stream(data, format, stride, count);
 }
 
 MeshAccessor::Stream MeshAccessor::Attribute(VertexElement::Types attribute)
 {
     Span<byte> data;
     PixelFormat format = PixelFormat::Unknown;
-    int32 stride = 0;
+    int32 stride = 0, count = 0;
     for (int32 vbIndex = 0; vbIndex < 3 && format == PixelFormat::Unknown; vbIndex++)
     {
         static_assert((int32)MeshBufferType::Vertex0 == 1, "Update code.");
@@ -399,11 +401,12 @@ MeshAccessor::Stream MeshAccessor::Attribute(VertexElement::Types attribute)
                 data = vb.Slice(e.Offset);
                 format = e.Format;
                 stride = layout->GetStride();
+                count = vb.Length() / stride;
                 break;
             }
         }
     }
-    return Stream(data, format, stride);
+    return Stream(data, format, stride, count);
 }
 
 MeshBase::~MeshBase()

From 58586ca4f0ebf6bfd4cef8937fefea1b28a8229a Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 26 Mar 2026 17:17:13 +0100
Subject: [PATCH 200/203] Add small improvement to terrain normals

---
 Source/Engine/Terrain/TerrainPatch.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Engine/Terrain/TerrainPatch.cpp b/Source/Engine/Terrain/TerrainPatch.cpp
index cadc9821c..e579c05f7 100644
--- a/Source/Engine/Terrain/TerrainPatch.cpp
+++ b/Source/Engine/Terrain/TerrainPatch.cpp
@@ -439,7 +439,7 @@ void UpdateNormalsAndHoles(const TerrainDataUpdateInfo& info, const float* heigh
             // Calculate normals for quad two vertices
             Float3 n0 = Float3::Normalize((v00 - v01) ^ (v01 - v10));
             Float3 n1 = Float3::Normalize((v11 - v10) ^ (v10 - v01));
-            Float3 n2 = n0 + n1;
+            Float3 n2 = Float3::Normalize(n0 + n1);
 
             // Apply normal to each vertex using it
             normalsPerVertex[i00] += n1;

From f5651de725d320b8a1dec22a03b463e1672d30ea Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 27 Mar 2026 10:16:32 +0100
Subject: [PATCH 201/203] Add NDK 27 as minimum for Android to fix 16kb page
 alignment issue on `libc++_shared.so`

---
 .../Tools/Flax.Build/Platforms/Android/AndroidNdk.cs  | 11 ++++++++++-
 .../Flax.Build/Platforms/Android/AndroidToolchain.cs  |  7 +++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Source/Tools/Flax.Build/Platforms/Android/AndroidNdk.cs b/Source/Tools/Flax.Build/Platforms/Android/AndroidNdk.cs
index a1018368b..00838a73d 100644
--- a/Source/Tools/Flax.Build/Platforms/Android/AndroidNdk.cs
+++ b/Source/Tools/Flax.Build/Platforms/Android/AndroidNdk.cs
@@ -67,7 +67,8 @@ namespace Flax.Build.Platforms
             if (subDirs.Length != 0)
             {
                 Utilities.SortVersionDirectories(subDirs);
-                FindNDK(subDirs.Last());
+                for (int i = subDirs.Length - 1; i >= 0 && !IsValid; i--)
+                    FindNDK(subDirs[i]);
             }
 
             if (!IsValid)
@@ -109,6 +110,14 @@ namespace Flax.Build.Platforms
             }
             if (IsValid)
             {
+                var minVersion = new Version(27, 0); // NDK 27 (and newer) contains the libc++_shared.so with 16kb alignment
+                if (Version < minVersion)
+                {
+                    IsValid = false;
+                    Log.Verbose(RootPath);
+                    Log.Error(string.Format("Unsupported Android NDK version {0}. Minimum supported is {1}.", Version, minVersion));
+                    return;
+                }
                 RootPath = sdkPath;
                 Log.Info(string.Format("Found Android NDK {1} at {0}", RootPath, Version));
             }
diff --git a/Source/Tools/Flax.Build/Platforms/Android/AndroidToolchain.cs b/Source/Tools/Flax.Build/Platforms/Android/AndroidToolchain.cs
index d88cdbd51..9448a7c4d 100644
--- a/Source/Tools/Flax.Build/Platforms/Android/AndroidToolchain.cs
+++ b/Source/Tools/Flax.Build/Platforms/Android/AndroidToolchain.cs
@@ -104,6 +104,9 @@ namespace Flax.Build.Platforms
                 args.Add("-fno-function-sections");
             }
 
+            // Support 16kb pages
+            args.Add("-D__BIONIC_NO_PAGE_SIZE_MACRO");
+
             switch (Architecture)
             {
             case TargetArchitecture.x86:
@@ -195,10 +198,10 @@ namespace Flax.Build.Platforms
             {
                 // https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md#libc
                 var ndkPath = AndroidNdk.Instance.RootPath;
-                var libCppSharedPath = Path.Combine(ndkPath, "sources/cxx-stl/llvm-libc++/libs/", GetAbiName(Architecture), "libc++_shared.so"); // NDK24 (and older) location
+                var libCppSharedPath = Path.Combine(ndkPath, "toolchains/llvm/prebuilt", AndroidSdk.GetHostName(), "sysroot/usr/lib/", GetToolchainName(TargetPlatform.Android, Architecture), "libc++_shared.so"); // NDK25+ location
                 if (!File.Exists(libCppSharedPath))
                 {
-                    libCppSharedPath = Path.Combine(ndkPath, "toolchains/llvm/prebuilt", AndroidSdk.GetHostName(), "sysroot/usr/lib/", GetToolchainName(TargetPlatform.Android, Architecture), "libc++_shared.so"); // NDK25+ location
+                    libCppSharedPath = Path.Combine(ndkPath, "sources/cxx-stl/llvm-libc++/libs/", GetAbiName(Architecture), "libc++_shared.so"); // NDK24 (and older) location
                     if (!File.Exists(libCppSharedPath))
                         throw new Exception($"Missing Android NDK `libc++_shared.so` for architecture {Architecture}.");
                 }

From 8f50d9faec925df6e3c878b2e603550da6165d4b Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 27 Mar 2026 11:06:11 +0100
Subject: [PATCH 202/203] Fix terrain collision geometry order to match heights
 buffer

#3844
---
 Source/Engine/Terrain/TerrainPatch.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Engine/Terrain/TerrainPatch.cpp b/Source/Engine/Terrain/TerrainPatch.cpp
index e579c05f7..164fce747 100644
--- a/Source/Engine/Terrain/TerrainPatch.cpp
+++ b/Source/Engine/Terrain/TerrainPatch.cpp
@@ -2572,9 +2572,9 @@ void TerrainPatch::ExtractCollisionGeometry(Array<Float3>& vertexBuffer, Array<i
             const int32 vertexCount = rows * cols;
             _collisionVertices.Resize(vertexCount);
             Float3* vb = _collisionVertices.Get();
-            for (int32 row = 0; row < rows; row++)
+            for (int32 col = 0; col < cols; col++)
             {
-                for (int32 col = 0; col < cols; col++)
+                for (int32 row = 0; row < rows; row++)
                 {
                     Float3 v((float)row, PhysicsBackend::GetHeightFieldHeight(_physicsHeightField, row, col) / TERRAIN_PATCH_COLLISION_QUANTIZATION, (float)col);
                     Float3::Transform(v, world, v);
@@ -2591,9 +2591,9 @@ void TerrainPatch::ExtractCollisionGeometry(Array<Float3>& vertexBuffer, Array<i
     const int32 indexCount = (rows - 1) * (cols - 1) * 6;
     indexBuffer.Resize(indexCount);
     int32* ib = indexBuffer.Get();
-    for (int32 row = 0; row < rows - 1; row++)
+    for (int32 col = 0; col < cols - 1; col++)
     {
-        for (int32 col = 0; col < cols - 1; col++)
+        for (int32 row = 0; row < rows - 1; row++)
         {
 #define GET_INDEX(x, y) *ib++ = (col + (y)) + (row + (x)) * cols
 

From 0e1c5cd6f8f32902bf6a51745b0ce669e8d0d85e Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 27 Mar 2026 11:16:25 +0100
Subject: [PATCH 203/203] Bump up build number

---
 Flax.flaxproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flax.flaxproj b/Flax.flaxproj
index 78c03fce6..dc126772a 100644
--- a/Flax.flaxproj
+++ b/Flax.flaxproj
@@ -4,7 +4,7 @@
     "Major": 1,
     "Minor": 11,
     "Revision": 0,
-    "Build": 6808
+    "Build": 6809
   },
   "Company": "Flax",
   "Copyright": "Copyright (c) 2012-2026 Wojciech Figat. All rights reserved.",