Merge remote-tracking branch 'origin/master'

#1829

.gitignore

@@ -12,6 +12,7 @@ Source/*.csproj
 /Package_*/
 !Source/Engine/Debug
 /Source/Platforms/Editor/Linux/Mono/etc/mono/registry
+PackageEditor_Cert.command
 PackageEditor_Cert.bat
 PackagePlatforms_Cert.bat
 

Content/Editor/Scripting/ScriptTemplate.cs

@@ -2,35 +2,34 @@
 using System.Collections.Generic;
 using FlaxEngine;
 
-namespace %namespace%
+namespace %namespace%;
+
+/// <summary>
+/// %class% Script.
+/// </summary>
+public class %class% : Script
 {
-    /// <summary>
-    /// %class% Script.
-    /// </summary>
-    public class %class% : Script
+    /// <inheritdoc/>
+    public override void OnStart()
     {
-        /// <inheritdoc/>
-        public override void OnStart()
-        {
-            // Here you can add code that needs to be called when script is created, just before the first game update
-        }
-        
-        /// <inheritdoc/>
-        public override void OnEnable()
-        {
-            // Here you can add code that needs to be called when script is enabled (eg. register for events)
-        }
+        // Here you can add code that needs to be called when script is created, just before the first game update
+    }
+    
+    /// <inheritdoc/>
+    public override void OnEnable()
+    {
+        // Here you can add code that needs to be called when script is enabled (eg. register for events)
+    }
 
-        /// <inheritdoc/>
-        public override void OnDisable()
-        {
-            // Here you can add code that needs to be called when script is disabled (eg. unregister from events)
-        }
+    /// <inheritdoc/>
+    public override void OnDisable()
+    {
+        // Here you can add code that needs to be called when script is disabled (eg. unregister from events)
+    }
 
-        /// <inheritdoc/>
-        public override void OnUpdate()
-        {
-            // Here you can add code that needs to be called every frame
-        }
+    /// <inheritdoc/>
+    public override void OnUpdate()
+    {
+        // Here you can add code that needs to be called every frame
     }
 }

Development/Scripts/Windows/CallBuildTool.bat

@@ -11,16 +11,6 @@ for %%I in (Source\Logo.png) do if %%~zI LSS 2000 (
 call "Development\Scripts\Windows\GetMSBuildPath.bat"
 if errorlevel 1 goto Error_NoVisualStudioEnvironment
 
-if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" goto Compile
-for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath') do (
-	for %%j in (15.0, Current) do (
-		if exist "%%i\MSBuild\%%j\Bin\MSBuild.exe" (
-			set MSBUILD_PATH="%%i\MSBuild\%%j\Bin\MSBuild.exe"
-			goto Compile
-		)
-	)
-)
-
 :Compile
 md Cache\Intermediate >nul 2>nul
 dir /s /b Source\Tools\Flax.Build\*.cs >Cache\Intermediate\Flax.Build.Files.txt
@@ -44,7 +34,7 @@ goto Exit
 echo CallBuildTool ERROR: The script is in invalid directory.
 goto Exit
 :Error_NoVisualStudioEnvironment
-echo CallBuildTool ERROR: Missing Visual Studio 2015 or newer.
+echo CallBuildTool ERROR: Missing Visual Studio 2022 or newer.
 goto Exit
 :Error_CompilationFailed
 echo CallBuildTool ERROR: Failed to compile Flax.Build project.

Development/Scripts/Windows/GetMSBuildPath.bat

@@ -4,66 +4,26 @@ rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 set MSBUILD_PATH=
 
+rem Look for MSBuild version 17.0 or later
 if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" goto VsWhereNotFound
-for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath') do (
-	if exist "%%i\MSBuild\15.0\Bin\MSBuild.exe" (
-		set MSBUILD_PATH="%%i\MSBuild\15.0\Bin\MSBuild.exe"
-		goto End
-	)
-)
-for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -latest -prerelease -products * -requires Microsoft.Component.MSBuild -property installationPath') do (
-	if exist "%%i\MSBuild\15.0\Bin\MSBuild.exe" (
-		set MSBUILD_PATH="%%i\MSBuild\15.0\Bin\MSBuild.exe"
-		goto End
-	)
+for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -version 17.0 -latest -products * -requires Microsoft.Component.MSBuild -property installationPath') do (
 	if exist "%%i\MSBuild\Current\Bin\MSBuild.exe" (
 		set MSBUILD_PATH="%%i\MSBuild\Current\Bin\MSBuild.exe"
 		goto End
 	)
 )
-:VsWhereNotFound
 
-if exist "%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe" (
-	set MSBUILD_PATH="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe"
-	goto End
+rem Look for MSBuild version 17.0 or later in pre-release versions
+for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -version 17.0 -latest -prerelease -products * -requires Microsoft.Component.MSBuild -property installationPath') do (
+	if exist "%%i\MSBuild\Current\Bin\MSBuild.exe" (
+		set MSBUILD_PATH="%%i\MSBuild\Current\Bin\MSBuild.exe"
+		goto End
+	)
 )
-
-call :GetInstallPath Microsoft\VisualStudio\SxS\VS7 15.0 MSBuild\15.0\bin\MSBuild.exe
-if not errorlevel 1 goto End
-call :GetInstallPath Microsoft\MSBuild\ToolsVersions\14.0 MSBuildToolsPath MSBuild.exe
-if not errorlevel 1 goto End
-call :GetInstallPath Microsoft\MSBuild\ToolsVersions\12.0 MSBuildToolsPath MSBuild.exe
-if not errorlevel 1 goto End
-call :GetInstallPath Microsoft\MSBuild\ToolsVersions\4.0 MSBuildToolsPath MSBuild.exe
-if not errorlevel 1 goto End
-
+echo GetMSBuildPath ERROR: Could not find MSBuild version 17.0 or later.
+exit /B 1
+:VsWhereNotFound
+echo GetMSBuildPath ERROR: vswhere.exe was not found.
 exit /B 1
 :End
-exit /B 0
-
-:GetInstallPath
-for /f "tokens=2,*" %%A in ('REG.exe query HKCU\SOFTWARE\%1 /v %2 2^>Nul') do (
-	if exist "%%B%%3" (
-		set MSBUILD_PATH="%%B%3"
-		exit /B 0
-	)
-)
-for /f "tokens=2,*" %%A in ('REG.exe query HKLM\SOFTWARE\%1 /v %2 2^>Nul') do (
-	if exist "%%B%3" (
-		set MSBUILD_PATH="%%B%3"
-		exit /B 0
-	)
-)
-for /f "tokens=2,*" %%A in ('REG.exe query HKCU\SOFTWARE\Wow6432Node\%1 /v %2 2^>Nul') do (
-	if exist "%%B%%3" (
-		set MSBUILD_PATH="%%B%3"
-		exit /B 0
-	)
-)
-for /f "tokens=2,*" %%A in ('REG.exe query HKLM\SOFTWARE\Wow6432Node\%1 /v %2 2^>Nul') do (
-	if exist "%%B%3" (
-		set MSBUILD_PATH="%%B%3"
-		exit /B 0
-	)
-)
-exit /B 1
+exit /B 0

Flax.flaxproj

@@ -2,8 +2,9 @@
   "Name": "Flax",
   "Version": {
     "Major": 1,
-    "Minor": 6,
-    "Build": 6344
+    "Minor": 7,
+    "Revision": 0,
+    "Build": 6404
   },
   "Company": "Flax",
   "Copyright": "Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.",

Flax.sln.DotSettings

@@ -248,6 +248,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bitangent/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bitangents/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bokeh/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=borderless/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=BRDF/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=coeff/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=colliders/@EntryIndexedValue">True</s:Boolean>
@@ -255,6 +256,8 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=comperand/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=coord/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=cubemap/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Deformer/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=deformers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=defragmentation/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Delaunay/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Defocus/@EntryIndexedValue">True</s:Boolean>
@@ -290,6 +293,8 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=lightmaps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Linearize/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=lods/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Marshallable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=marshallers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=mclass/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=memcpy/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=metalness/@EntryIndexedValue">True</s:Boolean>
@@ -318,6 +323,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=raycast/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=raycasting/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=raycasts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=reachability/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=readback/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Reimports/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=reimported/@EntryIndexedValue">True</s:Boolean>

GenerateProjectFiles.bat

@@ -1,15 +1,22 @@
 @echo off
-
-rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+:: Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd
+
 echo Generating Flax Engine project files...
 
-rem Run Flax.Build to generate Visual Studio solution and project files (also pass the arguments)
-call "Development\Scripts\Windows\CallBuildTool.bat" -genproject %*
+:: Change the path to the script root
+cd /D "%~dp0"
+
+:: Run Flax.Build to generate Visual Studio solution and project files (also pass the arguments)
+call "Development\Scripts\Windows\CallBuildTool.bat" -genproject  %*
 if errorlevel 1 goto BuildToolFailed
 
+:: Build bindings for all editor configurations
+echo Building C# bindings...
+Binaries\Tools\Flax.Build.exe -build -BuildBindingsOnly -arch=x64 -platform=Windows --buildTargets=FlaxEditor
+
 popd
 echo Done!
 exit /B 0

GenerateProjectFiles.command

@@ -10,3 +10,8 @@ cd "`dirname "$0"`"
 
 # Run Flax.Build to generate project files (also pass the arguments)
 bash ./Development/Scripts/Mac/CallBuildTool.sh --genproject "$@"
+
+# Build bindings for all editor configurations
+echo Building C# bindings...
+# TODO: Detect the correct architecture here
+Binaries/Tools/Flax.Build -build -BuildBindingsOnly -arch=ARM64 -platform=Mac --buildTargets=FlaxEditor

GenerateProjectFiles.sh

@@ -10,3 +10,8 @@ cd "`dirname "$0"`"
 
 # Run Flax.Build to generate project files (also pass the arguments)
 bash ./Development/Scripts/Linux/CallBuildTool.sh --genproject "$@"
+
+# Build bindings for all editor configurations
+echo Building C# bindings...
+# TODO: Detect the correct architecture here
+Binaries/Tools/Flax.Build -build -BuildBindingsOnly -arch=x64 -platform=Linux --buildTargets=FlaxEditor

README.md

@@ -4,7 +4,7 @@
 <a href="https://flaxengine.com/discord"><img src="https://discordapp.com/api/guilds/437989205315158016/widget.png"/></a>
 
 Flax Engine is a high quality modern 3D game engine written in C++ and C#.
-From stunning graphics to powerful scripts - Flax can give everything for your games. Designed for fast workflow with many ready to use features waiting for you right now. To learn more see the website ([www.flaxengine.com](https://flaxengine.com)).
+From stunning graphics to powerful scripts, it's designed for fast workflow with many ready-to-use features waiting for you right now. To learn more see the website ([www.flaxengine.com](https://flaxengine.com)).
 
 This repository contains full source code of the Flax Engine (excluding NDA-protected platforms support). Anyone is welcome to contribute or use the modified source in Flax-based games.
 
@@ -31,19 +31,20 @@ Follow the instructions below to compile and run the engine from source.
 * Install Visual Studio 2022 or newer
 * Install Windows 8.1 SDK or newer (via Visual Studio Installer)
 * Install Microsoft Visual C++ 2015 v140 toolset or newer (via Visual Studio Installer)
-* Install .Net 7 SDK (via Visual Studio Installer or [from web](https://dotnet.microsoft.com/en-us/download/dotnet/7.0))
+* Install .NET 7 SDK for **Windows x64** (via Visual Studio Installer or [from web](https://dotnet.microsoft.com/en-us/download/dotnet/7.0))
 * Install Git with LFS
 * Clone repo (with LFS)
 * Run **GenerateProjectFiles.bat**
 * Open `Flax.sln` and set solution configuration to **Editor.Development** and solution platform to **Win64**
 * Set Flax (C++) or FlaxEngine (C#) as startup project
 * Compile Flax project (hit F7 or CTRL+Shift+B)
+* Optionally set Debug Type to **Managed Only (.NET Core)** to debug C#-only, or **Mixed (.NET Core)** to debug both C++ and C#
 * Run Flax (hit F5 key)
 
 ## Linux
 
 * Install Visual Studio Code
-* Install .Net 7 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0))
+* Install .NET 7 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0))
   * Ubuntu: `sudo apt install dotnet-sdk-7.0`
 * Install Vulkan SDK ([https://vulkan.lunarg.com/](https://vulkan.lunarg.com/))
   * Ubuntu: `sudo apt install vulkan-sdk`
@@ -66,7 +67,7 @@ Follow the instructions below to compile and run the engine from source.
 ## Mac
 
 * Install XCode
-* Install .Net 7 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0))
+* Install .NET 7 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0))
 * Install Vulkan SDK ([https://vulkan.lunarg.com/](https://vulkan.lunarg.com/))
 * Clone repo (with LFS)
 * Run `GenerateProjectFiles.command`

Source/Editor/Content/GUI/ContentNavigation.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using FlaxEditor.GUI;
+using FlaxEditor.GUI.ContextMenu;
 using FlaxEditor.GUI.Drag;
 using FlaxEngine;
 using FlaxEngine.GUI;
@@ -31,7 +32,7 @@ namespace FlaxEditor.Content.GUI
         : base(x, y, height)
         {
             TargetNode = targetNode;
-            Text = targetNode.NavButtonLabel + "/";
+            Text = targetNode.NavButtonLabel;
         }
 
         /// <inheritdoc />
@@ -72,7 +73,6 @@ namespace FlaxEditor.Content.GUI
 
             if (_dragOverItems == null)
                 _dragOverItems = new DragItems(ValidateDragItem);
-
             _dragOverItems.OnDragEnter(data);
             var result = GetDragEffect(data);
             _validDragOver = result != DragDropEffect.None;
@@ -122,4 +122,70 @@ namespace FlaxEditor.Content.GUI
             return result;
         }
     }
+
+    sealed class ContentNavigationSeparator : ComboBox
+    {
+        public ContentNavigationButton Target;
+
+        public ContentNavigationSeparator(ContentNavigationButton target, float x, float y, float height)
+        {
+            Target = target;
+            Bounds = new Rectangle(x, y, 16, height);
+            Offsets = new Margin(Bounds.X, Bounds.Width, Bounds.Y, Bounds.Height);
+            UpdateTransform();
+
+            MaximumItemsInViewCount = 20;
+            var style = Style.Current;
+            BackgroundColor = style.BackgroundNormal;
+            BackgroundColorHighlighted = BackgroundColor;
+            BackgroundColorSelected = BackgroundColor;
+        }
+
+        protected override ContextMenu OnCreatePopup()
+        {
+            // Update items
+            ClearItems();
+            foreach (var child in Target.TargetNode.Children)
+            {
+                if (child is ContentTreeNode node)
+                {
+                    if (node.Folder.VisibleInHierarchy) // Respect the filter set by ContentFilterConfig.Filter(...)
+                        AddItem(node.Folder.ShortName);
+                }
+            }
+
+            return base.OnCreatePopup();
+        }
+
+        public override void Draw()
+        {
+            var style = Style.Current;
+            var rect = new Rectangle(Float2.Zero, Size);
+            var color = IsDragOver ? style.BackgroundSelected * 0.6f : (_mouseDown ? style.BackgroundSelected : (IsMouseOver ? style.BackgroundHighlighted : Color.Transparent));
+            Render2D.FillRectangle(rect, color);
+            Render2D.DrawSprite(Editor.Instance.Icons.ArrowRight12, new Rectangle(rect.Location.X, rect.Y + rect.Size.Y * 0.25f, rect.Size.X, rect.Size.X), EnabledInHierarchy ? style.Foreground : style.ForegroundDisabled);
+        }
+
+        protected override void OnLayoutMenuButton(ContextMenuButton button, int index, bool construct = false)
+        {
+            button.Icon = Editor.Instance.Icons.FolderClosed32;
+            if (_tooltips != null && _tooltips.Length > index)
+                button.TooltipText = _tooltips[index];
+        }
+
+        protected override void OnItemClicked(int index)
+        {
+            base.OnItemClicked(index);
+
+            var item = _items[index];
+            foreach (var child in Target.TargetNode.Children)
+            {
+                if (child is ContentTreeNode node && node.Folder.ShortName == item)
+                {
+                    Editor.Instance.Windows.ContentWin.Navigate(node);
+                    return;
+                }
+            }
+        }
+    }
 }

Source/Editor/Content/GUI/ContentView.DragDrop.cs

@@ -45,8 +45,14 @@ namespace FlaxEditor.Content.GUI
 
         private void ImportActors(DragActors actors, ContentFolder location)
         {
-            // Use only the first actor
-            Editor.Instance.Prefabs.CreatePrefab(actors.Objects[0].Actor);
+            foreach (var actorNode in actors.Objects)
+            {
+                var actor = actorNode.Actor;
+                if (actors.Objects.Contains(actorNode.ParentNode as ActorNode))
+                    continue;
+
+                Editor.Instance.Prefabs.CreatePrefab(actor, false);
+            }
         }
 
         /// <inheritdoc />
@@ -62,7 +68,7 @@ namespace FlaxEditor.Content.GUI
                 _validDragOver = true;
                 result = DragDropEffect.Copy;
             }
-            else if (_dragActors.HasValidDrag)
+            else if (_dragActors != null && _dragActors.HasValidDrag)
             {
                 _validDragOver = true;
                 result = DragDropEffect.Move;
@@ -88,7 +94,7 @@ namespace FlaxEditor.Content.GUI
                 result = DragDropEffect.Copy;
             }
             // Check if drop actor(s)
-            else if (_dragActors.HasValidDrag)
+            else if (_dragActors != null && _dragActors.HasValidDrag)
             {
                 // Import actors
                 var currentFolder = Editor.Instance.Windows.ContentWin.CurrentViewFolder;

Source/Editor/Content/GUI/ContentView.cs

@@ -220,8 +220,9 @@ namespace FlaxEditor.Content.GUI
             // Remove references and unlink items
             for (int i = 0; i < _items.Count; i++)
             {
-                _items[i].Parent = null;
-                _items[i].RemoveReference(this);
+                var item = _items[i];
+                item.Parent = null;
+                item.RemoveReference(this);
             }
             _items.Clear();
 
@@ -261,11 +262,15 @@ namespace FlaxEditor.Content.GUI
                 ClearItems();
 
             // Add references and link items
-            _items.AddRange(items);
             for (int i = 0; i < items.Count; i++)
             {
-                items[i].Parent = this;
-                items[i].AddReference(this);
+                var item = items[i];
+                if (item.Visible && !_items.Contains(item))
+                {
+                    item.Parent = this;
+                    item.AddReference(this);
+                    _items.Add(item);
+                }
             }
             if (selection != null)
             {
@@ -276,6 +281,8 @@ namespace FlaxEditor.Content.GUI
             // Sort items depending on sortMethod parameter
             _children.Sort(((control, control1) =>
                                {
+                                   if (control == null || control1 == null)
+                                       return 0;
                                    if (sortType == SortType.AlphabeticReverse)
                                    {
                                        if (control.CompareTo(control1) > 0)
@@ -517,8 +524,8 @@ namespace FlaxEditor.Content.GUI
             {
                 int min = _selection.Min(x => x.IndexInParent);
                 int max = _selection.Max(x => x.IndexInParent);
-                min = Mathf.Min(min, item.IndexInParent);
-                max = Mathf.Max(max, item.IndexInParent);
+                min = Mathf.Max(Mathf.Min(min, item.IndexInParent), 0);
+                max = Mathf.Min(Mathf.Max(max, item.IndexInParent), _children.Count - 1);
                 var selection = new List<ContentItem>(_selection);
                 for (int i = min; i <= max; i++)
                 {
@@ -711,7 +718,7 @@ namespace FlaxEditor.Content.GUI
         protected override void PerformLayoutBeforeChildren()
         {
             float width = GetClientArea().Width;
-            float x = 0, y = 0;
+            float x = 0, y = 1;
             float viewScale = _viewScale * 0.97f;
 
             switch (ViewType)
@@ -722,21 +729,22 @@ namespace FlaxEditor.Content.GUI
                 int itemsToFit = Mathf.FloorToInt(width / defaultItemsWidth) - 1;
                 if (itemsToFit < 1)
                     itemsToFit = 1;
-                float itemsWidth = width / Mathf.Max(itemsToFit, 1);
+                int xSpace = 4;
+                float itemsWidth = width / Mathf.Max(itemsToFit, 1) - xSpace;
                 float itemsHeight = itemsWidth / defaultItemsWidth * (ContentItem.DefaultHeight * viewScale);
                 var flooredItemsWidth = Mathf.Floor(itemsWidth);
                 var flooredItemsHeight = Mathf.Floor(itemsHeight);
-                x = itemsToFit == 1 ? 0 : itemsWidth / itemsToFit;
+                x = itemsToFit == 1 ? 1 : itemsWidth / itemsToFit + xSpace;
                 for (int i = 0; i < _children.Count; i++)
                 {
                     var c = _children[i];
                     c.Bounds = new Rectangle(Mathf.Floor(x), Mathf.Floor(y), flooredItemsWidth, flooredItemsHeight);
 
-                    x += itemsWidth + itemsWidth / itemsToFit;
+                    x += (itemsWidth + xSpace) + (itemsWidth + xSpace) / itemsToFit;
                     if (x + itemsWidth > width)
                     {
-                        x = itemsToFit == 1 ? 0 : itemsWidth / itemsToFit;
-                        y += itemsHeight + 5;
+                        x = itemsToFit == 1 ? 1 : itemsWidth / itemsToFit + xSpace;
+                        y += itemsHeight + 7;
                     }
                 }
                 if (x > 0)
@@ -751,7 +759,7 @@ namespace FlaxEditor.Content.GUI
                 {
                     var c = _children[i];
                     c.Bounds = new Rectangle(x, y, width, itemsHeight);
-                    y += itemsHeight + 5;
+                    y += itemsHeight + 1;
                 }
                 y += 40.0f;
 

Source/Editor/Content/Import/AudioImportSettings.cs

@@ -1,144 +1,52 @@
 // Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
-using System.ComponentModel;
-using System.Reflection;
-using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using FlaxEditor.CustomEditors.Editors;
+using FlaxEditor.Scripting;
 using FlaxEngine;
-using FlaxEngine.Interop;
+using FlaxEngine.Tools;
+
+namespace FlaxEngine.Tools
+{
+    partial class AudioTool
+    {
+        partial struct Options
+        {
+            private bool ShowBtiDepth => Format != AudioFormat.Vorbis;
+        }
+    }
+}
+
+namespace FlaxEditor.CustomEditors.Dedicated
+{
+    /// <summary>
+    /// Custom editor for <see cref="FlaxEngine.Tools.AudioTool.Options"/>.
+    /// </summary>
+    [CustomEditor(typeof(FlaxEngine.Tools.AudioTool.Options)), DefaultEditor]
+    public class AudioToolOptionsEditor : GenericEditor
+    {
+        /// <inheritdoc />
+        protected override List<ItemInfo> GetItemsForType(ScriptType type)
+        {
+            // Show both fields and properties
+            return GetItemsForType(type, true, true);
+        }
+    }
+}
 
 namespace FlaxEditor.Content.Import
 {
     /// <summary>
     /// Proxy object to present audio import settings in <see cref="ImportFilesDialog"/>.
     /// </summary>
+    [HideInEditor]
     public class AudioImportSettings
     {
         /// <summary>
-        /// A custom set of bit depth audio import sizes.
+        /// The settings data.
         /// </summary>
-        public enum CustomBitDepth
-        {
-            /// <summary>
-            /// The 8.
-            /// </summary>
-            _8 = 8,
-
-            /// <summary>
-            /// The 16.
-            /// </summary>
-            _16 = 16,
-
-            /// <summary>
-            /// The 24.
-            /// </summary>
-            _24 = 24,
-
-            /// <summary>
-            /// The 32.
-            /// </summary>
-            _32 = 32,
-        }
-
-        /// <summary>
-        /// Converts the bit depth to enum.
-        /// </summary>
-        /// <param name="f">The bit depth.</param>
-        /// <returns>The converted enum.</returns>
-        public static CustomBitDepth ConvertBitDepth(int f)
-        {
-            FieldInfo[] fields = typeof(CustomBitDepth).GetFields();
-            for (int i = 0; i < fields.Length; i++)
-            {
-                var field = fields[i];
-                if (field.Name.Equals("value__"))
-                    continue;
-
-                if (f == (int)field.GetRawConstantValue())
-                    return (CustomBitDepth)f;
-            }
-
-            return CustomBitDepth._16;
-        }
-
-        /// <summary>
-        /// The audio data format to import the audio clip as. 
-        /// </summary>
-        [EditorOrder(10), DefaultValue(AudioFormat.Vorbis), Tooltip("The audio data format to import the audio clip as.")]
-        public AudioFormat Format { get; set; } = AudioFormat.Vorbis;
-
-        /// <summary>
-        /// The audio data compression quality. Used only if target format is using compression. Value 0 means the smallest size, value 1 means the best quality.
-        /// </summary>
-        [EditorOrder(15), DefaultValue(0.4f), Limit(0, 1, 0.01f), Tooltip("The audio data compression quality. Used only if target format is using compression. Value 0 means the smallest size, value 1 means the best quality.")]
-        public float CompressionQuality { get; set; } = 0.4f;
-
-        /// <summary>
-        /// Disables dynamic audio streaming. The whole clip will be loaded into the memory. Useful for small clips (eg. gunfire sounds).
-        /// </summary>
-        [EditorOrder(20), DefaultValue(false), Tooltip("Disables dynamic audio streaming. The whole clip will be loaded into the memory. Useful for small clips (eg. gunfire sounds).")]
-        public bool DisableStreaming { get; set; } = false;
-
-        /// <summary>
-        /// Checks should the clip be played as spatial (3D) audio or as normal audio. 3D audio is stored in Mono format.
-        /// </summary>
-        [EditorOrder(30), DefaultValue(false), EditorDisplay(null, "Is 3D"), Tooltip("Checks should the clip be played as spatial (3D) audio or as normal audio. 3D audio is stored in Mono format.")]
-        public bool Is3D { get; set; } = false;
-
-        /// <summary>
-        /// The size of a single sample in bits. The clip will be converted to this bit depth on import.
-        /// </summary>
-        [EditorOrder(40), DefaultValue(CustomBitDepth._16), Tooltip("The size of a single sample in bits. The clip will be converted to this bit depth on import.")]
-        public CustomBitDepth BitDepth { get; set; } = CustomBitDepth._16;
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct InternalOptions
-        {
-            [MarshalAs(UnmanagedType.I1)]
-            public AudioFormat Format;
-            public byte DisableStreaming;
-            public byte Is3D;
-            public int BitDepth;
-            public float Quality;
-        }
-
-        internal void ToInternal(out InternalOptions options)
-        {
-            options = new InternalOptions
-            {
-                Format = Format,
-                DisableStreaming = (byte)(DisableStreaming ? 1 : 0),
-                Is3D = (byte)(Is3D ? 1 : 0),
-                Quality = CompressionQuality,
-                BitDepth = (int)BitDepth,
-            };
-        }
-
-        internal void FromInternal(ref InternalOptions options)
-        {
-            Format = options.Format;
-            DisableStreaming = options.DisableStreaming != 0;
-            Is3D = options.Is3D != 0;
-            CompressionQuality = options.Quality;
-            BitDepth = ConvertBitDepth(options.BitDepth);
-        }
-
-        /// <summary>
-        /// Tries the restore the asset import options from the target resource file.
-        /// </summary>
-        /// <param name="options">The options.</param>
-        /// <param name="assetPath">The asset path.</param>
-        /// <returns>True settings has been restored, otherwise false.</returns>
-        public static bool TryRestore(ref AudioImportSettings options, string assetPath)
-        {
-            if (AudioImportEntry.Internal_GetAudioImportOptions(assetPath, out var internalOptions))
-            {
-                // Restore settings
-                options.FromInternal(ref internalOptions);
-                return true;
-            }
-
-            return false;
-        }
+        [EditorDisplay(null, EditorDisplayAttribute.InlineStyle)]
+        public AudioTool.Options Settings = AudioTool.Options.Default;
     }
 
     /// <summary>
@@ -147,7 +55,7 @@ namespace FlaxEditor.Content.Import
     /// <seealso cref="AssetImportEntry" />
     public partial class AudioImportEntry : AssetImportEntry
     {
-        private AudioImportSettings _settings = new AudioImportSettings();
+        private AudioImportSettings _settings = new();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AudioImportEntry"/> class.
@@ -157,7 +65,7 @@ namespace FlaxEditor.Content.Import
         : base(ref request)
         {
             // Try to restore target asset Audio import options (useful for fast reimport)
-            AudioImportSettings.TryRestore(ref _settings, ResultUrl);
+            Editor.TryRestoreImportOptions(ref _settings.Settings, ResultUrl);
         }
 
         /// <inheritdoc />
@@ -166,27 +74,23 @@ namespace FlaxEditor.Content.Import
         /// <inheritdoc />
         public override bool TryOverrideSettings(object settings)
         {
-            if (settings is AudioImportSettings o)
+            if (settings is AudioImportSettings s)
             {
-                _settings = o;
+                _settings.Settings = s.Settings;
+                return true;
+            }
+            if (settings is AudioTool.Options o)
+            {
+                _settings.Settings = o;
                 return true;
             }
-
             return false;
         }
 
         /// <inheritdoc />
         public override bool Import()
         {
-            return Editor.Import(SourceUrl, ResultUrl, _settings);
+            return Editor.Import(SourceUrl, ResultUrl, _settings.Settings);
         }
-
-        #region Internal Calls
-
-        [LibraryImport("FlaxEngine", EntryPoint = "AudioImportEntryInternal_GetAudioImportOptions", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
-        [return: MarshalAs(UnmanagedType.U1)]
-        internal static partial bool Internal_GetAudioImportOptions(string path, out AudioImportSettings.InternalOptions result);
-
-        #endregion
     }
 }

Source/Editor/Content/Import/ImportFilesDialog.cs

@@ -139,7 +139,7 @@ namespace FlaxEditor.Content.Import
             var menu = new ContextMenu();
             menu.AddButton("Rename", OnRenameClicked);
             menu.AddButton("Don't import", OnDontImportClicked);
-            menu.AddButton("Show in Explorer", OnShowInExplorerClicked);
+            menu.AddButton(Utilities.Constants.ShowInExplorer, OnShowInExplorerClicked);
             menu.Tag = node;
             menu.Show(node, location);
         }

Source/Editor/Content/Items/ContentItem.cs

@@ -323,8 +323,6 @@ namespace FlaxEditor.Content
         /// <param name="value">The new path.</param>
         internal virtual void UpdatePath(string value)
         {
-            Assert.AreNotEqual(Path, value);
-
             // Set path
             Path = StringUtils.NormalizePath(value);
             FileName = System.IO.Path.GetFileName(value);
@@ -441,6 +439,9 @@ namespace FlaxEditor.Content
         {
             get
             {
+                // Skip when hidden
+                if (!Visible)
+                    return Rectangle.Empty;
                 var view = Parent as ContentView;
                 var size = Size;
                 switch (view?.ViewType ?? ContentViewType.Tiles)
@@ -484,6 +485,30 @@ namespace FlaxEditor.Content
                 Render2D.FillRectangle(rectangle, Color.Black);
         }
 
+        /// <summary>
+        /// Draws the item thumbnail.
+        /// </summary>
+        /// <param name="rectangle">The thumbnail rectangle.</param>
+        /// /// <param name="shadow">Whether or not to draw the shadow. Overrides DrawShadow.</param>
+        public void DrawThumbnail(ref Rectangle rectangle, bool shadow)
+        {
+            // Draw shadow
+            if (shadow)
+            {
+                const float thumbnailInShadowSize = 50.0f;
+                var shadowRect = rectangle.MakeExpanded((DefaultThumbnailSize - thumbnailInShadowSize) * rectangle.Width / DefaultThumbnailSize * 1.3f);
+                if (!_shadowIcon.IsValid)
+                    _shadowIcon = Editor.Instance.Icons.AssetShadow128;
+                Render2D.DrawSprite(_shadowIcon, shadowRect);
+            }
+
+            // Draw thumbnail
+            if (_thumbnail.IsValid)
+                Render2D.DrawSprite(_thumbnail, rectangle);
+            else
+                Render2D.FillRectangle(rectangle, Color.Black);
+        }
+
         /// <summary>
         /// Gets the amount of references to that item.
         /// </summary>
@@ -642,7 +667,6 @@ namespace FlaxEditor.Content
         /// <inheritdoc />
         public override void Draw()
         {
-            // Cache data
             var size = Size;
             var style = Style.Current;
             var view = Parent as ContentView;
@@ -655,9 +679,51 @@ namespace FlaxEditor.Content
             {
             case ContentViewType.Tiles:
             {
-                var thumbnailSize = size.X - 2 * DefaultMarginSize;
-                thumbnailRect = new Rectangle(DefaultMarginSize, DefaultMarginSize, thumbnailSize, thumbnailSize);
+                var thumbnailSize = size.X;
+                thumbnailRect = new Rectangle(0, 0, thumbnailSize, thumbnailSize);
                 nameAlignment = TextAlignment.Center;
+
+                if (this is ContentFolder)
+                {
+                    // Small shadow
+                    var shadowRect = new Rectangle(2, 2, clientRect.Width + 1, clientRect.Height + 1);
+                    var color = Color.Black.AlphaMultiplied(0.2f);
+                    Render2D.FillRectangle(shadowRect, color);
+                    Render2D.FillRectangle(clientRect, style.Background.RGBMultiplied(1.25f));
+
+                    if (isSelected)
+                        Render2D.FillRectangle(clientRect, Parent.ContainsFocus ? style.BackgroundSelected : style.LightBackground);
+                    else if (IsMouseOver)
+                        Render2D.FillRectangle(clientRect, style.BackgroundHighlighted);
+
+                    DrawThumbnail(ref thumbnailRect, false);
+                }
+                else
+                {
+                    // Small shadow
+                    var shadowRect = new Rectangle(2, 2, clientRect.Width + 1, clientRect.Height + 1);
+                    var color = Color.Black.AlphaMultiplied(0.2f);
+                    Render2D.FillRectangle(shadowRect, color);
+
+                    Render2D.FillRectangle(clientRect, style.Background.RGBMultiplied(1.25f));
+                    Render2D.FillRectangle(TextRectangle, style.LightBackground);
+
+                    var accentHeight = 2 * view.ViewScale;
+                    var barRect = new Rectangle(0, thumbnailRect.Height - accentHeight, clientRect.Width, accentHeight);
+                    Render2D.FillRectangle(barRect, Color.DimGray);
+
+                    DrawThumbnail(ref thumbnailRect, false);
+                    if (isSelected)
+                    {
+                        Render2D.FillRectangle(textRect, Parent.ContainsFocus ? style.BackgroundSelected : style.LightBackground);
+                        Render2D.DrawRectangle(clientRect, Parent.ContainsFocus ? style.BackgroundSelected : style.LightBackground);
+                    }
+                    else if (IsMouseOver)
+                    {
+                        Render2D.FillRectangle(textRect, style.BackgroundHighlighted);
+                        Render2D.DrawRectangle(clientRect, style.BackgroundHighlighted);
+                    }
+                }
                 break;
             }
             case ContentViewType.List:
@@ -665,23 +731,21 @@ namespace FlaxEditor.Content
                 var thumbnailSize = size.Y - 2 * DefaultMarginSize;
                 thumbnailRect = new Rectangle(DefaultMarginSize, DefaultMarginSize, thumbnailSize, thumbnailSize);
                 nameAlignment = TextAlignment.Near;
+
+                if (isSelected)
+                    Render2D.FillRectangle(clientRect, Parent.ContainsFocus ? style.BackgroundSelected : style.LightBackground);
+                else if (IsMouseOver)
+                    Render2D.FillRectangle(clientRect, style.BackgroundHighlighted);
+
+                DrawThumbnail(ref thumbnailRect);
                 break;
             }
             default: throw new ArgumentOutOfRangeException();
             }
 
-            // Draw background
-            if (isSelected)
-                Render2D.FillRectangle(clientRect, Parent.ContainsFocus ? style.BackgroundSelected : style.LightBackground);
-            else if (IsMouseOver)
-                Render2D.FillRectangle(clientRect, style.BackgroundHighlighted);
-
-            // Draw preview
-            DrawThumbnail(ref thumbnailRect);
-
             // Draw short name
             Render2D.PushClip(ref textRect);
-            Render2D.DrawText(style.FontMedium, ShowFileExtension || view.ShowFileExtensions ? FileName : ShortName, textRect, style.Foreground, nameAlignment, TextAlignment.Center, TextWrapping.WrapWords, 0.75f, 0.95f);
+            Render2D.DrawText(style.FontMedium, ShowFileExtension || view.ShowFileExtensions ? FileName : ShortName, textRect, style.Foreground, nameAlignment, TextAlignment.Center, TextWrapping.WrapWords, 1f, 0.95f);
             Render2D.PopClip();
         }
 

Source/Editor/Content/Items/ScriptItem.cs

@@ -30,7 +30,7 @@ namespace FlaxEditor.Content
             ShowFileExtension = true;
         }
 
-        private static string FilterScriptName(string input)
+        internal static string FilterScriptName(string input)
         {
             var length = input.Length;
             var sb = new StringBuilder(length);

Source/Editor/Content/Proxy/BehaviorTreeProxy.cs

@@ -0,0 +1,66 @@
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+
+using System;
+using System.IO;
+using FlaxEditor.Content.Thumbnails;
+using FlaxEditor.Windows;
+using FlaxEditor.Windows.Assets;
+using FlaxEngine;
+using FlaxEngine.GUI;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// A <see cref="BehaviorTree"/> asset proxy object.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.BinaryAssetProxy" />
+    [ContentContextMenu("New/AI/Behavior Tree")]
+    public class BehaviorTreeProxy : BinaryAssetProxy
+    {
+        /// <inheritdoc />
+        public override string Name => "Behavior Tree";
+
+        /// <inheritdoc />
+        public override bool CanReimport(ContentItem item)
+        {
+            return true;
+        }
+
+        /// <inheritdoc />
+        public override EditorWindow Open(Editor editor, ContentItem item)
+        {
+            return new BehaviorTreeWindow(editor, item as BinaryAssetItem);
+        }
+
+        /// <inheritdoc />
+        public override Color AccentColor => Color.FromRGB(0x3256A8);
+
+        /// <inheritdoc />
+        public override Type AssetType => typeof(BehaviorTree);
+
+        /// <inheritdoc />
+        public override bool CanCreate(ContentFolder targetLocation)
+        {
+            return targetLocation.CanHaveAssets;
+        }
+
+        /// <inheritdoc />
+        public override void Create(string outputPath, object arg)
+        {
+            if (Editor.CreateAsset(Editor.NewAssetType.BehaviorTree, outputPath))
+                throw new Exception("Failed to create new asset.");
+        }
+
+        /// <inheritdoc />
+        public override void OnThumbnailDrawBegin(ThumbnailRequest request, ContainerControl guiRoot, GPUContext context)
+        {
+            guiRoot.AddChild(new Label
+            {
+                Text = Path.GetFileNameWithoutExtension(request.Asset.Path),
+                Offsets = Margin.Zero,
+                AnchorPreset = AnchorPresets.StretchAll,
+                Wrapping = TextWrapping.WrapWords
+            });
+        }
+    }
+}

Source/Editor/Content/Proxy/CubeTextureProxy.cs

@@ -54,12 +54,7 @@ namespace FlaxEditor.Content
         /// <inheritdoc />
         public override bool CanDrawThumbnail(ThumbnailRequest request)
         {
-            if (!_preview.HasLoadedAssets)
-                return false;
-
-            // Check if all mip maps are streamed
-            var asset = (CubeTexture)request.Asset;
-            return asset.ResidentMipLevels >= Mathf.Max(1, (int)(asset.MipLevels * ThumbnailsModule.MinimumRequiredResourcesQuality));
+            return _preview.HasLoadedAssets && ThumbnailsModule.HasMinimumQuality((CubeTexture)request.Asset);
         }
 
         /// <inheritdoc />

Source/Editor/Content/Proxy/MaterialInstanceProxy.cs

@@ -62,7 +62,7 @@ namespace FlaxEditor.Content
         /// <inheritdoc />
         public override bool CanDrawThumbnail(ThumbnailRequest request)
         {
-            return _preview.HasLoadedAssets;
+            return _preview.HasLoadedAssets && ThumbnailsModule.HasMinimumQuality((MaterialInstance)request.Asset);
         }
 
         /// <inheritdoc />

Source/Editor/Content/Proxy/MaterialProxy.cs

@@ -106,7 +106,7 @@ namespace FlaxEditor.Content
         /// <inheritdoc />
         public override bool CanDrawThumbnail(ThumbnailRequest request)
         {
-            return _preview.HasLoadedAssets;
+            return _preview.HasLoadedAssets && ThumbnailsModule.HasMinimumQuality((Material)request.Asset);
         }
 
         /// <inheritdoc />

Source/Editor/Content/Proxy/ModelProxy.cs

@@ -82,12 +82,7 @@ namespace FlaxEditor.Content
         /// <inheritdoc />
         public override bool CanDrawThumbnail(ThumbnailRequest request)
         {
-            if (!_preview.HasLoadedAssets)
-                return false;
-
-            // Check if asset is streamed enough
-            var asset = (Model)request.Asset;
-            return asset.LoadedLODs >= Mathf.Max(1, (int)(asset.LODs.Length * ThumbnailsModule.MinimumRequiredResourcesQuality));
+            return _preview.HasLoadedAssets && ThumbnailsModule.HasMinimumQuality((Model)request.Asset);
         }
 
         /// <inheritdoc />

Source/Editor/Content/Proxy/SceneProxy.cs

@@ -30,6 +30,12 @@ namespace FlaxEditor.Content
             return item is SceneItem;
         }
 
+        /// <inheritdoc />
+        public override bool AcceptsAsset(string typeName, string path)
+        {
+            return (typeName == Scene.AssetTypename || typeName == Scene.EditorPickerTypename) && path.EndsWith(FileExtension, StringComparison.OrdinalIgnoreCase);
+        }
+
         /// <inheritdoc />
         public override bool CanCreate(ContentFolder targetLocation)
         {

Source/Editor/Content/Proxy/ShaderProxy.cs

@@ -29,7 +29,7 @@ namespace FlaxEditor.Content
             if (asset)
             {
                 var source = Editor.GetShaderSourceCode(asset);
-                Utilities.Utils.ShowSourceCodeWindow(source, "Shader Source", item.RootWindow.Window);
+                Utilities.Utils.ShowSourceCodeWindow(source, "Shader Source", item.RootWindow?.Window);
             }
             return null;
         }

Source/Editor/Content/Proxy/SkinnedModelProxy.cs

@@ -54,15 +54,7 @@ namespace FlaxEditor.Content
         /// <inheritdoc />
         public override bool CanDrawThumbnail(ThumbnailRequest request)
         {
-            if (!_preview.HasLoadedAssets)
-                return false;
-
-            // Check if asset is streamed enough
-            var asset = (SkinnedModel)request.Asset;
-            var lods = asset.LODs.Length;
-            if (asset.IsLoaded && lods == 0)
-                return true; // Skeleton-only model
-            return asset.LoadedLODs >= Mathf.Max(1, (int)(lods * ThumbnailsModule.MinimumRequiredResourcesQuality));
+            return _preview.HasLoadedAssets && ThumbnailsModule.HasMinimumQuality((SkinnedModel)request.Asset);
         }
 
         /// <inheritdoc />

Source/Editor/Content/Proxy/TextureProxy.cs

@@ -57,11 +57,7 @@ namespace FlaxEditor.Content
         /// <inheritdoc />
         public override bool CanDrawThumbnail(ThumbnailRequest request)
         {
-            // Check if asset is streamed enough
-            var asset = (Texture)request.Asset;
-            var mipLevels = asset.MipLevels;
-            var minMipLevels = Mathf.Min(mipLevels, 7);
-            return asset.ResidentMipLevels >= Mathf.Max(minMipLevels, (int)(mipLevels * ThumbnailsModule.MinimumRequiredResourcesQuality));
+            return ThumbnailsModule.HasMinimumQuality((Texture)request.Asset);
         }
 
         /// <inheritdoc />

Source/Editor/Content/Thumbnails/ThumbnailsModule.cs

@@ -125,6 +125,74 @@ namespace FlaxEditor.Content.Thumbnails
             }
         }
 
+        internal static bool HasMinimumQuality(TextureBase asset)
+        {
+            var mipLevels = asset.MipLevels;
+            var minMipLevels = Mathf.Min(mipLevels, 7);
+            return asset.IsLoaded && asset.ResidentMipLevels >= Mathf.Max(minMipLevels, (int)(mipLevels * MinimumRequiredResourcesQuality));
+        }
+
+        internal static bool HasMinimumQuality(Model asset)
+        {
+            if (!asset.IsLoaded)
+                return false;
+            var lods = asset.LODs.Length;
+            var slots = asset.MaterialSlots;
+            foreach (var slot in slots)
+            {
+                if (slot.Material && !HasMinimumQuality(slot.Material))
+                    return false;
+            }
+            return asset.LoadedLODs >= Mathf.Max(1, (int)(lods * MinimumRequiredResourcesQuality));
+        }
+
+        internal static bool HasMinimumQuality(SkinnedModel asset)
+        {
+            var lods = asset.LODs.Length;
+            if (asset.IsLoaded && lods == 0)
+                return true; // Skeleton-only model
+            var slots = asset.MaterialSlots;
+            foreach (var slot in slots)
+            {
+                if (slot.Material && !HasMinimumQuality(slot.Material))
+                    return false;
+            }
+            return asset.LoadedLODs >= Mathf.Max(1, (int)(lods * MinimumRequiredResourcesQuality));
+        }
+
+        internal static bool HasMinimumQuality(MaterialBase asset)
+        {
+            if (asset is MaterialInstance asInstance)
+                return HasMinimumQuality(asInstance);
+            return HasMinimumQualityInternal(asset);
+        }
+
+        internal static bool HasMinimumQuality(Material asset)
+        {
+            return HasMinimumQualityInternal(asset);
+        }
+
+        internal static bool HasMinimumQuality(MaterialInstance asset)
+        {
+            if (!HasMinimumQualityInternal(asset))
+                return false;
+            var baseMaterial = asset.BaseMaterial;
+            return baseMaterial == null || HasMinimumQualityInternal(baseMaterial);
+        }
+
+        private static bool HasMinimumQualityInternal(MaterialBase asset)
+        {
+            if (!asset.IsLoaded)
+                return false;
+            var parameters = asset.Parameters;
+            foreach (var parameter in parameters)
+            {
+                if (parameter.Value is TextureBase asTexture && !HasMinimumQuality(asTexture))
+                    return false;
+            }
+            return true;
+        }
+
         #region IContentItemOwner
 
         /// <inheritdoc />
@@ -338,18 +406,16 @@ namespace FlaxEditor.Content.Thumbnails
             for (int i = 0; i < maxChecks; i++)
             {
                 var request = _requests[i];
-
                 try
                 {
                     if (request.IsReady)
-                    {
                         return request;
-                    }
                 }
                 catch (Exception ex)
                 {
-                    Editor.LogWarning(ex);
                     Editor.LogWarning($"Failed to prepare thumbnail rendering for {request.Item.ShortName}.");
+                    Editor.LogWarning(ex);
+                    _requests.RemoveAt(i--);
                 }
             }
 
@@ -368,7 +434,6 @@ namespace FlaxEditor.Content.Thumbnails
             // Create atlas
             if (PreviewsCache.Create(path))
             {
-                // Error
                 Editor.LogError("Failed to create thumbnails atlas.");
                 return null;
             }
@@ -377,7 +442,6 @@ namespace FlaxEditor.Content.Thumbnails
             var atlas = FlaxEngine.Content.LoadAsync<PreviewsCache>(path);
             if (atlas == null)
             {
-                // Error
                 Editor.LogError("Failed to load thumbnails atlas.");
                 return null;
             }
@@ -449,7 +513,6 @@ namespace FlaxEditor.Content.Thumbnails
                     for (int i = 0; i < checks; i++)
                     {
                         var request = _requests[i];
-
                         try
                         {
                             if (request.IsReady)
@@ -463,8 +526,9 @@ namespace FlaxEditor.Content.Thumbnails
                         }
                         catch (Exception ex)
                         {
-                            Editor.LogWarning(ex);
                             Editor.LogWarning($"Failed to prepare thumbnail rendering for {request.Item.ShortName}.");
+                            Editor.LogWarning(ex);
+                            _requests.RemoveAt(i--);
                         }
                     }
 

Source/Editor/Content/Tree/MainContentTreeNode.cs

@@ -29,7 +29,7 @@ namespace FlaxEditor.Content
             //_watcher.Changed += OnEvent;
             _watcher.Created += OnEvent;
             _watcher.Deleted += OnEvent;
-            //_watcher.Renamed += OnEvent;
+            _watcher.Renamed += OnEvent;
         }
 
         private void OnEvent(object sender, FileSystemEventArgs e)

Source/Editor/Content/Tree/RootContentTreeNode.cs

@@ -17,6 +17,6 @@ namespace FlaxEditor.Content
         }
 
         /// <inheritdoc />
-        public override string NavButtonLabel => string.Empty;
+        public override string NavButtonLabel => " /";
     }
 }

Source/Editor/Cooker/Platform/Linux/LinuxPlatformTools.cpp

@@ -104,4 +104,19 @@ bool LinuxPlatformTools::OnDeployBinaries(CookingData& data)
     return false;
 }
 
+void LinuxPlatformTools::OnRun(CookingData& data, String& executableFile, String& commandLineFormat, String& workingDir)
+{
+    // Pick the first executable file
+    Array<String> files;
+    FileSystem::DirectoryGetFiles(files, data.NativeCodeOutputPath, TEXT("*"), DirectorySearchOption::TopDirectoryOnly);
+    for (auto& file : files)
+    {
+        if (FileSystem::GetExtension(file).IsEmpty())
+        {
+            executableFile = file;
+            break;
+        }
+    }
+}
+
 #endif

Source/Editor/Cooker/Platform/Linux/LinuxPlatformTools.h

@@ -20,6 +20,7 @@ public:
     ArchitectureType GetArchitecture() const override;
     bool UseSystemDotnet() const override;
     bool OnDeployBinaries(CookingData& data) override;
+    void OnRun(CookingData& data, String& executableFile, String& commandLineFormat, String& workingDir) override;
 };
 
 #endif

Source/Editor/Cooker/Platform/Mac/MacPlatformTools.cpp

@@ -5,6 +5,7 @@
 #include "MacPlatformTools.h"
 #include "Engine/Platform/File.h"
 #include "Engine/Platform/FileSystem.h"
+#include "Engine/Platform/CreateProcessSettings.h"
 #include "Engine/Platform/Mac/MacPlatformSettings.h"
 #include "Engine/Core/Config/GameSettings.h"
 #include "Engine/Core/Config/BuildSettings.h"
@@ -16,7 +17,7 @@
 #include "Editor/ProjectInfo.h"
 #include "Editor/Cooker/GameCooker.h"
 #include "Editor/Utilities/EditorUtilities.h"
-#include <ThirdParty/pugixml/pugixml.hpp>
+#include <ThirdParty/pugixml/pugixml_extra.hpp>
 using namespace pugi;
 
 IMPLEMENT_SETTINGS_GETTER(MacPlatformSettings, MacPlatform);
@@ -124,17 +125,35 @@ bool MacPlatformTools::OnPostProcess(CookingData& data)
             LOG(Error, "Failed to export application icon.");
             return true;
         }
-        bool failed = Platform::RunProcess(TEXT("sips -z 16 16 icon_1024x1024.png --out icon_16x16.png"), tmpFolderPath);
-        failed |= Platform::RunProcess(TEXT("sips -z 32 32 icon_1024x1024.png --out icon_16x16@2x.png"), tmpFolderPath);
-        failed |= Platform::RunProcess(TEXT("sips -z 32 32 icon_1024x1024.png --out icon_32x32.png"), tmpFolderPath);
-        failed |= Platform::RunProcess(TEXT("sips -z 64 64 icon_1024x1024.png --out icon_32x32@2x.png"), tmpFolderPath);
-        failed |= Platform::RunProcess(TEXT("sips -z 128 128 icon_1024x1024.png --out icon_128x128.png"), tmpFolderPath);
-        failed |= Platform::RunProcess(TEXT("sips -z 256 256 icon_1024x1024.png --out icon_128x128@2x.png"), tmpFolderPath);
-        failed |= Platform::RunProcess(TEXT("sips -z 256 256 icon_1024x1024.png --out icon_256x256.png"), tmpFolderPath);
-        failed |= Platform::RunProcess(TEXT("sips -z 512 512 icon_1024x1024.png --out icon_256x256@2x.png"), tmpFolderPath);
-        failed |= Platform::RunProcess(TEXT("sips -z 512 512 icon_1024x1024.png --out icon_512x512.png"), tmpFolderPath);
-        failed |= Platform::RunProcess(TEXT("sips -z 1024 1024 icon_1024x1024.png --out icon_512x512@2x.png"), tmpFolderPath);
-        failed |= Platform::RunProcess(TEXT("iconutil -c icns icon.iconset"), iconFolderPath);
+        CreateProcessSettings procSettings;
+        procSettings.HiddenWindow = true;
+        procSettings.FileName = TEXT("/usr/bin/sips");
+        procSettings.WorkingDirectory = tmpFolderPath;
+        procSettings.Arguments = TEXT("-z 16 16 icon_1024x1024.png --out icon_16x16.png");
+        bool failed = false;
+        failed |= Platform::CreateProcess(procSettings);
+        procSettings.Arguments = TEXT("-z 32 32 icon_1024x1024.png --out icon_16x16@2x.png");
+        failed |= Platform::CreateProcess(procSettings);
+        procSettings.Arguments = TEXT("-z 32 32 icon_1024x1024.png --out icon_32x32.png");
+        failed |= Platform::CreateProcess(procSettings);
+        procSettings.Arguments = TEXT("-z 64 64 icon_1024x1024.png --out icon_32x32@2x.png");
+        failed |= Platform::CreateProcess(procSettings);
+        procSettings.Arguments = TEXT("-z 128 128 icon_1024x1024.png --out icon_128x128.png");
+        failed |= Platform::CreateProcess(procSettings);
+        procSettings.Arguments = TEXT("-z 256 256 icon_1024x1024.png --out icon_128x128@2x.png");
+        failed |= Platform::CreateProcess(procSettings);
+        procSettings.Arguments = TEXT("-z 256 256 icon_1024x1024.png --out icon_256x256.png");
+        failed |= Platform::CreateProcess(procSettings);
+        procSettings.Arguments = TEXT("-z 512 512 icon_1024x1024.png --out icon_256x256@2x.png");
+        failed |= Platform::CreateProcess(procSettings);
+        procSettings.Arguments = TEXT("-z 512 512 icon_1024x1024.png --out icon_512x512.png");
+        failed |= Platform::CreateProcess(procSettings);
+        procSettings.Arguments = TEXT("-z 1024 1024 icon_1024x1024.png --out icon_512x512@2x.png");
+        failed |= Platform::CreateProcess(procSettings);
+        procSettings.FileName = TEXT("/usr/bin/iconutil");
+        procSettings.Arguments = TEXT("-c icns icon.iconset");
+        procSettings.WorkingDirectory = iconFolderPath;
+        failed |= Platform::CreateProcess(procSettings);
         if (failed)
         {
             LOG(Error, "Failed to export application icon.");
@@ -151,17 +170,17 @@ bool MacPlatformTools::OnPostProcess(CookingData& data)
     const String plistPath = data.DataOutputPath / TEXT("Info.plist");
     {
         xml_document doc;
-        xml_node plist = doc.child_or_append(PUGIXML_TEXT("plist"));
+        xml_node_extra plist = xml_node_extra(doc).child_or_append(PUGIXML_TEXT("plist"));
         plist.append_attribute(PUGIXML_TEXT("version")).set_value(PUGIXML_TEXT("1.0"));
-        xml_node dict = plist.child_or_append(PUGIXML_TEXT("dict"));
+        xml_node_extra dict = plist.child_or_append(PUGIXML_TEXT("dict"));
 
 #define ADD_ENTRY(key, value) \
-    dict.append_child(PUGIXML_TEXT("key")).set_child_value(PUGIXML_TEXT(key)); \
-    dict.append_child(PUGIXML_TEXT("string")).set_child_value(PUGIXML_TEXT(value))
+    dict.append_child_with_value(PUGIXML_TEXT("key"), PUGIXML_TEXT(key)); \
+    dict.append_child_with_value(PUGIXML_TEXT("string"), PUGIXML_TEXT(value))
 #define ADD_ENTRY_STR(key, value) \
-    dict.append_child(PUGIXML_TEXT("key")).set_child_value(PUGIXML_TEXT(key)); \
+    dict.append_child_with_value(PUGIXML_TEXT("key"), PUGIXML_TEXT(key)); \
     { std::u16string valueStr(value.GetText()); \
-    dict.append_child(PUGIXML_TEXT("string")).set_child_value(pugi::string_t(valueStr.begin(), valueStr.end()).c_str()); }
+    dict.append_child_with_value(PUGIXML_TEXT("string"), pugi::string_t(valueStr.begin(), valueStr.end()).c_str()); }
 
         ADD_ENTRY("CFBundleDevelopmentRegion", "English");
         ADD_ENTRY("CFBundlePackageType", "APPL");
@@ -175,22 +194,22 @@ bool MacPlatformTools::OnPostProcess(CookingData& data)
         ADD_ENTRY_STR("CFBundleVersion", projectVersion);
         ADD_ENTRY_STR("NSHumanReadableCopyright", gameSettings->CopyrightNotice);
 
-        dict.append_child(PUGIXML_TEXT("key")).set_child_value(PUGIXML_TEXT("CFBundleSupportedPlatforms"));
-        xml_node CFBundleSupportedPlatforms = dict.append_child(PUGIXML_TEXT("array"));
-        CFBundleSupportedPlatforms.append_child(PUGIXML_TEXT("string")).set_child_value(PUGIXML_TEXT("MacOSX"));
+        dict.append_child_with_value(PUGIXML_TEXT("key"), PUGIXML_TEXT("CFBundleSupportedPlatforms"));
+        xml_node_extra CFBundleSupportedPlatforms = dict.append_child(PUGIXML_TEXT("array"));
+        CFBundleSupportedPlatforms.append_child_with_value(PUGIXML_TEXT("string"), PUGIXML_TEXT("MacOSX"));
 
-        dict.append_child(PUGIXML_TEXT("key")).set_child_value(PUGIXML_TEXT("LSMinimumSystemVersionByArchitecture"));
-        xml_node LSMinimumSystemVersionByArchitecture = dict.append_child(PUGIXML_TEXT("dict"));
+        dict.append_child_with_value(PUGIXML_TEXT("key"), PUGIXML_TEXT("LSMinimumSystemVersionByArchitecture"));
+        xml_node_extra LSMinimumSystemVersionByArchitecture = dict.append_child(PUGIXML_TEXT("dict"));
         switch (_arch)
         {
         case ArchitectureType::x64:
-            LSMinimumSystemVersionByArchitecture.append_child(PUGIXML_TEXT("key")).set_child_value(PUGIXML_TEXT("x86_64"));
+            LSMinimumSystemVersionByArchitecture.append_child_with_value(PUGIXML_TEXT("key"), PUGIXML_TEXT("x86_64"));
             break;
         case ArchitectureType::ARM64:
-            LSMinimumSystemVersionByArchitecture.append_child(PUGIXML_TEXT("key")).set_child_value(PUGIXML_TEXT("arm64"));
+            LSMinimumSystemVersionByArchitecture.append_child_with_value(PUGIXML_TEXT("key"), PUGIXML_TEXT("arm64"));
             break;
         }
-        LSMinimumSystemVersionByArchitecture.append_child(PUGIXML_TEXT("string")).set_child_value(PUGIXML_TEXT("10.15"));
+        LSMinimumSystemVersionByArchitecture.append_child_with_value(PUGIXML_TEXT("string"), PUGIXML_TEXT("10.15"));
         
 #undef ADD_ENTRY
 #undef ADD_ENTRY_STR
@@ -210,18 +229,39 @@ bool MacPlatformTools::OnPostProcess(CookingData& data)
         return false;
     GameCooker::PackageFiles();
     LOG(Info, "Building app package...");
-    const String dmgPath = data.OriginalOutputPath / appName + TEXT(".dmg");
-    const String dmgCommand = String::Format(TEXT("hdiutil create {0}.dmg -volname {0} -fs HFS+ -srcfolder {0}.app"), appName);
-    const int32 result = Platform::RunProcess(dmgCommand, data.OriginalOutputPath);
-    if (result != 0)
     {
-        data.Error(String::Format(TEXT("Failed to package app (result code: {0}). See log for more info."), result));
-        return true;
+        const String dmgPath = data.OriginalOutputPath / appName + TEXT(".dmg");
+        CreateProcessSettings procSettings;
+        procSettings.HiddenWindow = true;
+        procSettings.WorkingDirectory = data.OriginalOutputPath;
+        procSettings.FileName = TEXT("/usr/bin/hdiutil");
+        procSettings.Arguments = String::Format(TEXT("create {0}.dmg -volname {0} -fs HFS+ -srcfolder {0}.app"), appName);
+        const int32 result = Platform::CreateProcess(procSettings);
+        if (result != 0)
+        {
+            data.Error(String::Format(TEXT("Failed to package app (result code: {0}). See log for more info."), result));
+            return true;
+        }
+        // TODO: sign dmg
+        LOG(Info, "Output application package: {0} (size: {1} MB)", dmgPath, FileSystem::GetFileSize(dmgPath) / 1024 / 1024);
     }
-    // TODO: sign dmg
-    LOG(Info, "Output application package: {0} (size: {1} MB)", dmgPath, FileSystem::GetFileSize(dmgPath) / 1024 / 1024);
 
     return false;
 }
 
+void MacPlatformTools::OnRun(CookingData& data, String& executableFile, String& commandLineFormat, String& workingDir)
+{
+    // Pick the first executable file
+    Array<String> files;
+    FileSystem::DirectoryGetFiles(files, data.NativeCodeOutputPath, TEXT("*"), DirectorySearchOption::TopDirectoryOnly);
+    for (auto& file : files)
+    {
+        if (FileSystem::GetExtension(file).IsEmpty())
+        {
+            executableFile = file;
+            break;
+        }
+    }
+}
+
 #endif

Source/Editor/Cooker/Platform/Mac/MacPlatformTools.h

@@ -27,6 +27,7 @@ public:
     bool IsNativeCodeFile(CookingData& data, const String& file) override;
     void OnBuildStarted(CookingData& data) override;
     bool OnPostProcess(CookingData& data) override;
+    void OnRun(CookingData& data, String& executableFile, String& commandLineFormat, String& workingDir) override;
 };
 
 #endif

Source/Editor/Cooker/Platform/iOS/iOSPlatformTools.cpp

@@ -260,15 +260,20 @@ bool iOSPlatformTools::OnPostProcess(CookingData& data)
     {
         LOG(Info, "Building app package...");
         const Char* configuration = data.Configuration == BuildConfiguration::Release ? TEXT("Release") : TEXT("Debug");
-        String command = String::Format(TEXT("xcodebuild -project FlaxGame.xcodeproj -configuration {} -scheme FlaxGame -archivePath FlaxGame.xcarchive archive"), configuration);
-        int32 result = Platform::RunProcess(command, data.OriginalOutputPath);
+        CreateProcessSettings procSettings;
+        procSettings.HiddenWindow = true;
+        procSettings.WorkingDirectory = data.OriginalOutputPath;
+        procSettings.FileName = TEXT("/usr/bin/xcodebuild");
+        procSettings.Arguments = String::Format(TEXT("-project FlaxGame.xcodeproj -configuration {} -scheme FlaxGame -archivePath FlaxGame.xcarchive archive"), configuration);
+        int32 result = Platform::CreateProcess(procSettings);
         if (result != 0)
         {
             data.Error(String::Format(TEXT("Failed to package app (result code: {0}). See log for more info."), result));
             return true;
         }
-        command = TEXT("xcodebuild -exportArchive -archivePath FlaxGame.xcarchive -allowProvisioningUpdates -exportPath . -exportOptionsPlist ExportOptions.plist");
-        result = Platform::RunProcess(command, data.OriginalOutputPath);
+        procSettings.FileName = TEXT("/usr/bin/xcodebuild");
+        procSettings.Arguments = TEXT("-exportArchive -archivePath FlaxGame.xcarchive -allowProvisioningUpdates -exportPath . -exportOptionsPlist ExportOptions.plist");
+        result = Platform::CreateProcess(procSettings);
         if (result != 0)
         {
             data.Error(String::Format(TEXT("Failed to package app (result code: {0}). See log for more info."), result));

Source/Editor/Cooker/Steps/DeployDataStep.cpp

@@ -131,7 +131,8 @@ bool DeployDataStep::Perform(CookingData& data)
                     if (FileSystem::DirectoryExists(dstDotnet))
                     {
                         String cachedData;
-                        File::ReadAllText(dotnetCacheFilePath, cachedData);
+                        if (FileSystem::FileExists(dotnetCacheFilePath))
+                            File::ReadAllText(dotnetCacheFilePath, cachedData);
                         if (cachedData != dotnetCachedValue)
                         {
                             FileSystem::DeleteDirectory(dstDotnet);
@@ -360,7 +361,7 @@ bool DeployDataStep::Perform(CookingData& data)
     data.AddRootEngineAsset(PRE_INTEGRATED_GF_ASSET_NAME);
     data.AddRootEngineAsset(SMAA_AREA_TEX);
     data.AddRootEngineAsset(SMAA_SEARCH_TEX);
-    if (data.Configuration != BuildConfiguration::Release)
+    if (!buildSettings.SkipDefaultFonts)
         data.AddRootEngineAsset(TEXT("Editor/Fonts/Roboto-Regular"));
 
     // Register custom assets (eg. plugins)

Source/Editor/CustomEditors/CustomEditorPresenter.cs

@@ -37,6 +37,23 @@ namespace FlaxEditor.CustomEditors
         UseDefault = 1 << 2,
     }
 
+    /// <summary>
+    /// The interface for Editor context that owns the presenter. Can be <see cref="FlaxEditor.Windows.PropertiesWindow"/> or <see cref="FlaxEditor.Windows.Assets.PrefabWindow"/> or other window/panel - custom editor scan use it for more specific features.
+    /// </summary>
+    public interface IPresenterOwner
+    {
+        /// <summary>
+        /// Gets the viewport linked with properties presenter (optional, null if unused).
+        /// </summary>
+        public Viewport.EditorViewport PresenterViewport { get; }
+
+        /// <summary>
+        /// Selects the scene objects.
+        /// </summary>
+        /// <param name="nodes">The nodes to select</param>
+        public void Select(List<SceneGraph.SceneGraphNode> nodes);
+    }
+
     /// <summary>
     /// Main class for Custom Editors used to present selected objects properties and allow to modify them.
     /// </summary>
@@ -68,8 +85,15 @@ namespace FlaxEditor.CustomEditors
             /// <inheritdoc />
             public override void Update(float deltaTime)
             {
-                // Update editors
-                _presenter.Update();
+                try
+                {
+                    // Update editors
+                    _presenter.Update();
+                }
+                catch (Exception ex)
+                {
+                    FlaxEditor.Editor.LogWarning(ex);
+                }
 
                 base.Update(deltaTime);
             }
@@ -254,7 +278,7 @@ namespace FlaxEditor.CustomEditors
         /// <summary>
         /// The Editor context that owns this presenter. Can be <see cref="FlaxEditor.Windows.PropertiesWindow"/> or <see cref="FlaxEditor.Windows.Assets.PrefabWindow"/> or other window/panel - custom editor scan use it for more specific features.
         /// </summary>
-        public object Owner;
+        public IPresenterOwner Owner;
 
         /// <summary>
         /// Gets or sets the text to show when no object is selected.
@@ -270,7 +294,24 @@ namespace FlaxEditor.CustomEditors
             }
         }
 
+        /// <summary>
+        /// Gets or sets the value indicating whether properties are read-only.
+        /// </summary>
+        public bool ReadOnly
+        {
+            get => _readOnly;
+            set
+            {
+                if (_readOnly != value)
+                {
+                    _readOnly = value;
+                    UpdateReadOnly();
+                }
+            }
+        }
+
         private bool _buildOnUpdate;
+        private bool _readOnly;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomEditorPresenter"/> class.
@@ -278,7 +319,7 @@ namespace FlaxEditor.CustomEditors
         /// <param name="undo">The undo. It's optional.</param>
         /// <param name="noSelectionText">The custom text to display when no object is selected. Default is No selection.</param>
         /// <param name="owner">The owner of the presenter.</param>
-        public CustomEditorPresenter(Undo undo, string noSelectionText = null, object owner = null)
+        public CustomEditorPresenter(Undo undo, string noSelectionText = null, IPresenterOwner owner = null)
         {
             Undo = undo;
             Owner = owner;
@@ -364,6 +405,8 @@ namespace FlaxEditor.CustomEditors
             // Restore scroll value
             if (parentScrollV > -1)
                 panel.VScrollBar.Value = parentScrollV;
+            if (_readOnly)
+                UpdateReadOnly();
         }
 
         /// <summary>
@@ -374,6 +417,16 @@ namespace FlaxEditor.CustomEditors
             _buildOnUpdate = true;
         }
 
+        private void UpdateReadOnly()
+        {
+            // Only scrollbars are enabled
+            foreach (var child in Panel.Children)
+            {
+                if (!(child is ScrollBar))
+                    child.Enabled = !_readOnly;
+            }
+        }
+
         private void ExpandGroups(LayoutElementsContainer c, bool open)
         {
             if (c is Elements.GroupElement group)

Source/Editor/CustomEditors/Dedicated/ClothEditor.cs

@@ -0,0 +1,97 @@
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+
+using FlaxEditor.Gizmo;
+using FlaxEditor.Scripting;
+using FlaxEngine;
+using FlaxEngine.GUI;
+using FlaxEngine.Json;
+using FlaxEngine.Tools;
+
+namespace FlaxEditor.CustomEditors.Dedicated
+{
+    /// <summary>
+    /// Custom editor for <see cref="Cloth"/>.
+    /// </summary>
+    /// <seealso cref="ActorEditor" />
+    [CustomEditor(typeof(Cloth)), DefaultEditor]
+    class ClothEditor : ActorEditor
+    {
+        private ClothPaintingGizmoMode _gizmoMode;
+        private Viewport.Modes.EditorGizmoMode _prevMode;
+
+        /// <inheritdoc />
+        public override void Initialize(LayoutElementsContainer layout)
+        {
+            base.Initialize(layout);
+
+            if (Values.Count != 1)
+                return;
+
+            // Add gizmo painting mode to the viewport
+            var owner = Presenter.Owner;
+            if (owner == null)
+                return;
+            var gizmoOwner = owner as IGizmoOwner ?? owner.PresenterViewport as IGizmoOwner;
+            if (gizmoOwner == null)
+                return;
+            var gizmos = gizmoOwner.Gizmos;
+            _gizmoMode = new ClothPaintingGizmoMode();
+
+            var projectCache = Editor.Instance.ProjectCache;
+            if (projectCache.TryGetCustomData("ClothGizmoPaintValue", out var cachedPaintValue))
+                _gizmoMode.PaintValue = JsonSerializer.Deserialize<float>(cachedPaintValue);
+            if (projectCache.TryGetCustomData("ClothGizmoContinuousPaint", out var cachedContinuousPaint))
+                _gizmoMode.ContinuousPaint = JsonSerializer.Deserialize<bool>(cachedContinuousPaint);
+            if (projectCache.TryGetCustomData("ClothGizmoBrushFalloff", out var cachedBrushFalloff))
+                _gizmoMode.BrushFalloff = JsonSerializer.Deserialize<float>(cachedBrushFalloff);
+            if (projectCache.TryGetCustomData("ClothGizmoBrushSize", out var cachedBrushSize))
+                _gizmoMode.BrushSize = JsonSerializer.Deserialize<float>(cachedBrushSize);
+            if (projectCache.TryGetCustomData("ClothGizmoBrushStrength", out var cachedBrushStrength))
+                _gizmoMode.BrushStrength = JsonSerializer.Deserialize<float>(cachedBrushStrength);
+
+            gizmos.AddMode(_gizmoMode);
+            _prevMode = gizmos.ActiveMode;
+            gizmos.ActiveMode = _gizmoMode;
+            _gizmoMode.Gizmo.SetPaintCloth((Cloth)Values[0]);
+
+            // Insert gizmo mode options to properties editing
+            var paintGroup = layout.Group("Cloth Painting");
+            var paintValue = new ReadOnlyValueContainer(new ScriptType(typeof(ClothPaintingGizmoMode)), _gizmoMode);
+            paintGroup.Object(paintValue);
+            {
+                var grid = paintGroup.CustomContainer<UniformGridPanel>();
+                var gridControl = grid.CustomControl;
+                gridControl.ClipChildren = false;
+                gridControl.Height = Button.DefaultHeight;
+                gridControl.SlotsHorizontally = 2;
+                gridControl.SlotsVertically = 1;
+                grid.Button("Fill", "Fills the cloth particles with given paint value.").Button.Clicked += _gizmoMode.Gizmo.Fill;
+                grid.Button("Reset", "Clears the cloth particles paint.").Button.Clicked += _gizmoMode.Gizmo.Reset;
+            }
+        }
+
+        /// <inheritdoc />
+        protected override void Deinitialize()
+        {
+            // Cleanup gizmos
+            if (_gizmoMode != null)
+            {
+                var gizmos = _gizmoMode.Owner.Gizmos;
+                if (gizmos.ActiveMode == _gizmoMode)
+                    gizmos.ActiveMode = _prevMode;
+                gizmos.RemoveMode(_gizmoMode);
+                var projectCache = Editor.Instance.ProjectCache;
+                projectCache.SetCustomData("ClothGizmoPaintValue", JsonSerializer.Serialize(_gizmoMode.PaintValue, typeof(float)));
+                projectCache.SetCustomData("ClothGizmoContinuousPaint", JsonSerializer.Serialize(_gizmoMode.ContinuousPaint, typeof(bool)));
+                projectCache.SetCustomData("ClothGizmoBrushFalloff", JsonSerializer.Serialize(_gizmoMode.BrushFalloff, typeof(float)));
+                projectCache.SetCustomData("ClothGizmoBrushSize", JsonSerializer.Serialize(_gizmoMode.BrushSize, typeof(float)));
+                projectCache.SetCustomData("ClothGizmoBrushStrength", JsonSerializer.Serialize(_gizmoMode.BrushStrength, typeof(float)));
+                _gizmoMode.Dispose();
+                _gizmoMode = null;
+            }
+            _prevMode = null;
+
+            base.Deinitialize();
+        }
+    }
+}

Source/Editor/CustomEditors/Dedicated/MeshReferenceEditor.cs

@@ -0,0 +1,336 @@
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+
+using System;
+using System.IO;
+using System.Linq;
+using FlaxEditor.CustomEditors.Editors;
+using FlaxEditor.CustomEditors.Elements;
+using FlaxEditor.GUI;
+using FlaxEditor.Scripting;
+using FlaxEngine;
+using FlaxEngine.GUI;
+
+namespace FlaxEditor.CustomEditors.Dedicated
+{
+    /// <summary>
+    /// Custom editor for <see cref="ModelInstanceActor.MeshReference"/>.
+    /// </summary>
+    /// <seealso cref="ActorEditor" />
+    [CustomEditor(typeof(ModelInstanceActor.MeshReference)), DefaultEditor]
+    public class MeshReferenceEditor : CustomEditor
+    {
+        private class MeshRefPickerControl : Control
+        {
+            private ModelInstanceActor.MeshReference _value = new ModelInstanceActor.MeshReference { LODIndex = -1, MeshIndex = -1 };
+            private string _valueName;
+            private Float2 _mousePos;
+
+            public string[][] MeshNames;
+            public event Action ValueChanged;
+
+            public ModelInstanceActor.MeshReference Value
+            {
+                get => _value;
+                set
+                {
+                    if (_value.LODIndex == value.LODIndex && _value.MeshIndex == value.MeshIndex)
+                        return;
+                    _value = value;
+                    if (value.LODIndex == -1 || value.MeshIndex == -1)
+                        _valueName = null;
+                    else if (MeshNames.Length == 1)
+                        _valueName = MeshNames[value.LODIndex][value.MeshIndex];
+                    else
+                        _valueName = $"LOD{value.LODIndex} - {MeshNames[value.LODIndex][value.MeshIndex]}";
+                    ValueChanged?.Invoke();
+                }
+            }
+
+            public MeshRefPickerControl()
+            : base(0, 0, 50, 16)
+            {
+            }
+
+            private void ShowDropDownMenu()
+            {
+                // Show context menu with tree structure of LODs and meshes
+                Focus();
+                var cm = new ItemsListContextMenu(200);
+                var meshNames = MeshNames;
+                var actor = _value.Actor;
+                for (int lodIndex = 0; lodIndex < meshNames.Length; lodIndex++)
+                {
+                    var item = new ItemsListContextMenu.Item
+                    {
+                        Name = "LOD" + lodIndex,
+                        Tag = new ModelInstanceActor.MeshReference { Actor = actor, LODIndex = lodIndex, MeshIndex = 0 },
+                        TintColor = new Color(0.8f, 0.8f, 1.0f, 0.8f),
+                    };
+                    cm.AddItem(item);
+
+                    for (int meshIndex = 0; meshIndex < meshNames[lodIndex].Length; meshIndex++)
+                    {
+                        item = new ItemsListContextMenu.Item
+                        {
+                            Name = "     " + meshNames[lodIndex][meshIndex],
+                            Tag = new ModelInstanceActor.MeshReference { Actor = actor, LODIndex = lodIndex, MeshIndex = meshIndex },
+                        };
+                        if (_value.LODIndex == lodIndex && _value.MeshIndex == meshIndex)
+                            item.BackgroundColor = FlaxEngine.GUI.Style.Current.BackgroundSelected;
+                        cm.AddItem(item);
+                    }
+                }
+                cm.ItemClicked += item => Value = (ModelInstanceActor.MeshReference)item.Tag;
+                cm.Show(Parent, BottomLeft);
+            }
+
+            /// <inheritdoc />
+            public override void Draw()
+            {
+                base.Draw();
+
+                // Cache data
+                var style = FlaxEngine.GUI.Style.Current;
+                bool isSelected = _valueName != null;
+                bool isEnabled = EnabledInHierarchy;
+                var frameRect = new Rectangle(0, 0, Width, 16);
+                if (isSelected)
+                    frameRect.Width -= 16;
+                frameRect.Width -= 16;
+                var nameRect = new Rectangle(2, 1, frameRect.Width - 4, 14);
+                var button1Rect = new Rectangle(nameRect.Right + 2, 1, 14, 14);
+                var button2Rect = new Rectangle(button1Rect.Right + 2, 1, 14, 14);
+
+                // Draw frame
+                Render2D.DrawRectangle(frameRect, isEnabled && (IsMouseOver || IsNavFocused) ? style.BorderHighlighted : style.BorderNormal);
+
+                // Check if has item selected
+                if (isSelected)
+                {
+                    // Draw name
+                    Render2D.PushClip(nameRect);
+                    Render2D.DrawText(style.FontMedium, _valueName, nameRect, isEnabled ? style.Foreground : style.ForegroundDisabled, TextAlignment.Near, TextAlignment.Center);
+                    Render2D.PopClip();
+
+                    // Draw deselect button
+                    Render2D.DrawSprite(style.Cross, button1Rect, isEnabled && button1Rect.Contains(_mousePos) ? style.Foreground : style.ForegroundGrey);
+                }
+                else
+                {
+                    // Draw info
+                    Render2D.DrawText(style.FontMedium, "-", nameRect, isEnabled ? Color.OrangeRed : Color.DarkOrange, TextAlignment.Near, TextAlignment.Center);
+                }
+
+                // Draw picker button
+                var pickerRect = isSelected ? button2Rect : button1Rect;
+                Render2D.DrawSprite(style.ArrowDown, pickerRect, isEnabled && pickerRect.Contains(_mousePos) ? style.Foreground : style.ForegroundGrey);
+            }
+
+            /// <inheritdoc />
+            public override void OnMouseEnter(Float2 location)
+            {
+                _mousePos = location;
+
+                base.OnMouseEnter(location);
+            }
+
+            /// <inheritdoc />
+            public override void OnMouseLeave()
+            {
+                _mousePos = Float2.Minimum;
+
+                base.OnMouseLeave();
+            }
+
+            /// <inheritdoc />
+            public override void OnMouseMove(Float2 location)
+            {
+                _mousePos = location;
+
+                base.OnMouseMove(location);
+            }
+
+            /// <inheritdoc />
+            public override bool OnMouseUp(Float2 location, MouseButton button)
+            {
+                // Cache data
+                bool isSelected = _valueName != null;
+                var frameRect = new Rectangle(0, 0, Width, 16);
+                if (isSelected)
+                    frameRect.Width -= 16;
+                frameRect.Width -= 16;
+                var nameRect = new Rectangle(2, 1, frameRect.Width - 4, 14);
+                var button1Rect = new Rectangle(nameRect.Right + 2, 1, 14, 14);
+                var button2Rect = new Rectangle(button1Rect.Right + 2, 1, 14, 14);
+
+                // Deselect
+                if (isSelected && button1Rect.Contains(ref location))
+                    Value = new ModelInstanceActor.MeshReference { Actor = null, LODIndex = -1, MeshIndex = -1 };
+
+                // Picker dropdown menu
+                if ((isSelected ? button2Rect : button1Rect).Contains(ref location))
+                    ShowDropDownMenu();
+
+                return base.OnMouseUp(location, button);
+            }
+
+            /// <inheritdoc />
+            public override bool OnMouseDoubleClick(Float2 location, MouseButton button)
+            {
+                Focus();
+
+                // Open model editor window
+                if (_value.Actor is StaticModel staticModel)
+                    Editor.Instance.ContentEditing.Open(staticModel.Model);
+                else if (_value.Actor is AnimatedModel animatedModel)
+                    Editor.Instance.ContentEditing.Open(animatedModel.SkinnedModel);
+
+                return base.OnMouseDoubleClick(location, button);
+            }
+
+            /// <inheritdoc />
+            public override void OnSubmit()
+            {
+                base.OnSubmit();
+
+                ShowDropDownMenu();
+            }
+
+            /// <inheritdoc />
+            public override void OnDestroy()
+            {
+                MeshNames = null;
+                _valueName = null;
+
+                base.OnDestroy();
+            }
+        }
+
+        private ModelInstanceActor _actor;
+        private CustomElement<FlaxObjectRefPickerControl> _actorPicker;
+        private CustomElement<MeshRefPickerControl> _meshPicker;
+
+        /// <inheritdoc />
+        public override DisplayStyle Style => DisplayStyle.Inline;
+
+        /// <inheritdoc />
+        public override void Initialize(LayoutElementsContainer layout)
+        {
+            // Get the context actor to pick the mesh from it
+            if (GetActor(out var actor))
+            {
+                // TODO: support editing multiple values
+                layout.Label("Different values");
+                return;
+            }
+            _actor = actor;
+
+            var showActorPicker = actor == null || ParentEditor.Values.All(x => x is not Cloth);
+            if (showActorPicker)
+            {
+                // Actor reference picker
+                _actorPicker = layout.Custom<FlaxObjectRefPickerControl>();
+                _actorPicker.CustomControl.Type = new ScriptType(typeof(ModelInstanceActor));
+                _actorPicker.CustomControl.ValueChanged += () => SetValue(new ModelInstanceActor.MeshReference { Actor = (ModelInstanceActor)_actorPicker.CustomControl.Value });
+            }
+
+            if (actor != null)
+            {
+                // Get mesh names hierarchy
+                string[][] meshNames;
+                if (actor is StaticModel staticModel)
+                {
+                    var model = staticModel.Model;
+                    if (model == null || model.WaitForLoaded())
+                        return;
+                    var materials = model.MaterialSlots;
+                    var lods = model.LODs;
+                    meshNames = new string[lods.Length][];
+                    for (int lodIndex = 0; lodIndex < lods.Length; lodIndex++)
+                    {
+                        var lodMeshes = lods[lodIndex].Meshes;
+                        meshNames[lodIndex] = new string[lodMeshes.Length];
+                        for (int meshIndex = 0; meshIndex < lodMeshes.Length; meshIndex++)
+                        {
+                            var mesh = lodMeshes[meshIndex];
+                            var materialName = materials[mesh.MaterialSlotIndex].Name;
+                            if (string.IsNullOrEmpty(materialName) && materials[mesh.MaterialSlotIndex].Material)
+                                materialName = Path.GetFileNameWithoutExtension(materials[mesh.MaterialSlotIndex].Material.Path);
+                            if (string.IsNullOrEmpty(materialName))
+                                meshNames[lodIndex][meshIndex] = $"Mesh {meshIndex}";
+                            else
+                                meshNames[lodIndex][meshIndex] = $"Mesh {meshIndex} ({materialName})";
+                        }
+                    }
+                }
+                else if (actor is AnimatedModel animatedModel)
+                {
+                    var skinnedModel = animatedModel.SkinnedModel;
+                    if (skinnedModel == null || skinnedModel.WaitForLoaded())
+                        return;
+                    var materials = skinnedModel.MaterialSlots;
+                    var lods = skinnedModel.LODs;
+                    meshNames = new string[lods.Length][];
+                    for (int lodIndex = 0; lodIndex < lods.Length; lodIndex++)
+                    {
+                        var lodMeshes = lods[lodIndex].Meshes;
+                        meshNames[lodIndex] = new string[lodMeshes.Length];
+                        for (int meshIndex = 0; meshIndex < lodMeshes.Length; meshIndex++)
+                        {
+                            var mesh = lodMeshes[meshIndex];
+                            var materialName = materials[mesh.MaterialSlotIndex].Name;
+                            if (string.IsNullOrEmpty(materialName) && materials[mesh.MaterialSlotIndex].Material)
+                                materialName = Path.GetFileNameWithoutExtension(materials[mesh.MaterialSlotIndex].Material.Path);
+                            if (string.IsNullOrEmpty(materialName))
+                                meshNames[lodIndex][meshIndex] = $"Mesh {meshIndex}";
+                            else
+                                meshNames[lodIndex][meshIndex] = $"Mesh {meshIndex} ({materialName})";
+                        }
+                    }
+                }
+                else
+                    return; // Not supported model type
+
+                // Mesh reference picker
+                _meshPicker = layout.Custom<MeshRefPickerControl>();
+                _meshPicker.CustomControl.MeshNames = meshNames;
+                _meshPicker.CustomControl.Value = (ModelInstanceActor.MeshReference)Values[0];
+                _meshPicker.CustomControl.ValueChanged += () => SetValue(_meshPicker.CustomControl.Value);
+            }
+        }
+
+        /// <inheritdoc />
+        public override void Refresh()
+        {
+            base.Refresh();
+
+            if (_actorPicker != null)
+            {
+                GetActor(out var actor);
+                _actorPicker.CustomControl.Value = actor;
+                if (actor != _actor)
+                {
+                    RebuildLayout();
+                    return;
+                }
+            }
+            if (_meshPicker != null)
+            {
+                _meshPicker.CustomControl.Value = (ModelInstanceActor.MeshReference)Values[0];
+            }
+        }
+
+        private bool GetActor(out ModelInstanceActor actor)
+        {
+            actor = null;
+            foreach (ModelInstanceActor.MeshReference value in Values)
+            {
+                if (actor == null)
+                    actor = value.Actor;
+                else if (actor != value.Actor)
+                    return true;
+            }
+            return false;
+        }
+    }
+}

Source/Editor/CustomEditors/Dedicated/MissingScriptEditor.cs

@@ -0,0 +1,165 @@
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+
+using FlaxEditor.Actions;
+using FlaxEditor.CustomEditors.Editors;
+using FlaxEditor.GUI;
+using FlaxEditor.GUI.ContextMenu;
+using FlaxEditor.Scripting;
+using FlaxEngine;
+using FlaxEngine.GUI;
+using System.Collections.Generic;
+
+namespace FlaxEditor.CustomEditors.Dedicated;
+
+/// <summary>
+/// The missing script editor.
+/// </summary>
+[CustomEditor(typeof(MissingScript)), DefaultEditor]
+public class MissingScriptEditor : GenericEditor
+{
+    private DropPanel _dropPanel;
+    private Button _replaceScriptButton;
+    private CheckBox _shouldReplaceAllCheckbox;
+
+    /// <inheritdoc />
+    public override void Initialize(LayoutElementsContainer layout)
+    {
+        if (layout.ContainerControl is not DropPanel dropPanel)
+        {
+            base.Initialize(layout);
+            return;
+        }
+        _dropPanel = dropPanel;
+        _dropPanel.HeaderTextColor = Color.OrangeRed;
+
+        var replaceScriptPanel = new Panel
+        {
+            Parent = _dropPanel,
+            Height = 64,
+        };
+
+        _replaceScriptButton = new Button
+        {
+            Text = "Replace Script",
+            TooltipText = "Replaces the missing script with a given script type",
+            AnchorPreset = AnchorPresets.TopCenter,
+            Width = 240,
+            Height = 24,
+            X = -120,
+            Y = 0,
+            Parent = replaceScriptPanel,
+        };
+        _replaceScriptButton.Clicked += OnReplaceScriptButtonClicked;
+
+        var replaceAllLabel = new Label
+        {
+            Text = "Replace all matching missing scripts",
+            TooltipText = "Whether or not to apply this script change to all scripts missing the same type.",
+            AnchorPreset = AnchorPresets.BottomCenter,
+            Y = -34,
+            Parent = replaceScriptPanel,
+        };
+        replaceAllLabel.X -= FlaxEngine.GUI.Style.Current.FontSmall.MeasureText(replaceAllLabel.Text).X;
+
+        _shouldReplaceAllCheckbox = new CheckBox
+        {
+            TooltipText = replaceAllLabel.TooltipText,
+            AnchorPreset = AnchorPresets.BottomCenter,
+            Y = -34,
+            Parent = replaceScriptPanel,
+        };
+
+        float centerDifference = (_shouldReplaceAllCheckbox.Right - replaceAllLabel.Left) / 2;
+        replaceAllLabel.X += centerDifference;
+        _shouldReplaceAllCheckbox.X += centerDifference;
+
+        base.Initialize(layout);
+    }
+
+    private void FindActorsWithMatchingMissingScript(List<MissingScript> missingScripts)
+    {
+        foreach (Actor actor in Level.GetActors(typeof(Actor)))
+        {
+            for (int scriptIndex = 0; scriptIndex < actor.ScriptsCount; scriptIndex++)
+            {
+                Script actorScript = actor.Scripts[scriptIndex];
+                if (actorScript is not MissingScript missingActorScript)
+                    continue;
+
+                MissingScript currentMissing = Values[0] as MissingScript;
+                if (missingActorScript.MissingTypeName != currentMissing.MissingTypeName)
+                    continue;
+
+                missingScripts.Add(missingActorScript);
+            }
+        }
+    }
+
+    private void RunReplacementMultiCast(List<IUndoAction> actions)
+    {
+        if (actions.Count == 0)
+        {
+            Editor.LogWarning("Failed to replace scripts!");
+            return;
+        }
+
+        var multiAction = new MultiUndoAction(actions);
+        multiAction.Do();
+        var presenter = ParentEditor.Presenter;
+        if (presenter != null)
+        {
+            presenter.Undo.AddAction(multiAction);
+            presenter.Control.Focus();
+        }
+    }
+
+    private void ReplaceScript(ScriptType script, bool replaceAllInScene)
+    {
+        var actions = new List<IUndoAction>(4);
+
+        var missingScripts = new List<MissingScript>();
+        if (!replaceAllInScene)
+            missingScripts.Add((MissingScript)Values[0]);
+        else
+            FindActorsWithMatchingMissingScript(missingScripts);
+
+        foreach (var missingScript in missingScripts)
+            actions.Add(AddRemoveScript.Add(missingScript.Actor, script));
+        RunReplacementMultiCast(actions);
+
+        for (int actionIdx = 0; actionIdx < actions.Count; actionIdx++)
+        {
+            AddRemoveScript addRemoveScriptAction = (AddRemoveScript)actions[actionIdx];
+            int orderInParent = addRemoveScriptAction.GetOrderInParent();
+
+            Script newScript = missingScripts[actionIdx].Actor.Scripts[orderInParent];
+            missingScripts[actionIdx].ReferenceScript = newScript;
+        }
+        actions.Clear();
+
+        foreach (var missingScript in missingScripts)
+            actions.Add(AddRemoveScript.Remove(missingScript));
+        RunReplacementMultiCast(actions);
+    }
+
+    private void OnReplaceScriptButtonClicked()
+    {
+        var scripts = Editor.Instance.CodeEditing.Scripts.Get();
+        if (scripts.Count == 0)
+        {
+            // No scripts
+            var cm1 = new ContextMenu();
+            cm1.AddButton("No scripts in project");
+            cm1.Show(_dropPanel, _replaceScriptButton.BottomLeft);
+            return;
+        }
+
+        // Show context menu with list of scripts to add
+        var cm = new ItemsListContextMenu(180);
+        for (int i = 0; i < scripts.Count; i++)
+            cm.AddItem(new TypeSearchPopup.TypeItemView(scripts[i]));
+        cm.ItemClicked += item => ReplaceScript((ScriptType)item.Tag, _shouldReplaceAllCheckbox.Checked);
+        cm.SortItems();
+        cm.Show(_dropPanel, _replaceScriptButton.BottomLeft - new Float2((cm.Width - _replaceScriptButton.Width) / 2, 0));
+    }
+}

Source/Editor/CustomEditors/Dedicated/ParticleEffectEditor.cs

@@ -25,9 +25,20 @@ namespace FlaxEditor.CustomEditors.Dedicated
             get
             {
                 // All selected particle effects use the same system
-                var effect = (ParticleEffect)Values[0];
-                var system = effect.ParticleSystem;
-                return system != null && Values.TrueForAll(x => (x as ParticleEffect)?.ParticleSystem == system);
+                var effect = Values[0] as ParticleEffect;
+                var system = effect ? effect.ParticleSystem : null;
+                if (system && Values.TrueForAll(x => x is ParticleEffect fx && fx && fx.ParticleSystem == system))
+                {
+                    // All parameters can be accessed
+                    var parameters = effect.Parameters;
+                    foreach (var parameter in parameters)
+                    {
+                        if (!parameter)
+                            return false;
+                    }
+                    return true;
+                }
+                return false;
             }
         }
 

Source/Editor/CustomEditors/Dedicated/RagdollEditor.cs

@@ -50,7 +50,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 grid.Button("Remove bone").Button.ButtonClicked += OnRemoveBone;
             }
 
-            if (Presenter.Owner is Windows.PropertiesWindow || Presenter.Owner is Windows.Assets.PrefabWindow)
+            if (Presenter.Owner != null)
             {
                 // Selection
                 var grid = editorGroup.CustomContainer<UniformGridPanel>();
@@ -309,10 +309,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 if (node != null)
                     selection.Add(node);
             }
-            if (Presenter.Owner is Windows.PropertiesWindow propertiesWindow)
-                propertiesWindow.Editor.SceneEditing.Select(selection);
-            else if (Presenter.Owner is Windows.Assets.PrefabWindow prefabWindow)
-                prefabWindow.Select(selection);
+            Presenter.Owner.Select(selection);
         }
     }
 }

Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs

@@ -25,6 +25,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
         private DragHandlers _dragHandlers;
         private DragScriptItems _dragScripts;
         private DragAssets _dragAssets;
+        private Button _addScriptsButton;
 
         /// <summary>
         /// The parent scripts editor.
@@ -40,16 +41,19 @@ namespace FlaxEditor.CustomEditors.Dedicated
             AutoFocus = false;
 
             // Add script button
-            float addScriptButtonWidth = 60.0f;
-            var addScriptButton = new Button
+            var buttonText = "Add script";
+            var textSize = Style.Current.FontMedium.MeasureText(buttonText);
+            float addScriptButtonWidth = (textSize.X < 60.0f) ? 60.0f : textSize.X + 4;
+            var buttonHeight = (textSize.Y < 18) ? 18 : textSize.Y + 4;
+            _addScriptsButton = new Button
             {
                 TooltipText = "Add new scripts to the actor",
                 AnchorPreset = AnchorPresets.MiddleCenter,
-                Text = "Add script",
+                Text = buttonText,
                 Parent = this,
-                Bounds = new Rectangle((Width - addScriptButtonWidth) / 2, 1, addScriptButtonWidth, 18),
+                Bounds = new Rectangle((Width - addScriptButtonWidth) / 2, 1, addScriptButtonWidth, buttonHeight),
             };
-            addScriptButton.ButtonClicked += OnAddScriptButtonClicked;
+            _addScriptsButton.ButtonClicked += OnAddScriptButtonClicked;
         }
 
         private void OnAddScriptButtonClicked(Button button)
@@ -82,7 +86,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             var size = Size;
 
             // Info
-            Render2D.DrawText(style.FontSmall, "Drag scripts here", new Rectangle(2, 22, size.X - 4, size.Y - 4 - 20), style.ForegroundDisabled, TextAlignment.Center, TextAlignment.Center);
+            Render2D.DrawText(style.FontSmall, "Drag scripts here", new Rectangle(2, _addScriptsButton.Height + 4, size.X - 4, size.Y - 4 - 20), style.ForegroundDisabled, TextAlignment.Center, TextAlignment.Center);
 
             // Check if drag is over
             if (IsDragOver && _dragHandlers != null && _dragHandlers.HasValidDrag)
@@ -254,27 +258,15 @@ namespace FlaxEditor.CustomEditors.Dedicated
     /// Small image control added per script group that allows to drag and drop a reference to it. Also used to reorder the scripts.
     /// </summary>
     /// <seealso cref="FlaxEngine.GUI.Image" />
-    internal class ScriptDragIcon : Image
+    internal class DragImage : Image
     {
-        private ScriptsEditor _editor;
         private bool _isMouseDown;
         private Float2 _mouseDownPos;
 
         /// <summary>
-        /// Gets the target script.
+        /// Action called when drag event should start.
         /// </summary>
-        public Script Script => (Script)Tag;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ScriptDragIcon"/> class.
-        /// </summary>
-        /// <param name="editor">The script editor.</param>
-        /// <param name="script">The target script.</param>
-        public ScriptDragIcon(ScriptsEditor editor, Script script)
-        {
-            Tag = script;
-            _editor = editor;
-        }
+        public Action<DragImage> Drag;
 
         /// <inheritdoc />
         public override void OnMouseEnter(Float2 location)
@@ -287,11 +279,10 @@ namespace FlaxEditor.CustomEditors.Dedicated
         /// <inheritdoc />
         public override void OnMouseLeave()
         {
-            // Check if start drag drop
             if (_isMouseDown)
             {
-                DoDrag();
                 _isMouseDown = false;
+                Drag(this);
             }
 
             base.OnMouseLeave();
@@ -300,11 +291,10 @@ namespace FlaxEditor.CustomEditors.Dedicated
         /// <inheritdoc />
         public override void OnMouseMove(Float2 location)
         {
-            // Check if start drag drop
             if (_isMouseDown && Float2.Distance(location, _mouseDownPos) > 10.0f)
             {
-                DoDrag();
                 _isMouseDown = false;
+                Drag(this);
             }
 
             base.OnMouseMove(location);
@@ -315,8 +305,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
         {
             if (button == MouseButton.Left)
             {
-                // Clear flag
                 _isMouseDown = false;
+                return true;
             }
 
             return base.OnMouseUp(location, button);
@@ -327,21 +317,13 @@ namespace FlaxEditor.CustomEditors.Dedicated
         {
             if (button == MouseButton.Left)
             {
-                // Set flag
                 _isMouseDown = true;
                 _mouseDownPos = location;
+                return true;
             }
 
             return base.OnMouseDown(location, button);
         }
-
-        private void DoDrag()
-        {
-            var script = Script;
-            _editor.OnScriptDragChange(true, script);
-            DoDragDrop(DragScripts.GetDragData(script));
-            _editor.OnScriptDragChange(false, script);
-        }
     }
 
     internal class ScriptArrangeBar : Control
@@ -576,8 +558,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     return;
                 for (int j = 0; j < e.Length; j++)
                 {
-                    var t1 = scripts[j]?.TypeName;
-                    var t2 = e[j]?.TypeName;
+                    var t1 = scripts[j] != null ? scripts[j].TypeName : null;
+                    var t2 = e[j] != null ? e[j].TypeName : null;
                     if (t1 != t2)
                         return;
                 }
@@ -639,7 +621,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 _scriptToggles[i] = scriptToggle;
 
                 // Add drag button to the group
-                var scriptDrag = new ScriptDragIcon(this, script)
+                var scriptDrag = new DragImage
                 {
                     TooltipText = "Script reference",
                     AutoFocus = true,
@@ -650,6 +632,13 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     Margin = new Margin(1),
                     Brush = new SpriteBrush(Editor.Instance.Icons.DragBar12),
                     Tag = script,
+                    Drag = img =>
+                    {
+                        var s = (Script)img.Tag;
+                        OnScriptDragChange(true, s);
+                        img.DoDragDrop(DragScripts.GetDragData(s));
+                        OnScriptDragChange(false, s);
+                    }
                 };
 
                 // Add settings button to the group

Source/Editor/CustomEditors/Dedicated/SplineEditor.cs

@@ -1,9 +1,12 @@
 // Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
-using FlaxEditor.Actions;
-using FlaxEditor.SceneGraph.Actors;
+using System;
+using System.Collections.Generic;
 using FlaxEngine;
-using FlaxEngine.GUI;
+using FlaxEditor.Actions;
+using FlaxEditor.SceneGraph;
+using FlaxEditor.SceneGraph.Actors;
+using FlaxEditor.GUI.Tabs;
 
 namespace FlaxEditor.CustomEditors.Dedicated
 {
@@ -14,54 +17,853 @@ namespace FlaxEditor.CustomEditors.Dedicated
     [CustomEditor(typeof(Spline)), DefaultEditor]
     public class SplineEditor : ActorEditor
     {
+        /// <summary>
+        /// Storage undo spline data
+        /// </summary>
+        private struct UndoData
+        {
+            public Spline Spline;
+            public BezierCurve<Transform>.Keyframe[] BeforeKeyframes;
+        }
+
+        /// <summary>
+        /// Basis for creating tangent manipulation types for bezier curves.
+        /// </summary>
+        private class EditTangentOptionBase
+        {
+            /// <summary>
+            /// Called when user set selected tangent mode.
+            /// </summary>
+            /// <param name="spline">Current spline selected on editor viewport.</param>
+            /// <param name="index">Index of current keyframe selected on spline.</param>
+            public virtual void OnSetMode(Spline spline, int index)
+            {
+            }
+
+            /// <summary>
+            /// Called when user select a keyframe (spline point) of current selected spline on editor viewport.
+            /// </summary>
+            /// <param name="spline">Current spline selected on editor viewport.</param>
+            /// <param name="index">Index of current keyframe selected on spline.</param>
+            public virtual void OnSelectKeyframe(Spline spline, int index)
+            {
+            }
+
+            /// <summary>
+            /// Called when user select a tangent of current keyframe selected from spline.
+            /// </summary>
+            /// <param name="spline">Current spline selected on editor viewport.</param>
+            /// <param name="index">Index of current keyframe selected on spline.</param>
+            public virtual void OnSelectTangent(Spline spline, int index)
+            {
+            }
+
+            /// <summary>
+            /// Called when the tangent in from current keyframe selected from spline is moved on editor viewport.
+            /// </summary>
+            /// <param name="spline">Current spline selected on editor viewport.</param>
+            /// <param name="index">Index of current keyframe selected on spline.</param>
+            public virtual void OnMoveTangentIn(Spline spline, int index)
+            {
+            }
+
+            /// <summary>
+            /// Called when the tangent out from current keyframe selected from spline is moved on editor viewport.
+            /// </summary>
+            /// <param name="spline">Current spline selected on editor viewport.</param>
+            /// <param name="index">Current spline selected on editor viewport.</param>
+            public virtual void OnMoveTangentOut(Spline spline, int index)
+            {
+            }
+        }
+
+        /// <summary>
+        /// Edit curve options manipulate the curve as free mode
+        /// </summary>
+        private sealed class FreeTangentMode : EditTangentOptionBase
+        {
+            /// <inheritdoc/>
+            public override void OnSetMode(Spline spline, int index)
+            {
+                if (IsLinearTangentMode(spline, index) || IsSmoothInTangentMode(spline, index) || IsSmoothOutTangentMode(spline, index))
+                {
+                    SetPointSmooth(spline, index);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Edit curve options to set tangents to linear
+        /// </summary>
+        private sealed class LinearTangentMode : EditTangentOptionBase
+        {
+            /// <inheritdoc/>
+            public override void OnSetMode(Spline spline, int index)
+            {
+                SetKeyframeLinear(spline, index);
+
+                // change the selection to tangent parent (a spline point / keyframe)
+                SetSelectSplinePointNode(spline, index);
+            }
+        }
+
+        /// <summary>
+        /// Edit curve options to align tangents of selected spline
+        /// </summary>
+        private sealed class AlignedTangentMode : EditTangentOptionBase
+        {
+            /// <inheritdoc/>
+            public override void OnSetMode(Spline spline, int index)
+            {
+                SmoothIfNotAligned(spline, index);
+            }
+
+            /// <inheritdoc/>
+            public override void OnSelectKeyframe(Spline spline, int index)
+            {
+                SmoothIfNotAligned(spline, index);
+            }
+
+            /// <inheritdoc/>
+            public override void OnMoveTangentIn(Spline spline, int index)
+            {
+                SetPointAligned(spline, index, true);
+            }
+
+            /// <inheritdoc/>
+            public override void OnMoveTangentOut(Spline spline, int index)
+            {
+                SetPointAligned(spline, index, false);
+            }
+
+            private void SmoothIfNotAligned(Spline spline, int index)
+            {
+                if (!IsAlignedTangentMode(spline, index))
+                {
+                    SetPointSmooth(spline, index);
+                }
+            }
+
+            private void SetPointAligned(Spline spline, int index, bool alignWithIn)
+            {
+                var keyframe = spline.GetSplineKeyframe(index);
+                var referenceTangent = alignWithIn ? keyframe.TangentIn : keyframe.TangentOut;
+                var otherTangent = !alignWithIn ? keyframe.TangentIn : keyframe.TangentOut;
+
+                // inverse of reference tangent
+                otherTangent.Translation = -referenceTangent.Translation.Normalized * otherTangent.Translation.Length;
+
+                if (alignWithIn)
+                    keyframe.TangentOut = otherTangent;
+                if (!alignWithIn)
+                    keyframe.TangentIn = otherTangent;
+
+                spline.SetSplineKeyframe(index, keyframe);
+            }
+        }
+
+        /// <summary>
+        /// Edit curve options manipulate the curve setting selected point 
+        /// tangent in as smoothed but tangent out as linear
+        /// </summary>
+        private sealed class SmoothInTangentMode : EditTangentOptionBase
+        {
+            /// <inheritdoc/>
+            public override void OnSetMode(Spline spline, int index)
+            {
+                SetTangentSmoothIn(spline, index);
+                SetSelectTangentIn(spline, index);
+            }
+        }
+
+        /// <summary>
+        /// Edit curve options manipulate the curve setting selected point 
+        /// tangent in as linear but tangent out as smoothed
+        /// </summary>
+        private sealed class SmoothOutTangentMode : EditTangentOptionBase
+        {
+            /// <inheritdoc/>
+            public override void OnSetMode(Spline spline, int index)
+            {
+                SetTangentSmoothOut(spline, index);
+                SetSelectTangentOut(spline, index);
+            }
+        }
+
+        private sealed class IconTab : Tab
+        {
+            private sealed class IconTabHeader : Tabs.TabHeader
+            {
+                public IconTabHeader(Tabs tabs, Tab tab)
+                : base(tabs, tab)
+                {
+                }
+
+                public override bool OnMouseUp(Float2 location, MouseButton button)
+                {
+                    if (EnabledInHierarchy && Tab.Enabled)
+                        ((IconTab)Tab)._action();
+                    return true;
+                }
+
+                public override void Draw()
+                {
+                    base.Draw();
+
+                    var tab = (IconTab)Tab;
+                    var enabled = EnabledInHierarchy && tab.EnabledInHierarchy;
+                    var style = FlaxEngine.GUI.Style.Current;
+                    var size = Size;
+                    var textHeight = 16.0f;
+                    var iconSize = size.Y - textHeight;
+                    var iconRect = new Rectangle((Width - iconSize) / 2, 0, iconSize, iconSize);
+                    if (tab._mirrorIcon)
+                    {
+                        iconRect.Location.X += iconRect.Size.X;
+                        iconRect.Size.X *= -1;
+                    }
+                    var color = style.Foreground;
+                    if (!enabled)
+                        color *= 0.6f;
+                    Render2D.DrawSprite(tab._customIcon, iconRect, color);
+                    Render2D.DrawText(style.FontMedium, tab._customText, new Rectangle(0, iconSize, size.X, textHeight), color, TextAlignment.Center, TextAlignment.Center);
+                }
+            }
+
+            private readonly Action _action;
+            private readonly string _customText;
+            private readonly SpriteHandle _customIcon;
+            private readonly bool _mirrorIcon;
+
+            public IconTab(Action action, string text, SpriteHandle icon, bool mirrorIcon = false)
+            : base(string.Empty, SpriteHandle.Invalid)
+            {
+                _action = action;
+                _customText = text;
+                _customIcon = icon;
+                _mirrorIcon = mirrorIcon;
+            }
+
+            public override Tabs.TabHeader CreateHeader()
+            {
+                return new IconTabHeader((Tabs)Parent, this);
+            }
+        }
+
+        private EditTangentOptionBase _currentTangentMode;
+
+        private Tabs _selectedPointsTabs, _allPointsTabs;
+        private Tab _freeTangentTab;
+        private Tab _linearTangentTab;
+        private Tab _alignedTangentTab;
+        private Tab _smoothInTangentTab;
+        private Tab _smoothOutTangentTab;
+        private Tab _setLinearAllTangentsTab;
+        private Tab _setSmoothAllTangentsTab;
+
+        private bool _tanInChanged;
+        private bool _tanOutChanged;
+        private Vector3 _lastTanInPos;
+        private Vector3 _lastTanOutPos;
+        private Spline _selectedSpline;
+        private SplineNode.SplinePointNode _selectedPoint;
+        private SplineNode.SplinePointNode _lastPointSelected;
+        private SplineNode.SplinePointTangentNode _selectedTangentIn;
+        private SplineNode.SplinePointTangentNode _selectedTangentOut;
+
+        private UndoData[] _selectedSplinesUndoData;
+
+        private bool HasPointSelected => _selectedPoint != null;
+        private bool HasTangentsSelected => _selectedTangentIn != null || _selectedTangentOut != null;
+
         /// <inheritdoc />
         public override void Initialize(LayoutElementsContainer layout)
         {
             base.Initialize(layout);
 
-            if (Values.HasDifferentTypes == false)
+            _currentTangentMode = new FreeTangentMode();
+            if (Values.HasDifferentTypes || !(Values[0] is Spline spline))
+                return;
+            _selectedSpline = spline;
+
+            layout.Space(10);
+            var tabSize = 46;
+            var icons = Editor.Instance.Icons;
+
+            layout.Header("Selected spline point");
+            _selectedPointsTabs = new Tabs
             {
-                layout.Space(10);
-                var grid = layout.CustomContainer<UniformGridPanel>();
-                grid.CustomControl.SlotsHorizontally = 2;
-                grid.CustomControl.SlotsVertically = 1;
-                grid.Button("Set Linear Tangents").Button.Clicked += OnSetTangentsLinear;
-                grid.Button("Set Smooth Tangents").Button.Clicked += OnSetTangentsSmooth;
+                Height = tabSize,
+                TabsSize = new Float2(tabSize),
+                AutoTabsSize = true,
+                Parent = layout.ContainerControl,
+            };
+            _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));
+            _smoothInTangentTab = _selectedPointsTabs.AddTab(new IconTab(OnSetSelectedSmoothIn, "Smooth In", icons.SplineSmoothIn64));
+            _smoothOutTangentTab = _selectedPointsTabs.AddTab(new IconTab(OnSetSelectedSmoothOut, "Smooth Out", icons.SplineSmoothIn64, true));
+            _selectedPointsTabs.SelectedTabIndex = -1;
+
+            layout.Header("All spline points");
+            _allPointsTabs = new Tabs
+            {
+                Height = tabSize,
+                TabsSize = new Float2(tabSize),
+                AutoTabsSize = true,
+                Parent = layout.ContainerControl,
+            };
+            _setLinearAllTangentsTab = _allPointsTabs.AddTab(new IconTab(OnSetTangentsLinear, "Set Linear Tangents", icons.SplineLinear64));
+            _setSmoothAllTangentsTab = _allPointsTabs.AddTab(new IconTab(OnSetTangentsSmooth, "Set Smooth Tangents", icons.SplineAligned64));
+            _allPointsTabs.SelectedTabIndex = -1;
+
+            if (_selectedSpline)
+                _selectedSpline.SplineUpdated += OnSplineEdited;
+
+            SetSelectedTangentTypeAsCurrent();
+            UpdateEditTabsSelection();
+            UpdateButtonsEnabled();
+        }
+
+        /// <inheritdoc/>
+        protected override void Deinitialize()
+        {
+            if (_selectedSpline)
+                _selectedSpline.SplineUpdated -= OnSplineEdited;
+        }
+
+        private void OnSplineEdited()
+        {
+            UpdateEditTabsSelection();
+            UpdateButtonsEnabled();
+        }
+
+        /// <inheritdoc/>
+        public override void Refresh()
+        {
+            base.Refresh();
+
+            UpdateSelectedPoint();
+            UpdateSelectedTangent();
+
+            if (!CanEditTangent())
+                return;
+
+            var index = _lastPointSelected.Index;
+            var currentTangentInPosition = _selectedSpline.GetSplineLocalTangent(index, true).Translation;
+            var currentTangentOutPosition = _selectedSpline.GetSplineLocalTangent(index, false).Translation;
+
+            if (_selectedTangentIn != null)
+            {
+                _tanInChanged = _lastTanInPos != currentTangentInPosition;
+                _lastTanInPos = currentTangentInPosition;
             }
+
+            if (_selectedTangentOut != null)
+            {
+                _tanOutChanged = _lastTanOutPos != currentTangentOutPosition;
+                _lastTanOutPos = currentTangentOutPosition;
+            }
+
+            if (_tanInChanged)
+                _currentTangentMode.OnMoveTangentIn(_selectedSpline, index);
+            if (_tanOutChanged)
+                _currentTangentMode.OnMoveTangentOut(_selectedSpline, index);
+
+            currentTangentInPosition = _selectedSpline.GetSplineLocalTangent(index, true).Translation;
+            currentTangentOutPosition = _selectedSpline.GetSplineLocalTangent(index, false).Translation;
+
+            // Update last tangents position after changes
+            if (_selectedSpline)
+                _lastTanInPos = currentTangentInPosition;
+            if (_selectedSpline)
+                _lastTanOutPos = currentTangentOutPosition;
+            _tanInChanged = false;
+            _tanOutChanged = false;
+        }
+
+        private void SetSelectedTangentTypeAsCurrent()
+        {
+            if (_lastPointSelected == null || _selectedPoint == null)
+                return;
+            if (IsLinearTangentMode(_selectedSpline, _lastPointSelected.Index))
+                SetModeLinear();
+            else if (IsAlignedTangentMode(_selectedSpline, _lastPointSelected.Index))
+                SetModeAligned();
+            else if (IsSmoothInTangentMode(_selectedSpline, _lastPointSelected.Index))
+                SetModeSmoothIn();
+            else if (IsSmoothOutTangentMode(_selectedSpline, _lastPointSelected.Index))
+                SetModeSmoothOut();
+            else if (IsFreeTangentMode(_selectedSpline, _lastPointSelected.Index))
+                SetModeFree();
+        }
+
+        private void UpdateEditTabsSelection()
+        {
+            _selectedPointsTabs.Enabled = CanEditTangent();
+            if (!_selectedPointsTabs.Enabled)
+            {
+                _selectedPointsTabs.SelectedTabIndex = -1;
+                return;
+            }
+
+            var isFree = _currentTangentMode is FreeTangentMode;
+            var isLinear = _currentTangentMode is LinearTangentMode;
+            var isAligned = _currentTangentMode is AlignedTangentMode;
+            var isSmoothIn = _currentTangentMode is SmoothInTangentMode;
+            var isSmoothOut = _currentTangentMode is SmoothOutTangentMode;
+
+            if (isFree)
+                _selectedPointsTabs.SelectedTab = _freeTangentTab;
+            else if (isLinear)
+                _selectedPointsTabs.SelectedTab = _linearTangentTab;
+            else if (isAligned)
+                _selectedPointsTabs.SelectedTab = _alignedTangentTab;
+            else if (isSmoothIn)
+                _selectedPointsTabs.SelectedTab = _smoothInTangentTab;
+            else if (isSmoothOut)
+                _selectedPointsTabs.SelectedTab = _smoothOutTangentTab;
+            else
+                _selectedPointsTabs.SelectedTabIndex = -1;
+        }
+
+        private void UpdateButtonsEnabled()
+        {
+            _linearTangentTab.Enabled = CanEditTangent();
+            _freeTangentTab.Enabled = CanEditTangent();
+            _alignedTangentTab.Enabled = CanEditTangent();
+            _smoothInTangentTab.Enabled = CanSetTangentSmoothIn();
+            _smoothOutTangentTab.Enabled = CanSetTangentSmoothOut();
+            _setLinearAllTangentsTab.Enabled = CanSetAllTangentsLinear();
+            _setSmoothAllTangentsTab.Enabled = CanSetAllTangentsSmooth();
+        }
+
+        private bool CanEditTangent()
+        {
+            return !HasDifferentTypes && !HasDifferentValues && (HasPointSelected || HasTangentsSelected);
+        }
+
+        private bool CanSetTangentSmoothIn()
+        {
+            if (!CanEditTangent())
+                return false;
+            return _lastPointSelected.Index != 0;
+        }
+
+        private bool CanSetTangentSmoothOut()
+        {
+            if (!CanEditTangent())
+                return false;
+            return _lastPointSelected.Index < _selectedSpline.SplinePointsCount - 1;
+        }
+
+        private bool CanSetAllTangentsSmooth()
+        {
+            return _selectedSpline != null;
+        }
+
+        private bool CanSetAllTangentsLinear()
+        {
+            return _selectedSpline != null;
+        }
+
+        private void SetModeLinear()
+        {
+            if (_currentTangentMode is LinearTangentMode)
+                return;
+            _currentTangentMode = new LinearTangentMode();
+            _currentTangentMode.OnSetMode(_selectedSpline, _lastPointSelected.Index);
+        }
+
+        private void SetModeFree()
+        {
+            if (_currentTangentMode is FreeTangentMode)
+                return;
+            _currentTangentMode = new FreeTangentMode();
+            _currentTangentMode.OnSetMode(_selectedSpline, _lastPointSelected.Index);
+        }
+
+        private void SetModeAligned()
+        {
+            if (_currentTangentMode is AlignedTangentMode)
+                return;
+            _currentTangentMode = new AlignedTangentMode();
+            _currentTangentMode.OnSetMode(_selectedSpline, _lastPointSelected.Index);
+        }
+
+        private void SetModeSmoothIn()
+        {
+            if (_currentTangentMode is SmoothInTangentMode)
+                return;
+            _currentTangentMode = new SmoothInTangentMode();
+            _currentTangentMode.OnSetMode(_selectedSpline, _lastPointSelected.Index);
+        }
+
+        private void SetModeSmoothOut()
+        {
+            if (_currentTangentMode is SmoothOutTangentMode)
+                return;
+            _currentTangentMode = new SmoothOutTangentMode();
+            _currentTangentMode.OnSetMode(_selectedSpline, _lastPointSelected.Index);
+        }
+
+        private void UpdateSelectedPoint()
+        {
+            // works only if select one spline
+            if (_selectedSpline)
+            {
+                var currentSelected = Editor.Instance.SceneEditing.Selection[0];
+
+                if (currentSelected == _selectedPoint)
+                    return;
+                if (currentSelected is SplineNode.SplinePointNode selectedPoint)
+                {
+                    _selectedPoint = selectedPoint;
+                    _lastPointSelected = _selectedPoint;
+                    _currentTangentMode.OnSelectKeyframe(_selectedSpline, _lastPointSelected.Index);
+                }
+                else
+                {
+                    _selectedPoint = null;
+                }
+            }
+            else
+            {
+                _selectedPoint = null;
+            }
+
+            SetSelectedTangentTypeAsCurrent();
+            UpdateEditTabsSelection();
+            UpdateButtonsEnabled();
+        }
+
+        private void UpdateSelectedTangent()
+        {
+            // works only if select one spline
+            if (_lastPointSelected == null || Editor.Instance.SceneEditing.SelectionCount != 1)
+            {
+                _selectedTangentIn = null;
+                _selectedTangentOut = null;
+                return;
+            }
+
+            var currentSelected = Editor.Instance.SceneEditing.Selection[0];
+
+            if (currentSelected is not SplineNode.SplinePointTangentNode selectedPoint)
+            {
+                _selectedTangentIn = null;
+                _selectedTangentOut = null;
+                return;
+            }
+
+            if (currentSelected == _selectedTangentIn)
+                return;
+            if (currentSelected == _selectedTangentOut)
+                return;
+
+            var index = _lastPointSelected.Index;
+
+            if (currentSelected.Transform == _selectedSpline.GetSplineTangent(index, true))
+            {
+                _selectedTangentIn = selectedPoint;
+                _selectedTangentOut = null;
+                _currentTangentMode.OnSelectTangent(_selectedSpline, index);
+
+                return;
+            }
+
+            if (currentSelected.Transform == _selectedSpline.GetSplineTangent(index, false))
+            {
+                _selectedTangentOut = selectedPoint;
+                _selectedTangentIn = null;
+                _currentTangentMode.OnSelectTangent(_selectedSpline, index);
+                return;
+            }
+
+            _selectedTangentIn = null;
+            _selectedTangentOut = null;
+        }
+
+        private void StartEditSpline()
+        {
+            if (Presenter.Undo != null && Presenter.Undo.Enabled)
+            {
+                // Capture 'before' state for undo
+                var splines = new List<UndoData>();
+                for (int i = 0; i < Values.Count; i++)
+                {
+                    if (Values[i] is Spline spline)
+                    {
+                        splines.Add(new UndoData
+                        {
+                            Spline = spline,
+                            BeforeKeyframes = spline.SplineKeyframes.Clone() as BezierCurve<Transform>.Keyframe[]
+                        });
+                    }
+                }
+                _selectedSplinesUndoData = splines.ToArray();
+            }
+        }
+
+        private void EndEditSpline()
+        {
+            // Update buttons state
+            UpdateEditTabsSelection();
+
+            if (Presenter.Undo != null && Presenter.Undo.Enabled)
+            {
+                // Add undo
+                foreach (var splineUndoData in _selectedSplinesUndoData)
+                {
+                    Presenter.Undo.AddAction(new EditSplineAction(_selectedSpline, splineUndoData.BeforeKeyframes));
+                    SplineNode.OnSplineEdited(splineUndoData.Spline);
+                    Editor.Instance.Scene.MarkSceneEdited(splineUndoData.Spline.Scene);
+                }
+            }
+        }
+
+        private void OnSetSelectedLinear()
+        {
+            StartEditSpline();
+            SetModeLinear();
+            EndEditSpline();
+        }
+
+        private void OnSetSelectedFree()
+        {
+            StartEditSpline();
+            SetModeFree();
+            EndEditSpline();
+        }
+
+        private void OnSetSelectedAligned()
+        {
+            StartEditSpline();
+            SetModeAligned();
+            EndEditSpline();
+        }
+
+        private void OnSetSelectedSmoothIn()
+        {
+            StartEditSpline();
+            SetModeSmoothIn();
+            EndEditSpline();
+        }
+
+        private void OnSetSelectedSmoothOut()
+        {
+            StartEditSpline();
+            SetModeSmoothOut();
+            EndEditSpline();
         }
 
         private void OnSetTangentsLinear()
         {
-            var enableUndo = Presenter.Undo != null && Presenter.Undo.Enabled;
-            for (int i = 0; i < Values.Count; i++)
-            {
-                if (Values[i] is Spline spline)
-                {
-                    var before = enableUndo ? (BezierCurve<Transform>.Keyframe[])spline.SplineKeyframes.Clone() : null;
-                    spline.SetTangentsLinear();
-                    if (enableUndo)
-                        Presenter.Undo.AddAction(new EditSplineAction(spline, before));
-                    SplineNode.OnSplineEdited(spline);
-                    Editor.Instance.Scene.MarkSceneEdited(spline.Scene);
-                }
-            }
+            StartEditSpline();
+            _selectedSpline.SetTangentsLinear();
+            _selectedSpline.UpdateSpline();
+            EndEditSpline();
         }
 
         private void OnSetTangentsSmooth()
         {
-            var enableUndo = Presenter.Undo != null && Presenter.Undo.Enabled;
-            for (int i = 0; i < Values.Count; i++)
+            StartEditSpline();
+            _selectedSpline.SetTangentsSmooth();
+            _selectedSpline.UpdateSpline();
+            EndEditSpline();
+        }
+
+        private static bool IsFreeTangentMode(Spline spline, int index)
+        {
+            if (IsLinearTangentMode(spline, index) ||
+                IsAlignedTangentMode(spline, index) ||
+                IsSmoothInTangentMode(spline, index) ||
+                IsSmoothOutTangentMode(spline, index))
             {
-                if (Values[i] is Spline spline)
+                return false;
+            }
+            return true;
+        }
+
+        private static bool IsLinearTangentMode(Spline spline, int index)
+        {
+            var keyframe = spline.GetSplineKeyframe(index);
+            return keyframe.TangentIn.Translation.Length == 0 && keyframe.TangentOut.Translation.Length == 0;
+        }
+
+        private static bool IsAlignedTangentMode(Spline spline, int index)
+        {
+            var keyframe = spline.GetSplineKeyframe(index);
+            var tangentIn = keyframe.TangentIn.Translation;
+            var tangentOut = keyframe.TangentOut.Translation;
+            if (tangentIn.Length == 0 || tangentOut.Length == 0)
+                return false;
+
+            var angleBetweenTwoTangents = Vector3.Dot(tangentIn.Normalized, tangentOut.Normalized);
+            if (angleBetweenTwoTangents < -0.99f)
+                return true;
+
+            return false;
+        }
+
+        private static bool IsSmoothInTangentMode(Spline spline, int index)
+        {
+            var keyframe = spline.GetSplineKeyframe(index);
+            return keyframe.TangentIn.Translation.Length > 0 && keyframe.TangentOut.Translation.Length == 0;
+        }
+
+        private static bool IsSmoothOutTangentMode(Spline spline, int index)
+        {
+            var keyframe = spline.GetSplineKeyframe(index);
+            return keyframe.TangentOut.Translation.Length > 0 && keyframe.TangentIn.Translation.Length == 0;
+        }
+
+        private static void SetKeyframeLinear(Spline spline, int index)
+        {
+            var keyframe = spline.GetSplineKeyframe(index);
+            keyframe.TangentIn.Translation = Vector3.Zero;
+            keyframe.TangentOut.Translation = Vector3.Zero;
+
+            var lastSplineIndex = spline.SplinePointsCount - 1;
+            if (index == lastSplineIndex && spline.IsLoop)
+            {
+                var lastPoint = spline.GetSplineKeyframe(lastSplineIndex);
+                lastPoint.TangentIn.Translation = Vector3.Zero;
+                lastPoint.TangentOut.Translation = Vector3.Zero;
+                spline.SetSplineKeyframe(lastSplineIndex, lastPoint);
+            }
+
+            spline.SetSplineKeyframe(index, keyframe);
+            spline.UpdateSpline();
+        }
+
+        private static void SetTangentSmoothIn(Spline spline, int index)
+        {
+            var keyframe = spline.GetSplineKeyframe(index);
+
+            // Auto smooth tangent if's linear
+            if (keyframe.TangentIn.Translation.Length == 0)
+            {
+                var smoothRange = SplineNode.NodeSizeByDistance(spline.GetSplineTangent(index, false).Translation, 10f);
+                var previousKeyframe = spline.GetSplineKeyframe(index - 1);
+                var tangentDirection = keyframe.Value.WorldToLocalVector(previousKeyframe.Value.Translation - keyframe.Value.Translation);
+                tangentDirection = tangentDirection.Normalized * smoothRange;
+                keyframe.TangentIn.Translation = tangentDirection;
+            }
+
+            keyframe.TangentOut.Translation = Vector3.Zero;
+            spline.SetSplineKeyframe(index, keyframe);
+            spline.UpdateSpline();
+        }
+
+        private static void SetTangentSmoothOut(Spline spline, int index)
+        {
+            var keyframe = spline.GetSplineKeyframe(index);
+
+            // Auto smooth tangent if's linear
+            if (keyframe.TangentOut.Translation.Length == 0)
+            {
+                var smoothRange = SplineNode.NodeSizeByDistance(spline.GetSplineTangent(index, false).Translation, 10f);
+                var nextKeyframe = spline.GetSplineKeyframe(index + 1);
+                var tangentDirection = keyframe.Value.WorldToLocalVector(nextKeyframe.Value.Translation - keyframe.Value.Translation);
+                tangentDirection = tangentDirection.Normalized * smoothRange;
+                keyframe.TangentOut.Translation = tangentDirection;
+            }
+
+            keyframe.TangentIn.Translation = Vector3.Zero;
+
+            spline.SetSplineKeyframe(index, keyframe);
+            spline.UpdateSpline();
+        }
+
+        private static void SetPointSmooth(Spline spline, int index)
+        {
+            var keyframe = spline.GetSplineKeyframe(index);
+            var tangentInSize = keyframe.TangentIn.Translation.Length;
+            var tangentOutSize = keyframe.TangentOut.Translation.Length;
+
+            var isLastKeyframe = index >= spline.SplinePointsCount - 1;
+            var isFirstKeyframe = index <= 0;
+            var smoothRange = SplineNode.NodeSizeByDistance(spline.GetSplinePoint(index), 10f);
+
+            // Force smooth it's linear point
+            if (tangentInSize == 0f)
+                tangentInSize = smoothRange;
+            if (tangentOutSize == 0f)
+                tangentOutSize = smoothRange;
+
+            // Try get next / last keyframe
+            var nextKeyframe = !isLastKeyframe ? spline.GetSplineKeyframe(index + 1) : keyframe;
+            var previousKeyframe = !isFirstKeyframe ? spline.GetSplineKeyframe(index - 1) : keyframe;
+
+            // calc form from Spline.cpp -> SetTangentsSmooth
+            // get tangent direction
+            var tangentDirection = (keyframe.Value.Translation - previousKeyframe.Value.Translation + nextKeyframe.Value.Translation - keyframe.Value.Translation).Normalized;
+
+            keyframe.TangentIn.Translation = -tangentDirection;
+            keyframe.TangentOut.Translation = tangentDirection;
+
+            keyframe.TangentIn.Translation *= tangentInSize;
+            keyframe.TangentOut.Translation *= tangentOutSize;
+
+            spline.SetSplineKeyframe(index, keyframe);
+            spline.UpdateSpline();
+        }
+
+        private static SplineNode.SplinePointNode GetSplinePointNode(Spline spline, int index)
+        {
+            return (SplineNode.SplinePointNode)SceneGraphFactory.FindNode(spline.ID).ChildNodes[index];
+        }
+
+        private static SplineNode.SplinePointTangentNode GetSplineTangentInNode(Spline spline, int index)
+        {
+            var point = GetSplinePointNode(spline, index);
+            var tangentIn = spline.GetSplineTangent(index, true);
+            var tangentNodes = point.ChildNodes;
+
+            // find tangent in node comparing all child nodes position
+            for (int i = 0; i < tangentNodes.Count; i++)
+            {
+                if (tangentNodes[i].Transform.Translation == tangentIn.Translation)
                 {
-                    var before = enableUndo ? (BezierCurve<Transform>.Keyframe[])spline.SplineKeyframes.Clone() : null;
-                    spline.SetTangentsSmooth();
-                    if (enableUndo)
-                        Presenter.Undo.AddAction(new EditSplineAction(spline, before));
-                    SplineNode.OnSplineEdited(spline);
-                    Editor.Instance.Scene.MarkSceneEdited(spline.Scene);
+                    return (SplineNode.SplinePointTangentNode)tangentNodes[i];
                 }
             }
+
+            return null;
+        }
+
+        private static SplineNode.SplinePointTangentNode GetSplineTangentOutNode(Spline spline, int index)
+        {
+            var point = GetSplinePointNode(spline, index);
+            var tangentOut = spline.GetSplineTangent(index, false);
+            var tangentNodes = point.ChildNodes;
+
+            // find tangent out node comparing all child nodes position
+            for (int i = 0; i < tangentNodes.Count; i++)
+            {
+                if (tangentNodes[i].Transform.Translation == tangentOut.Translation)
+                {
+                    return (SplineNode.SplinePointTangentNode)tangentNodes[i];
+                }
+            }
+
+            return null;
+        }
+
+        private static void SetSelectSplinePointNode(Spline spline, int index)
+        {
+            Editor.Instance.SceneEditing.Select(GetSplinePointNode(spline, index));
+        }
+
+        private static void SetSelectTangentIn(Spline spline, int index)
+        {
+            Editor.Instance.SceneEditing.Select(GetSplineTangentInNode(spline, index));
+        }
+
+        private static void SetSelectTangentOut(Spline spline, int index)
+        {
+            Editor.Instance.SceneEditing.Select(GetSplineTangentOutNode(spline, index));
         }
     }
 }

Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs

@@ -422,12 +422,14 @@ namespace FlaxEditor.CustomEditors.Dedicated
 
             // Set control type button
             var space = layout.Space(20);
-            float setTypeButtonWidth = 60.0f;
+            var buttonText = "Set Type";
+            var textSize = FlaxEngine.GUI.Style.Current.FontMedium.MeasureText(buttonText);
+            float setTypeButtonWidth = (textSize.X < 60.0f) ? 60.0f : textSize.X + 4;
             var setTypeButton = new Button
             {
                 TooltipText = "Sets the control to the given type",
                 AnchorPreset = AnchorPresets.MiddleCenter,
-                Text = "Set Type",
+                Text = buttonText,
                 Parent = space.Spacer,
                 Bounds = new Rectangle((space.Spacer.Width - setTypeButtonWidth) / 2, 1, setTypeButtonWidth, 18),
             };

Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs

@@ -88,20 +88,20 @@ namespace FlaxEditor.CustomEditors.Editors
                 LinkValues = Editor.Instance.Windows.PropertiesWin.ScaleLinked;
 
                 // Add button with the link icon
+
                 _linkButton = new Button
                 {
                     BackgroundBrush = new SpriteBrush(Editor.Instance.Icons.Link32),
                     Parent = LinkedLabel,
                     Width = 18,
                     Height = 18,
-                    AnchorPreset = AnchorPresets.TopLeft,
+                    AnchorPreset = AnchorPresets.MiddleLeft,
                 };
                 _linkButton.Clicked += ToggleLink;
                 ToggleEnabled();
                 SetLinkStyle();
-                var x = LinkedLabel.Text.Value.Length * 7 + 5;
-                _linkButton.LocalX += x;
-                _linkButton.LocalY += 1;
+                var textSize = FlaxEngine.GUI.Style.Current.FontMedium.MeasureText(LinkedLabel.Text.Value);
+                _linkButton.LocalX += textSize.X + 10;
                 LinkedLabel.SetupContextMenu += (label, menu, editor) =>
                 {
                     menu.AddSeparator();

Source/Editor/CustomEditors/Editors/AssetRefEditor.cs

@@ -33,7 +33,12 @@ namespace FlaxEditor.CustomEditors.Editors
     [CustomEditor(typeof(Asset)), DefaultEditor]
     public class AssetRefEditor : CustomEditor
     {
-        private AssetPicker _picker;
+        /// <summary>
+        /// The asset picker used to get a reference to an asset.
+        /// </summary>
+        public AssetPicker Picker;
+
+        private bool _isRefreshing;
         private ScriptType _valueType;
 
         /// <inheritdoc />
@@ -44,7 +49,7 @@ namespace FlaxEditor.CustomEditors.Editors
         {
             if (HasDifferentTypes)
                 return;
-            _picker = layout.Custom<AssetPicker>().CustomControl;
+            Picker = layout.Custom<AssetPicker>().CustomControl;
 
             _valueType = Values.Type.Type != typeof(object) || Values[0] == null ? Values.Type : TypeUtils.GetObjectType(Values[0]);
             var assetType = _valueType;
@@ -66,7 +71,7 @@ namespace FlaxEditor.CustomEditors.Editors
                 {
                     // Generic file picker
                     assetType = ScriptType.Null;
-                    _picker.FileExtension = assetReference.TypeName;
+                    Picker.FileExtension = assetReference.TypeName;
                 }
                 else
                 {
@@ -75,26 +80,30 @@ namespace FlaxEditor.CustomEditors.Editors
                         assetType = customType;
                     else if (!Content.Settings.GameSettings.OptionalPlatformSettings.Contains(assetReference.TypeName))
                         Debug.LogWarning(string.Format("Unknown asset type '{0}' to use for asset picker filter.", assetReference.TypeName));
+                    else
+                        assetType = ScriptType.Void;
                 }
             }
 
-            _picker.AssetType = assetType;
-            _picker.Height = height;
-            _picker.SelectedItemChanged += OnSelectedItemChanged;
+            Picker.AssetType = assetType;
+            Picker.Height = height;
+            Picker.SelectedItemChanged += OnSelectedItemChanged;
         }
 
         private void OnSelectedItemChanged()
         {
+            if (_isRefreshing)
+                return;
             if (typeof(AssetItem).IsAssignableFrom(_valueType.Type))
-                SetValue(_picker.SelectedItem);
+                SetValue(Picker.SelectedItem);
             else if (_valueType.Type == typeof(Guid))
-                SetValue(_picker.SelectedID);
+                SetValue(Picker.SelectedID);
             else if (_valueType.Type == typeof(SceneReference))
-                SetValue(new SceneReference(_picker.SelectedID));
+                SetValue(new SceneReference(Picker.SelectedID));
             else if (_valueType.Type == typeof(string))
-                SetValue(_picker.SelectedPath);
+                SetValue(Picker.SelectedPath);
             else
-                SetValue(_picker.SelectedAsset);
+                SetValue(Picker.SelectedAsset);
         }
 
         /// <inheritdoc />
@@ -104,16 +113,18 @@ namespace FlaxEditor.CustomEditors.Editors
 
             if (!HasDifferentValues)
             {
+                _isRefreshing = true;
                 if (Values[0] is AssetItem assetItem)
-                    _picker.SelectedItem = assetItem;
+                    Picker.SelectedItem = assetItem;
                 else if (Values[0] is Guid guid)
-                    _picker.SelectedID = guid;
+                    Picker.SelectedID = guid;
                 else if (Values[0] is SceneReference sceneAsset)
-                    _picker.SelectedItem = Editor.Instance.ContentDatabase.FindAsset(sceneAsset.ID);
+                    Picker.SelectedItem = Editor.Instance.ContentDatabase.FindAsset(sceneAsset.ID);
                 else if (Values[0] is string path)
-                    _picker.SelectedPath = path;
+                    Picker.SelectedPath = path;
                 else
-                    _picker.SelectedAsset = Values[0] as Asset;
+                    Picker.SelectedAsset = Values[0] as Asset;
+                _isRefreshing = false;
             }
         }
     }

Source/Editor/CustomEditors/Editors/BehaviorKnowledgeSelectorEditor.cs

@@ -0,0 +1,196 @@
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FlaxEditor.GUI;
+using FlaxEditor.GUI.Tree;
+using FlaxEditor.Scripting;
+using FlaxEngine;
+using FlaxEngine.GUI;
+using FlaxEngine.Utilities;
+
+namespace FlaxEditor.CustomEditors.Editors
+{
+    /// <summary>
+    /// Custom editor for <see cref="BehaviorKnowledgeSelector{T}"/> and <see cref="BehaviorKnowledgeSelectorAny"/>.
+    /// </summary>
+    public sealed class BehaviorKnowledgeSelectorEditor : CustomEditor
+    {
+        private ClickableLabel _label;
+
+        /// <inheritdoc />
+        public override DisplayStyle Style => DisplayStyle.Inline;
+
+        /// <inheritdoc />
+        public override void Initialize(LayoutElementsContainer layout)
+        {
+            _label = layout.ClickableLabel(Path).CustomControl;
+            _label.RightClick += ShowPicker;
+            var button = new Button
+            {
+                Size = new Float2(16.0f),
+                Text = "...",
+                TooltipText = "Edit...",
+                Parent = _label,
+            };
+            button.SetAnchorPreset(AnchorPresets.MiddleRight, false, true);
+            button.Clicked += ShowPicker;
+        }
+
+        /// <inheritdoc />
+        public override void Refresh()
+        {
+            base.Refresh();
+
+            // Update label
+            _label.Text = _label.TooltipText = Path;
+        }
+
+        private string Path
+        {
+            get
+            {
+                var v = Values[0];
+                if (v is BehaviorKnowledgeSelectorAny any)
+                    return any.Path;
+                if (v is string str)
+                    return str;
+                var pathField = v.GetType().GetField("Path");
+                return pathField.GetValue(v) as string;
+            }
+            set
+            {
+                if (string.Equals(Path, value, StringComparison.Ordinal))
+                    return;
+                var v = Values[0];
+                if (v is BehaviorKnowledgeSelectorAny)
+                    v = new BehaviorKnowledgeSelectorAny(value);
+                else if (v is string)
+                    v = value;
+                else
+                {
+                    var pathField = v.GetType().GetField("Path");
+                    pathField.SetValue(v, value);
+                }
+                SetValue(v);
+            }
+        }
+
+        private void ShowPicker()
+        {
+            // Get Behavior Knowledge to select from
+            var behaviorTreeWindow = Presenter.Owner as Windows.Assets.BehaviorTreeWindow;
+            var rootNode = behaviorTreeWindow?.RootNode;
+            if (rootNode == null)
+                return;
+            var typed = ScriptType.Null;
+            var valueType = Values[0].GetType();
+            if (valueType.Name == "BehaviorKnowledgeSelector`1")
+            {
+                // Get typed selector type to show only assignable items
+                typed = new ScriptType(valueType.GenericTypeArguments[0]);
+            }
+
+            // Get customization options
+            var attributes = Values.GetAttributes();
+            var attribute = (BehaviorKnowledgeSelectorAttribute)attributes?.FirstOrDefault(x => x is BehaviorKnowledgeSelectorAttribute);
+            bool isGoalSelector = false;
+            if (attribute != null)
+            {
+                isGoalSelector = attribute.IsGoalSelector;
+            }
+
+            // Create menu with tree-like structure and search box
+            var menu = Utilities.Utils.CreateSearchPopup(out var searchBox, out var tree, 0, true);
+            var selected = Path;
+
+            // Empty
+            var noneNode = new TreeNode
+            {
+                Text = "<none>",
+                TooltipText = "Deselect value",
+                Parent = tree,
+            };
+            if (string.IsNullOrEmpty(selected))
+                tree.Select(noneNode);
+
+            if (!isGoalSelector)
+            {
+                // Blackboard
+                SetupPickerTypeItems(tree, typed, selected, "Blackboard", "Blackboard/", rootNode.BlackboardType);
+            }
+
+            // Goals
+            var goalTypes = rootNode.GoalTypes;
+            if (goalTypes?.Length != 0)
+            {
+                var goalsNode = new TreeNode
+                {
+                    Text = "Goal",
+                    TooltipText = "List of goal types defined in Blackboard Tree",
+                    Parent = tree,
+                };
+                foreach (var goalTypeName in goalTypes)
+                {
+                    var goalType = TypeUtils.GetType(goalTypeName);
+                    if (goalType == null)
+                        continue;
+                    var goalTypeNode = SetupPickerTypeItems(tree, typed, selected, goalType.Name, "Goal/" + goalTypeName + "/", goalTypeName, !isGoalSelector);
+                    goalTypeNode.Parent = goalsNode;
+                }
+                goalsNode.ExpandAll(true);
+            }
+
+            tree.SelectedChanged += delegate(List<TreeNode> before, List<TreeNode> after)
+            {
+                if (after.Count == 1)
+                {
+                    menu.Hide();
+                    Path = after[0].Tag as string;
+                }
+            };
+            menu.Show(_label, new Float2(0, _label.Height));
+        }
+
+        private TreeNode SetupPickerTypeItems(Tree tree, ScriptType typed, string selected, string text, string typePath, string typeName, bool addItems = true)
+        {
+            var type = TypeUtils.GetType(typeName);
+            if (type == null)
+                return null;
+            var typeNode = new TreeNode
+            {
+                Text = text,
+                TooltipText = type.TypeName,
+                Tag = typePath, // Ability to select whole item type data (eg. whole blackboard value)
+                Parent = tree,
+            };
+            if (typed && !typed.IsAssignableFrom(type))
+                typeNode.Tag = null;
+            if (string.Equals(selected, (string)typeNode.Tag, StringComparison.Ordinal))
+                tree.Select(typeNode);
+            if (addItems)
+            {
+                var items = GenericEditor.GetItemsForType(type, type.IsClass, true);
+                foreach (var item in items)
+                {
+                    if (typed && !typed.IsAssignableFrom(item.Info.ValueType))
+                        continue;
+                    var itemPath = typePath + item.Info.Name;
+                    var node = new TreeNode
+                    {
+                        Text = item.DisplayName,
+                        TooltipText = item.TooltipText,
+                        Tag = itemPath,
+                        Parent = typeNode,
+                    };
+                    if (string.Equals(selected, itemPath, StringComparison.Ordinal))
+                        tree.Select(node);
+                    // TODO: add support for nested items (eg. field from blackboard structure field)
+                }
+                typeNode.Expand(true);
+            }
+            return typeNode;
+        }
+    }
+}

Source/Editor/CustomEditors/Editors/BooleanEditor.cs

@@ -34,7 +34,9 @@ namespace FlaxEditor.CustomEditors.Editors
             }
             else
             {
-                element.CheckBox.Checked = (bool)Values[0];
+                var value = (bool?)Values[0];
+                if (value != null)
+                    element.CheckBox.Checked = value.Value;
             }
         }
     }

Source/Editor/CustomEditors/Editors/CultureInfoEditor.cs

@@ -123,9 +123,9 @@ namespace FlaxEditor.CustomEditors.Editors
             {
                 if (tree.IsLayoutLocked)
                     return;
-                root.LockChildrenRecursive();
+                tree.LockChildrenRecursive();
                 Utilities.Utils.UpdateSearchPopupFilter(root, searchBox.Text);
-                root.UnlockChildrenRecursive();
+                tree.UnlockChildrenRecursive();
                 menu.PerformLayout();
             };
             root.ExpandAll(true);

Source/Editor/CustomEditors/Editors/GenericEditor.cs

@@ -26,7 +26,7 @@ namespace FlaxEditor.CustomEditors.Editors
         /// Describes object property/field information for custom editors pipeline.
         /// </summary>
         /// <seealso cref="System.IComparable" />
-        protected class ItemInfo : IComparable
+        public class ItemInfo : IComparable
         {
             private Options.GeneralOptions.MembersOrder _membersOrder;
 
@@ -248,7 +248,7 @@ namespace FlaxEditor.CustomEditors.Editors
         /// <param name="useProperties">True if use type properties.</param>
         /// <param name="useFields">True if use type fields.</param>
         /// <returns>The items.</returns>
-        protected List<ItemInfo> GetItemsForType(ScriptType type, bool useProperties, bool useFields)
+        public static List<ItemInfo> GetItemsForType(ScriptType type, bool useProperties, bool useFields)
         {
             var items = new List<ItemInfo>();
 

Source/Editor/CustomEditors/Editors/IBrushEditor.cs

@@ -16,6 +16,7 @@ namespace FlaxEditor.CustomEditors.Editors
         /// <inheritdoc />
         protected override OptionType[] Options => new[]
         {
+            new OptionType("null", null),
             new OptionType("Texture", typeof(TextureBrush)),
             new OptionType("Sprite", typeof(SpriteBrush)),
             new OptionType("GPU Texture", typeof(GPUTextureBrush)),

Source/Editor/CustomEditors/Editors/InputEditor.cs

@@ -0,0 +1,146 @@
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+
+using System.Collections.Generic;
+using FlaxEditor.CustomEditors.GUI;
+using FlaxEditor.GUI;
+using FlaxEditor.GUI.ContextMenu;
+using FlaxEngine;
+
+namespace FlaxEditor.CustomEditors.Editors
+{
+    /// <summary>
+    /// Default implementation of the inspector used to edit input event properties.
+    /// </summary>
+    [CustomEditor(typeof(InputEvent)), DefaultEditor]
+    public class InputEventEditor : CustomEditor
+    {
+        private ComboBox _comboBox;
+
+        /// <inheritdoc />
+        public override DisplayStyle Style => DisplayStyle.Inline;
+
+        /// <inheritdoc />
+        public override void Initialize(LayoutElementsContainer layout)
+        {
+            LinkedLabel.SetupContextMenu += OnSetupContextMenu;
+            var comboBoxElement = layout.ComboBox();
+            _comboBox = comboBoxElement.ComboBox;
+            var names = new List<string>();
+            foreach (var mapping in Input.ActionMappings)
+            {
+                if (!names.Contains(mapping.Name))
+                    names.Add(mapping.Name);
+            }
+            _comboBox.Items = names;
+            if (Values[0] is InputEvent inputEvent && names.Contains(inputEvent.Name))
+                _comboBox.SelectedItem = inputEvent.Name;
+            _comboBox.SelectedIndexChanged += OnSelectedIndexChanged;
+        }
+
+        private void OnSetupContextMenu(PropertyNameLabel label, ContextMenu menu, CustomEditor linkededitor)
+        {
+            var button = menu.AddButton("Set to null");
+            button.Clicked += () => _comboBox.SelectedItem = null;
+        }
+
+        private void OnSelectedIndexChanged(ComboBox comboBox)
+        {
+            SetValue(comboBox.SelectedItem == null ? null : new InputEvent(comboBox.SelectedItem));
+        }
+
+        /// <inheritdoc />
+        public override void Refresh()
+        {
+            base.Refresh();
+
+            if (HasDifferentValues)
+            {
+            }
+            else
+            {
+                if (Values[0] is InputEvent inputEvent && _comboBox.Items.Contains(inputEvent.Name))
+                    _comboBox.SelectedItem = inputEvent.Name;
+                else
+                    _comboBox.SelectedItem = null;
+            }
+        }
+
+        /// <inheritdoc />
+        protected override void Deinitialize()
+        {
+            if (LinkedLabel != null)
+                LinkedLabel.SetupContextMenu -= OnSetupContextMenu;
+            if (_comboBox != null)
+                _comboBox.SelectedIndexChanged -= OnSelectedIndexChanged;
+            _comboBox = null;
+        }
+    }
+
+    /// <summary>
+    /// Default implementation of the inspector used to edit input axis properties.
+    /// </summary>
+    [CustomEditor(typeof(InputAxis)), DefaultEditor]
+    public class InputAxisEditor : CustomEditor
+    {
+        private ComboBox _comboBox;
+
+        /// <inheritdoc />
+        public override DisplayStyle Style => DisplayStyle.Inline;
+
+        /// <inheritdoc />
+        public override void Initialize(LayoutElementsContainer layout)
+        {
+            LinkedLabel.SetupContextMenu += OnSetupContextMenu;
+            var comboBoxElement = layout.ComboBox();
+            _comboBox = comboBoxElement.ComboBox;
+            var names = new List<string>();
+            foreach (var mapping in Input.AxisMappings)
+            {
+                if (!names.Contains(mapping.Name))
+                    names.Add(mapping.Name);
+            }
+            _comboBox.Items = names;
+            if (Values[0] is InputAxis inputAxis && names.Contains(inputAxis.Name))
+                _comboBox.SelectedItem = inputAxis.Name;
+            _comboBox.SelectedIndexChanged += OnSelectedIndexChanged;
+        }
+
+        private void OnSetupContextMenu(PropertyNameLabel label, ContextMenu menu, CustomEditor linkededitor)
+        {
+            var button = menu.AddButton("Set to null");
+            button.Clicked += () => _comboBox.SelectedItem = null;
+        }
+
+        private void OnSelectedIndexChanged(ComboBox comboBox)
+        {
+            SetValue(comboBox.SelectedItem == null ? null : new InputAxis(comboBox.SelectedItem));
+        }
+
+        /// <inheritdoc />
+        public override void Refresh()
+        {
+            base.Refresh();
+
+            if (HasDifferentValues)
+            {
+            }
+            else
+            {
+                if (Values[0] is InputAxis inputAxis && _comboBox.Items.Contains(inputAxis.Name))
+                    _comboBox.SelectedItem = inputAxis.Name;
+                else
+                    _comboBox.SelectedItem = null;
+            }
+        }
+
+        /// <inheritdoc />
+        protected override void Deinitialize()
+        {
+            if (LinkedLabel != null)
+                LinkedLabel.SetupContextMenu -= OnSetupContextMenu;
+            if (_comboBox != null)
+                _comboBox.SelectedIndexChanged -= OnSelectedIndexChanged;
+            _comboBox = null;
+        }
+    }
+}

Source/Editor/CustomEditors/Editors/ModelInstanceEntryEditor.cs

@@ -1,6 +1,8 @@
 // Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using FlaxEditor.CustomEditors.Elements;
+using FlaxEditor.CustomEditors.GUI;
+using FlaxEditor.Scripting;
 using FlaxEngine;
 
 namespace FlaxEditor.CustomEditors.Editors
@@ -13,6 +15,11 @@ namespace FlaxEditor.CustomEditors.Editors
     {
         private GroupElement _group;
         private bool _updateName;
+        private int _entryIndex;
+        private bool _isRefreshing;
+        private MaterialBase _material;
+        private ModelInstanceActor _modelInstance;
+        private AssetRefEditor _materialEditor;
 
         /// <inheritdoc />
         public override void Initialize(LayoutElementsContainer layout)
@@ -21,47 +28,124 @@ namespace FlaxEditor.CustomEditors.Editors
             var group = layout.Group("Entry");
             _group = group;
 
+            if (ParentEditor == null)
+                return;
+            var entry = (ModelInstanceEntry)Values[0];
+            var entryIndex = ParentEditor.ChildrenEditors.IndexOf(this);
+            var materialLabel = new PropertyNameLabel("Material");
+            materialLabel.TooltipText = "The mesh surface material used for the rendering.";
+            if (ParentEditor.ParentEditor?.Values[0] is ModelInstanceActor modelInstance)
+            {
+                _entryIndex = entryIndex;
+                _modelInstance = modelInstance;
+                var slots = modelInstance.MaterialSlots;
+                if (slots == null || entryIndex >= slots.Length)
+                    return;
+                if (entry.Material == slots[entryIndex].Material)
+                {
+                    // Ensure that entry with default material set is set back to null
+                    modelInstance.SetMaterial(entryIndex, null);
+                }
+                _material = modelInstance.GetMaterial(entryIndex);
+                var defaultValue = GPUDevice.Instance.DefaultMaterial;
+                if (slots[entryIndex].Material)
+                {
+                    // Use default value set on asset (eg. Model Asset)
+                    defaultValue = slots[entryIndex].Material;
+                }
+
+                // Create material picker
+                var materialValue = new CustomValueContainer(new ScriptType(typeof(MaterialBase)), _material, (instance, index) => _material, (instance, index, value) => _material = value as MaterialBase);
+                var materialEditor = (AssetRefEditor)_group.Property(materialLabel, materialValue);
+                materialEditor.Values.SetDefaultValue(defaultValue);
+                materialEditor.RefreshDefaultValue();
+                materialEditor.Picker.SelectedItemChanged += OnSelectedMaterialChanged;
+                _materialEditor = materialEditor;
+            }
+
             base.Initialize(group);
         }
 
+        private void OnSelectedMaterialChanged()
+        {
+            if (_isRefreshing)
+                return;
+            _isRefreshing = true;
+            var slots = _modelInstance.MaterialSlots;
+            var material = _materialEditor.Picker.SelectedAsset as MaterialBase;
+            var defaultMaterial = GPUDevice.Instance.DefaultMaterial;
+            var value = (ModelInstanceEntry)Values[0];
+            var prevMaterial = value.Material;
+            if (!material)
+            {
+                // Fallback to default material
+                _materialEditor.Picker.SelectedAsset = defaultMaterial;
+                value.Material = defaultMaterial;
+            }
+            else if (material == slots[_entryIndex].Material)
+            {
+                // Asset default material
+                value.Material = null;
+            }
+            else if (material == defaultMaterial && !slots[_entryIndex].Material)
+            {
+                // Default material while asset has no set as well
+                value.Material = null;
+            }
+            else
+            {
+                // Custom material
+                value.Material = material;
+            }
+            if (prevMaterial != value.Material)
+                SetValue(value);
+            _isRefreshing = false;
+        }
+
+        /// <inheritdoc />
+        protected override void SpawnProperty(LayoutElementsContainer itemLayout, ValueContainer itemValues, ItemInfo item)
+        {
+            // Skip material member as it is overridden
+            if (item.Info.Name == "Material" && _materialEditor != null)
+                return;
+            base.SpawnProperty(itemLayout, itemValues, item);
+        }
+
         /// <inheritdoc />
         public override void Refresh()
         {
+            // Update panel title to match material slot name
             if (_updateName &&
                 _group != null &&
                 ParentEditor?.ParentEditor != null &&
                 ParentEditor.ParentEditor.Values.Count > 0)
             {
                 var entryIndex = ParentEditor.ChildrenEditors.IndexOf(this);
-                if (ParentEditor.ParentEditor.Values[0] is StaticModel staticModel)
+                if (ParentEditor.ParentEditor.Values[0] is ModelInstanceActor modelInstance)
                 {
-                    var model = staticModel.Model;
-                    if (model && model.IsLoaded)
+                    var slots = modelInstance.MaterialSlots;
+                    if (slots != null && slots.Length > entryIndex)
                     {
-                        var slots = model.MaterialSlots;
-                        if (slots != null && slots.Length > entryIndex)
-                        {
-                            _group.Panel.HeaderText = "Entry " + slots[entryIndex].Name;
-                            _updateName = false;
-                        }
-                    }
-                }
-                else if (ParentEditor.ParentEditor.Values[0] is AnimatedModel animatedModel)
-                {
-                    var model = animatedModel.SkinnedModel;
-                    if (model && model.IsLoaded)
-                    {
-                        var slots = model.MaterialSlots;
-                        if (slots != null && slots.Length > entryIndex)
-                        {
-                            _group.Panel.HeaderText = "Entry " + slots[entryIndex].Name;
-                            _updateName = false;
-                        }
+                        _updateName = false;
+                        _group.Panel.HeaderText = "Entry " + slots[entryIndex].Name;
                     }
                 }
             }
 
+            // Refresh currently selected material
+            _material = _modelInstance.GetMaterial(_entryIndex);
+
             base.Refresh();
         }
+
+        /// <inheritdoc />
+        protected override void Deinitialize()
+        {
+            _material = null;
+            _modelInstance = null;
+            _materialEditor = null;
+
+            base.Deinitialize();
+        }
     }
 }

Source/Editor/CustomEditors/Editors/ObjectSwitcherEditor.cs

@@ -125,7 +125,7 @@ namespace FlaxEditor.CustomEditors.Editors
             }
 
             // Value
-            var values = new CustomValueContainer(type, (instance, index) => instance, (instance, index, value) => { });
+            var values = new CustomValueContainer(type, (instance, index) => instance);
             values.AddRange(Values);
             var editor = CustomEditorsUtil.CreateEditor(type);
             var style = editor.Style;
@@ -158,7 +158,8 @@ namespace FlaxEditor.CustomEditors.Editors
             if (comboBox.SelectedIndex != -1)
             {
                 var option = _options[comboBox.SelectedIndex];
-                value = option.Creator(option.Type);
+                if (option.Type != null)
+                    value = option.Creator(option.Type);
             }
             SetValue(value);
             RebuildLayoutOnRefresh();

Source/Editor/CustomEditors/Editors/TagEditor.cs

@@ -593,9 +593,9 @@ namespace FlaxEditor.CustomEditors.Editors
             {
                 if (tree.IsLayoutLocked)
                     return;
-                root.LockChildrenRecursive();
+                tree.LockChildrenRecursive();
                 Utilities.Utils.UpdateSearchPopupFilter(root, searchBox.Text);
-                root.UnlockChildrenRecursive();
+                tree.UnlockChildrenRecursive();
                 menu.PerformLayout();
             };
 
@@ -623,13 +623,18 @@ namespace FlaxEditor.CustomEditors.Editors
         {
             _label = layout.ClickableLabel(GetText(out _)).CustomControl;
             _label.RightClick += ShowPicker;
+            var buttonText = "...";
             var button = new Button
             {
                 Size = new Float2(16.0f),
-                Text = "...",
+                Text = buttonText,
                 TooltipText = "Edit...",
                 Parent = _label,
             };
+            var textSize = FlaxEngine.GUI.Style.Current.FontMedium.MeasureText(buttonText);
+            if (textSize.Y > button.Width)
+                button.Width = textSize.Y + 2;
+
             button.SetAnchorPreset(AnchorPresets.MiddleRight, false, true);
             button.Clicked += ShowPicker;
         }
@@ -674,9 +679,9 @@ namespace FlaxEditor.CustomEditors.Editors
             }
             set
             {
-                if (Values[0] is Tag[])
+                if (Values[0] is Tag[] || Values.Type.Type == typeof(Tag[]))
                     SetValue(value);
-                if (Values[0] is List<Tag>)
+                else if (Values[0] is List<Tag> || Values.Type.Type == typeof(List<Tag>))
                     SetValue(new List<Tag>(value));
             }
         }

Source/Editor/CustomEditors/Editors/TypeEditor.cs

@@ -464,6 +464,11 @@ namespace FlaxEditor.CustomEditors.Editors
     /// </summary>
     public class TypeNameEditor : TypeEditorBase
     {
+        /// <summary>
+        /// Prevents spamming log if Value contains missing type to skip research in subsequential Refresh ticks.
+        /// </summary>
+        private string _lastTypeNameError;
+
         /// <inheritdoc />
         public override void Initialize(LayoutElementsContainer layout)
         {
@@ -484,8 +489,19 @@ namespace FlaxEditor.CustomEditors.Editors
         {
             base.Refresh();
 
-            if (!HasDifferentValues && Values[0] is string asTypename)
-                _element.CustomControl.Value = TypeUtils.GetType(asTypename);
+            if (!HasDifferentValues && Values[0] is string asTypename &&
+                !string.Equals(asTypename, _lastTypeNameError, StringComparison.Ordinal))
+            {
+                try
+                {
+                    _element.CustomControl.Value = TypeUtils.GetType(asTypename);
+                }
+                finally
+                {
+                    if (_element.CustomControl.Value == null && asTypename.Length != 0)
+                        _lastTypeNameError = asTypename;
+                }
+            }
         }
     }
 }

Source/Editor/CustomEditors/Elements/DoubleValueElement.cs

@@ -22,7 +22,7 @@ namespace FlaxEditor.CustomEditors.Elements
         /// <summary>
         /// [Deprecated on 26.05.2022, expires on 26.05.2024]
         /// </summary>
-        [System.Obsolete("Deprecated in 1.4")]
+        [System.Obsolete("Deprecated in 1.4, use ValueBox instead")]
         public DoubleValueBox DoubleValue => ValueBox;
 
         /// <summary>

Source/Editor/CustomEditors/Elements/FloatValueElement.cs

@@ -22,7 +22,7 @@ namespace FlaxEditor.CustomEditors.Elements
         /// <summary>
         /// [Deprecated on 26.05.2022, expires on 26.05.2024]
         /// </summary>
-        [System.Obsolete("Deprecated in 1.4, ValueBox instead")]
+        [System.Obsolete("Deprecated in 1.4, use ValueBox instead")]
         public FloatValueBox FloatValue => ValueBox;
 
         /// <summary>

Source/Editor/CustomEditors/GUI/PropertiesList.cs

@@ -175,7 +175,7 @@ namespace FlaxEditor.CustomEditors.GUI
         {
             // Clear flag
             _mouseOverSplitter = false;
-            
+
             if (_cursorChanged)
             {
                 Cursor = CursorType.Default;

Source/Editor/CustomEditors/Values/CustomValueContainer.cs

@@ -38,15 +38,12 @@ namespace FlaxEditor.CustomEditors
         /// </summary>
         /// <param name="valueType">Type of the value.</param>
         /// <param name="getter">The value getter.</param>
-        /// <param name="setter">The value setter.</param>
+        /// <param name="setter">The value setter (can be null if value is read-only).</param>
         /// <param name="attributes">The custom type attributes used to override the value editor logic or appearance (eg. instance of <see cref="LimitAttribute"/>).</param>
-        public CustomValueContainer(ScriptType valueType, GetDelegate getter, SetDelegate setter, object[] attributes = null)
+        public CustomValueContainer(ScriptType valueType, GetDelegate getter, SetDelegate setter = null, object[] attributes = null)
         : base(ScriptMemberInfo.Null, valueType)
         {
-            if (getter == null || setter == null)
-                throw new ArgumentNullException();
-
-            _getter = getter;
+            _getter = getter ?? throw new ArgumentNullException();
             _setter = setter;
             _attributes = attributes;
         }
@@ -57,9 +54,9 @@ namespace FlaxEditor.CustomEditors
         /// <param name="valueType">Type of the value.</param>
         /// <param name="initialValue">The initial value.</param>
         /// <param name="getter">The value getter.</param>
-        /// <param name="setter">The value setter.</param>
+        /// <param name="setter">The value setter (can be null if value is read-only).</param>
         /// <param name="attributes">The custom type attributes used to override the value editor logic or appearance (eg. instance of <see cref="LimitAttribute"/>).</param>
-        public CustomValueContainer(ScriptType valueType, object initialValue, GetDelegate getter, SetDelegate setter, object[] attributes = null)
+        public CustomValueContainer(ScriptType valueType, object initialValue, GetDelegate getter, SetDelegate setter = null, object[] attributes = null)
         : this(valueType, getter, setter, attributes)
         {
             Add(initialValue);
@@ -89,6 +86,8 @@ namespace FlaxEditor.CustomEditors
         {
             if (instanceValues == null || instanceValues.Count != Count)
                 throw new ArgumentException();
+            if (_setter == null)
+                return;
 
             for (int i = 0; i < Count; i++)
             {
@@ -105,6 +104,8 @@ namespace FlaxEditor.CustomEditors
                 throw new ArgumentException();
             if (values == null || values.Count != Count)
                 throw new ArgumentException();
+            if (_setter == null)
+                return;
 
             for (int i = 0; i < Count; i++)
             {
@@ -120,6 +121,8 @@ namespace FlaxEditor.CustomEditors
         {
             if (instanceValues == null || instanceValues.Count != Count)
                 throw new ArgumentException();
+            if (_setter == null)
+                return;
 
             for (int i = 0; i < Count; i++)
             {

Source/Editor/Editor.Build.cs

@@ -41,6 +41,11 @@ public class Editor : EditorModule
         options.ScriptingAPI.SystemReferences.Add("System.Xml.ReaderWriter");
         options.ScriptingAPI.SystemReferences.Add("System.Text.RegularExpressions");
         options.ScriptingAPI.SystemReferences.Add("System.ComponentModel.TypeConverter");
+        options.ScriptingAPI.SystemReferences.Add("System.IO.Compression.ZipFile");
+
+        // Enable optimizations for Editor, disable this for debugging the editor
+        if (options.Configuration == TargetConfiguration.Development)
+            options.ScriptingAPI.Optimization = true;
 
         options.PublicDependencies.Add("Engine");
         options.PrivateDependencies.Add("pugixml");
@@ -102,5 +107,7 @@ public class Editor : EditorModule
         files.Add(Path.Combine(FolderPath, "Cooker/GameCooker.h"));
         files.Add(Path.Combine(FolderPath, "Cooker/PlatformTools.h"));
         files.Add(Path.Combine(FolderPath, "Cooker/Steps/CookAssetsStep.h"));
+        files.Add(Path.Combine(FolderPath, "Utilities/ScreenUtilities.h"));
+        files.Add(Path.Combine(FolderPath, "Utilities/ViewportIconsRenderer.h"));
     }
 }

Source/Editor/Editor.cs

@@ -3,16 +3,17 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.Marshalling;
 using FlaxEditor.Content;
-using FlaxEditor.Content.Import;
 using FlaxEditor.Content.Settings;
 using FlaxEditor.Content.Thumbnails;
 using FlaxEditor.Modules;
 using FlaxEditor.Modules.SourceCodeEditing;
 using FlaxEditor.Options;
+using FlaxEditor.SceneGraph.Actors;
 using FlaxEditor.States;
 using FlaxEditor.Windows;
 using FlaxEditor.Windows.Assets;
@@ -152,12 +153,12 @@ namespace FlaxEditor
         public ContentFindingModule ContentFinding;
 
         /// <summary>
-        /// The scripts editing
+        /// The scripts editing.
         /// </summary>
         public CodeEditingModule CodeEditing;
 
         /// <summary>
-        /// The scripts documentation
+        /// The scripts documentation.
         /// </summary>
         public CodeDocsModule CodeDocs;
 
@@ -177,7 +178,7 @@ namespace FlaxEditor
         public ProjectCacheModule ProjectCache;
 
         /// <summary>
-        /// The undo/redo
+        /// The undo/redo.
         /// </summary>
         public EditorUndo Undo;
 
@@ -363,7 +364,7 @@ namespace FlaxEditor
             {
                 foreach (var preview in activePreviews)
                 {
-                    if (preview == loadingPreview || 
+                    if (preview == loadingPreview ||
                         (preview.Instance != null && (preview.Instance == control || preview.Instance.HasActorInHierarchy(control))))
                     {
                         // Link it to the prefab preview to see it in the editor
@@ -724,8 +725,8 @@ namespace FlaxEditor
 
             // Cleanup
             Undo.Dispose();
-            Surface.VisualScriptSurface.NodesCache.Clear();
-            Surface.AnimGraphSurface.NodesCache.Clear();
+            foreach (var cache in Surface.VisjectSurface.NodesCache.Caches.ToArray())
+                cache.Clear();
             Instance = null;
 
             // Invoke new instance if need to open a project
@@ -795,7 +796,6 @@ namespace FlaxEditor
         {
             if (projectFilePath == null || !File.Exists(projectFilePath))
             {
-                // Error
                 MessageBox.Show("Missing project");
                 return;
             }
@@ -931,21 +931,11 @@ namespace FlaxEditor
             /// The <see cref="FlaxEngine.Animation"/>.
             /// </summary>
             Animation = 11,
-        }
 
-        /// <summary>
-        /// Imports the audio asset file to the target location.
-        /// </summary>
-        /// <param name="inputPath">The source file path.</param>
-        /// <param name="outputPath">The result asset file path.</param>
-        /// <param name="settings">The settings.</param>
-        /// <returns>True if importing failed, otherwise false.</returns>
-        public static bool Import(string inputPath, string outputPath, AudioImportSettings settings)
-        {
-            if (settings == null)
-                throw new ArgumentNullException();
-            settings.ToInternal(out var internalOptions);
-            return Internal_ImportAudio(inputPath, outputPath, ref internalOptions);
+            /// <summary>
+            /// The <see cref="FlaxEngine.BehaviorTree"/>.
+            /// </summary>
+            BehaviorTree = 12,
         }
 
         /// <summary>
@@ -1274,6 +1264,69 @@ namespace FlaxEditor
             Scene.MarkSceneEdited(scenes);
         }
 
+        /// <summary>
+        /// Bakes all environmental probes in the scene.
+        /// </summary>
+        public void BakeAllEnvProbes()
+        {
+            Scene.ExecuteOnGraph(node =>
+            {
+                if (node is EnvironmentProbeNode envProbeNode && envProbeNode.IsActive)
+                {
+                    ((EnvironmentProbe)envProbeNode.Actor).Bake();
+                    node.ParentScene.IsEdited = true;
+                }
+                else if (node is SkyLightNode skyLightNode && skyLightNode.IsActive && skyLightNode.Actor is SkyLight skyLight && skyLight.Mode == SkyLight.Modes.CaptureScene)
+                {
+                    skyLight.Bake();
+                    node.ParentScene.IsEdited = true;
+                }
+
+                return node.IsActive;
+            });
+        }
+
+        /// <summary>
+        /// Builds CSG for all open scenes.
+        /// </summary>
+        public void BuildCSG()
+        {
+            var scenes = Level.Scenes;
+            scenes.ToList().ForEach(x => x.BuildCSG(0));
+            Scene.MarkSceneEdited(scenes);
+        }
+
+        /// <summary>
+        /// Builds Nav mesh for all open scenes.
+        /// </summary>
+        public void BuildNavMesh()
+        {
+            var scenes = Level.Scenes;
+            scenes.ToList().ForEach(x => Navigation.BuildNavMesh(x, 0));
+            Scene.MarkSceneEdited(scenes);
+        }
+
+        /// <summary>
+        /// Builds SDF for all static models in the scene.
+        /// </summary>
+        public void BuildAllMeshesSDF()
+        {
+            // TODO: async maybe with progress reporting?
+            Scene.ExecuteOnGraph(node =>
+            {
+                if (node is StaticModelNode staticModelNode && staticModelNode.Actor is StaticModel staticModel)
+                {
+                    if (staticModel.DrawModes.HasFlag(DrawPass.GlobalSDF) && staticModel.Model != null && !staticModel.Model.IsVirtual && staticModel.Model.SDF.Texture == null)
+                    {
+                        Log("Generating SDF for " + staticModel.Model);
+                        if (!staticModel.Model.GenerateSDF())
+                            staticModel.Model.Save();
+                    }
+                }
+                return true;
+            });
+        }
+
         #endregion
 
         #region Internal Calls
@@ -1579,7 +1632,7 @@ namespace FlaxEditor
         private static void RequestStartPlayOnEditMode()
         {
             if (Instance.StateMachine.IsEditMode)
-                Instance.Simulation.RequestStartPlay();
+                Instance.Simulation.RequestStartPlayScenes();
             if (Instance.StateMachine.IsPlayMode)
                 Instance.StateMachine.StateChanged -= RequestStartPlayOnEditMode;
         }
@@ -1602,10 +1655,6 @@ namespace FlaxEditor
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_CloneAssetFile(string dstPath, string srcPath, ref Guid dstId);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_ImportAudio", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
-        [return: MarshalAs(UnmanagedType.U1)]
-        internal static partial bool Internal_ImportAudio(string inputPath, string outputPath, ref AudioImportSettings.InternalOptions options);
-
         [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetAudioClipMetadata", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_GetAudioClipMetadata(IntPtr obj, out int originalSize, out int importedSize);
 

Source/Editor/EditorAssets.cs

@@ -36,7 +36,9 @@ namespace FlaxEditor
 
             public static void OnEditorOptionsChanged(Options.EditorOptions options)
             {
-                var param = _highlightMaterial?.GetParameter("Color");
+                if (!_highlightMaterial)
+                    return;
+                var param = _highlightMaterial.GetParameter("Color");
                 if (param != null)
                     param.Value = options.Visual.HighlightColor;
             }

Source/Editor/EditorIcons.cs

@@ -96,6 +96,11 @@ namespace FlaxEditor
         public SpriteHandle Link64;
         public SpriteHandle Build64;
         public SpriteHandle Add64;
+        public SpriteHandle ShipIt64;
+        public SpriteHandle SplineFree64;
+        public SpriteHandle SplineLinear64;
+        public SpriteHandle SplineAligned64;
+        public SpriteHandle SplineSmoothIn64;
 
         // 96px
         public SpriteHandle Toolbox96;

Source/Editor/GUI/AssetPicker.cs

@@ -475,22 +475,31 @@ namespace FlaxEditor.GUI
                     if (_type != ScriptType.Null)
                     {
                         // Show asset picker popup
-                        AssetSearchPopup.Show(this, Button1Rect.BottomLeft, IsValid, item =>
+                        var popup = AssetSearchPopup.Show(this, Button1Rect.BottomLeft, IsValid, item =>
                         {
                             SelectedItem = item;
                             RootWindow.Focus();
                             Focus();
                         });
+                        if (_selected != null)
+                        {
+                            var selectedAssetName = Path.GetFileNameWithoutExtension(_selected.Path);
+                            popup.ScrollToAndHighlightItemByName(selectedAssetName);
+                        }
                     }
                     else
                     {
                         // Show content item picker popup
-                        ContentSearchPopup.Show(this, Button1Rect.BottomLeft, IsValid, item =>
+                        var popup = ContentSearchPopup.Show(this, Button1Rect.BottomLeft, IsValid, item =>
                         {
                             SelectedItem = item;
                             RootWindow.Focus();
                             Focus();
                         });
+                        if (_selectedItem != null)
+                        {
+                            popup.ScrollToAndHighlightItemByName(_selectedItem.ShortName);
+                        }
                     }
                 }
                 else if (_selected != null || _selectedItem != null)

Source/Editor/GUI/ComboBox.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using FlaxEditor.GUI.ContextMenu;
 using FlaxEngine;
 using FlaxEngine.GUI;
 
@@ -396,14 +397,24 @@ namespace FlaxEditor.GUI
                 _popupMenu.ButtonClicked += btn =>
                 {
                     OnItemClicked((int)btn.Tag);
-                    _popupMenu?.Hide();
+                    if (SupportMultiSelect)
+                    {
+                        // Don't hide in multi-select, so user can edit multiple elements instead of just one
+                        UpdateButtons();
+                        _popupMenu?.PerformLayout();
+                    }
+                    else
+                    {
+                        _popupMenu?.Hide();
+                    }
                 };
             }
 
             // Check if menu hs been already shown
             if (_popupMenu.Visible)
             {
-                _popupMenu.Hide();
+                if (!SupportMultiSelect)
+                    _popupMenu.Hide();
                 return;
             }
 
@@ -412,27 +423,7 @@ namespace FlaxEditor.GUI
             // Check if has any items
             if (_items.Count > 0)
             {
-                // Setup items list
-                var itemControls = _popupMenu.Items.ToArray();
-                foreach (var e in itemControls)
-                    e.Dispose();
-                if (Sorted)
-                    _items.Sort();
-                var style = Style.Current;
-                for (int i = 0; i < _items.Count; i++)
-                {
-                    var btn = _popupMenu.AddButton(_items[i]);
-                    if (_selectedIndices.Contains(i))
-                    {
-                        btn.Icon = style.CheckBoxTick;
-                    }
-                    if (_tooltips != null && _tooltips.Length > i)
-                    {
-                        btn.TooltipText = _tooltips[i];
-                    }
-
-                    btn.Tag = i;
-                }
+                UpdateButtons();
 
                 // Show dropdown list
                 _popupMenu.MinimumWidth = Width;
@@ -440,6 +431,54 @@ namespace FlaxEditor.GUI
             }
         }
 
+        /// <summary>
+        /// Updates buttons layout. 
+        /// </summary>
+        private void UpdateButtons()
+        {
+            if (_popupMenu.Items.Count() != _items.Count)
+            {
+                var itemControls = _popupMenu.Items.ToArray();
+                foreach (var e in itemControls)
+                    e.Dispose();
+                if (Sorted)
+                    _items.Sort();
+                for (int i = 0; i < _items.Count; i++)
+                {
+                    var btn = _popupMenu.AddButton(_items[i]);
+                    OnLayoutMenuButton(btn, i, true);
+                    btn.Tag = i;
+                }
+            }
+            else
+            {
+                var itemControls = _popupMenu.Items.ToArray();
+                if (Sorted)
+                    _items.Sort();
+                for (int i = 0; i < _items.Count; i++)
+                {
+                    if (itemControls[i] is ContextMenuButton btn)
+                    {
+                        btn.Text = _items[i];
+                        OnLayoutMenuButton(btn, i, true);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when button is created or updated. Can be used to customize the visuals.
+        /// </summary>
+        /// <param name="button">The button.</param>
+        /// <param name="index">The item index.</param>
+        /// <param name="construct">true if button is created else it is repainting the button</param>
+        protected virtual void OnLayoutMenuButton(ContextMenuButton button, int index, bool construct = false)
+        {
+            button.Checked = _selectedIndices.Contains(index);
+            if (_tooltips != null && _tooltips.Length > index)
+                button.TooltipText = _tooltips[index];
+        }
+
         /// <summary>
         /// Creates the popup menu.
         /// </summary>
@@ -460,6 +499,8 @@ namespace FlaxEditor.GUI
                 _popupMenu = null;
             }
 
+            if (IsDisposing)
+                return;
             _selectedIndices.Clear();
             _selectedIndices = null;
             _items.Clear();
@@ -504,7 +545,7 @@ namespace FlaxEditor.GUI
             Render2D.DrawRectangle(clientRect.MakeExpanded(-2.0f), borderColor);
 
             // Check if has selected item
-            if (_selectedIndices.Count > 0)
+            if (_selectedIndices != null && _selectedIndices.Count > 0)
             {
                 string text = _selectedIndices.Count == 1 ? _items[_selectedIndices[0]] : "Multiple Values";
 

Source/Editor/GUI/ContextMenu/ContextMenu.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using FlaxEditor.Options;
 using FlaxEngine;
 using FlaxEngine.GUI;
 
@@ -269,6 +270,24 @@ namespace FlaxEditor.GUI.ContextMenu
             return item;
         }
 
+        /// <summary>
+        /// Adds the button.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <param name="binding">The input binding.</param>
+        /// <param name="clicked">On button clicked event.</param>
+        /// <returns>Created context menu item control.</returns>
+        public ContextMenuButton AddButton(string text, InputBinding binding, Action clicked)
+        {
+            var item = new ContextMenuButton(this, text, binding.ToString())
+            {
+                Parent = _panel
+            };
+            item.Clicked += clicked;
+            SortButtons();
+            return item;
+        }
+
         /// <summary>
         /// Gets the child menu (with that name).
         /// </summary>

Source/Editor/GUI/ContextMenu/ContextMenuBase.cs

@@ -154,6 +154,7 @@ namespace FlaxEditor.GUI.ContextMenu
             }
 
             // Unlock and perform controls update
+            Location = Float2.Zero;
             UnlockChildrenRecursive();
             PerformLayout();
 
@@ -162,7 +163,6 @@ namespace FlaxEditor.GUI.ContextMenu
             var dpiSize = Size * dpiScale;
             var locationWS = parent.PointToWindow(location);
             var locationSS = parentWin.PointToScreen(locationWS);
-            Location = Float2.Zero;
             var monitorBounds = Platform.GetMonitorBounds(locationSS);
             var rightBottomLocationSS = locationSS + dpiSize;
             bool isUp = false, isLeft = false;

Source/Editor/GUI/ContextMenu/ContextMenuButton.cs

@@ -138,7 +138,7 @@ namespace FlaxEditor.GUI.ContextMenu
 
             // Draw icon
             const float iconSize = 14;
-            var icon = Checked ? Style.Current.CheckBoxTick : Icon;
+            var icon = Checked ? style.CheckBoxTick : Icon;
             if (icon.IsValid)
                 Render2D.DrawSprite(icon, new Rectangle(-iconSize - 1, (Height - iconSize) / 2, iconSize, iconSize), textColor);
         }

Source/Editor/GUI/ContextMenu/ContextMenuChildMenu.cs

@@ -72,7 +72,7 @@ namespace FlaxEditor.GUI.ContextMenu
             // Hide parent CM popups and set itself as child
             parentContextMenu.ShowChild(ContextMenu, PointToParent(ParentContextMenu, new Float2(Width, 0)));
         }
-        
+
         /// <inheritdoc />
         public override bool OnMouseUp(Float2 location, MouseButton button)
         {

Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs

@@ -0,0 +1,95 @@
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using FlaxEngine;
+
+namespace FlaxEditor.GUI.ContextMenu
+{
+    /// <summary>
+    /// Context menu for a single selectable option from range of values (eg. enum).
+    /// </summary>
+    [HideInEditor]
+    class ContextMenuSingleSelectGroup<T>
+    {
+        private struct SingleSelectGroupItem
+        {
+            public string Text;
+            public string Tooltip;
+            public T Value;
+            public Action Selected;
+            public List<ContextMenuButton> Buttons;
+        }
+
+        private List<ContextMenu> _menus = new List<ContextMenu>();
+        private List<SingleSelectGroupItem> _items = new List<SingleSelectGroupItem>();
+        private bool _hasSelected = false;
+        private SingleSelectGroupItem _selectedItem;
+
+        public T Selected
+        {
+            get => _selectedItem.Value;
+            set
+            {
+                var index = _items.FindIndex(x => x.Value.Equals(value));
+                if (index != -1 && (!_hasSelected || !_selectedItem.Value.Equals(value)))
+                {
+                    SetSelected(_items[index]);
+                }
+            }
+        }
+
+        public Action<T> SelectedChanged;
+
+        public ContextMenuSingleSelectGroup<T> AddItem(string text, T value, Action selected = null, string tooltip = null)
+        {
+            var item = new SingleSelectGroupItem
+            {
+                Text = text,
+                Tooltip = tooltip,
+                Value = value,
+                Selected = selected,
+                Buttons = new List<ContextMenuButton>()
+            };
+            _items.Add(item);
+            foreach (var contextMenu in _menus)
+                AddItemToContextMenu(contextMenu, item);
+            return this;
+        }
+
+        public ContextMenuSingleSelectGroup<T> AddItemsToContextMenu(ContextMenu contextMenu)
+        {
+            _menus.Add(contextMenu);
+            for (int i = 0; i < _items.Count; i++)
+                AddItemToContextMenu(contextMenu, _items[i]);
+            return this;
+        }
+
+        private void AddItemToContextMenu(ContextMenu contextMenu, SingleSelectGroupItem item)
+        {
+            var btn = contextMenu.AddButton(item.Text, () => { SetSelected(item); });
+            if (item.Tooltip != null)
+                btn.TooltipText = item.Tooltip;
+            item.Buttons.Add(btn);
+            if (_hasSelected && item.Equals(_selectedItem))
+                btn.Checked = true;
+        }
+
+        private void SetSelected(SingleSelectGroupItem item)
+        {
+            foreach (var e in _items)
+            {
+                foreach (var btn in e.Buttons)
+                    btn.Checked = false;
+            }
+            _selectedItem = item;
+            _hasSelected = true;
+
+            SelectedChanged?.Invoke(item.Value);
+            item.Selected?.Invoke();
+
+            foreach (var btn in item.Buttons)
+                btn.Checked = true;
+        }
+    }
+}

Source/Editor/GUI/Dialogs/ColorPickerDialog.cs

@@ -319,7 +319,9 @@ namespace FlaxEditor.GUI.Dialogs
         protected override void OnShow()
         {
             // Auto cancel on lost focus
+#if !PLATFORM_LINUX
             ((WindowRootControl)Root).Window.LostFocus += OnCancel;
+#endif
 
             base.OnShow();
         }

Source/Editor/GUI/Dialogs/Dialog.cs

@@ -290,7 +290,11 @@ namespace FlaxEditor.GUI.Dialogs
                 OnCancel();
                 return true;
             case KeyboardKeys.Tab:
-                Root?.Navigate(NavDirection.Next);
+                if (Root != null)
+                {
+                    bool shiftDown = Root.GetKey(KeyboardKeys.Shift);
+                    Root.Navigate(shiftDown ? NavDirection.Previous : NavDirection.Next);
+                }
                 return true;
             }
             return false;

Source/Editor/GUI/Docking/DockHintWindow.cs

@@ -44,11 +44,11 @@ namespace FlaxEditor.GUI.Docking
                 var mousePos = window.MousePosition;
                 var previousSize = window.Size;
                 window.Restore();
-                window.Position = FlaxEngine.Input.MouseScreenPosition - mousePos * window.Size / previousSize;
+                window.Position = Platform.MousePosition - mousePos * window.Size / previousSize;
             }
 
             // Calculate dragging offset and move window to the destination position
-            var mouseScreenPosition = FlaxEngine.Input.MouseScreenPosition;
+            var mouseScreenPosition = Platform.MousePosition;
 
             // If the _toMove window was not focused when initializing this window, the result vector only contains zeros
             // and to prevent a failure, we need to perform an update for the drag offset at later time which will be done in the OnMouseMove event handler.
@@ -83,6 +83,7 @@ namespace FlaxEditor.GUI.Docking
             // Enable hit window presentation
             Proxy.Window.RenderingEnabled = true;
             Proxy.Window.Show();
+            Proxy.Window.Focus();
         }
 
         /// <summary>
@@ -113,7 +114,7 @@ namespace FlaxEditor.GUI.Docking
                 var window = _toMove.Window?.Window;
                 if (window == null)
                     return;
-                var mouse = FlaxEngine.Input.MouseScreenPosition;
+                var mouse = Platform.MousePosition;
 
                 // Move base window
                 window.Position = mouse - _dragOffset;
@@ -193,7 +194,7 @@ namespace FlaxEditor.GUI.Docking
 
             // Move window to the mouse position (with some offset for caption bar)
             var window = (WindowRootControl)toMove.Root;
-            var mouse = FlaxEngine.Input.MouseScreenPosition;
+            var mouse = Platform.MousePosition;
             window.Window.Position = mouse - new Float2(8, 8);
 
             // Get floating panel
@@ -244,7 +245,7 @@ namespace FlaxEditor.GUI.Docking
         private void UpdateRects()
         {
             // Cache mouse position
-            _mouse = FlaxEngine.Input.MouseScreenPosition;
+            _mouse = Platform.MousePosition;
 
             // Check intersection with any dock panel
             var uiMouse = _mouse;
@@ -270,15 +271,16 @@ namespace FlaxEditor.GUI.Docking
                 // Cache dock rectangles
                 var size = _rectDock.Size;
                 var offset = _rectDock.Location;
-                float BorderMargin = 4.0f;
-                float ProxyHintWindowsSize2 = Proxy.HintWindowsSize * 0.5f;
-                float centerX = size.X * 0.5f;
-                float centerY = size.Y * 0.5f;
-                _rUpper = new Rectangle(centerX - ProxyHintWindowsSize2, BorderMargin, Proxy.HintWindowsSize, Proxy.HintWindowsSize) + offset;
-                _rBottom = new Rectangle(centerX - ProxyHintWindowsSize2, size.Y - Proxy.HintWindowsSize - BorderMargin, Proxy.HintWindowsSize, Proxy.HintWindowsSize) + offset;
-                _rLeft = new Rectangle(BorderMargin, centerY - ProxyHintWindowsSize2, Proxy.HintWindowsSize, Proxy.HintWindowsSize) + offset;
-                _rRight = new Rectangle(size.X - Proxy.HintWindowsSize - BorderMargin, centerY - ProxyHintWindowsSize2, Proxy.HintWindowsSize, Proxy.HintWindowsSize) + offset;
-                _rCenter = new Rectangle(centerX - ProxyHintWindowsSize2, centerY - ProxyHintWindowsSize2, Proxy.HintWindowsSize, Proxy.HintWindowsSize) + offset;
+                var borderMargin = 4.0f;
+                var hintWindowsSize = Proxy.HintWindowsSize * Platform.DpiScale;
+                var hintWindowsSize2 = hintWindowsSize * 0.5f;
+                var centerX = size.X * 0.5f;
+                var centerY = size.Y * 0.5f;
+                _rUpper = new Rectangle(centerX - hintWindowsSize2, borderMargin, hintWindowsSize, hintWindowsSize) + offset;
+                _rBottom = new Rectangle(centerX - hintWindowsSize2, size.Y - hintWindowsSize - borderMargin, hintWindowsSize, hintWindowsSize) + offset;
+                _rLeft = new Rectangle(borderMargin, centerY - hintWindowsSize2, hintWindowsSize, hintWindowsSize) + offset;
+                _rRight = new Rectangle(size.X - hintWindowsSize - borderMargin, centerY - hintWindowsSize2, hintWindowsSize, hintWindowsSize) + offset;
+                _rCenter = new Rectangle(centerX - hintWindowsSize2, centerY - hintWindowsSize2, hintWindowsSize, hintWindowsSize) + offset;
 
                 // Hit test
                 DockState toSet = DockState.Float;
@@ -428,7 +430,6 @@ namespace FlaxEditor.GUI.Docking
             {
                 if (Window == null)
                 {
-                    // Create proxy window
                     var settings = CreateWindowSettings.Default;
                     settings.Title = "DockHint.Window";
                     settings.Size = initSize;
@@ -440,12 +441,10 @@ namespace FlaxEditor.GUI.Docking
                     settings.IsRegularWindow = false;
                     settings.SupportsTransparency = true;
                     settings.ShowInTaskbar = false;
-                    settings.ShowAfterFirstPaint = true;
+                    settings.ShowAfterFirstPaint = false;
                     settings.IsTopmost = true;
 
                     Window = Platform.CreateWindow(ref settings);
-
-                    // Set opacity and background color
                     Window.Opacity = 0.6f;
                     Window.GUI.BackgroundColor = Style.Current.DragWindow;
                 }
@@ -465,7 +464,7 @@ namespace FlaxEditor.GUI.Docking
 
                 var settings = CreateWindowSettings.Default;
                 settings.Title = name;
-                settings.Size = new Float2(HintWindowsSize);
+                settings.Size = new Float2(HintWindowsSize * Platform.DpiScale);
                 settings.AllowInput = false;
                 settings.AllowMaximize = false;
                 settings.AllowMinimize = false;
@@ -476,9 +475,9 @@ namespace FlaxEditor.GUI.Docking
                 settings.ShowInTaskbar = false;
                 settings.ActivateWhenFirstShown = false;
                 settings.IsTopmost = true;
+                settings.ShowAfterFirstPaint = false;
 
                 win = Platform.CreateWindow(ref settings);
-
                 win.Opacity = 0.6f;
                 win.GUI.BackgroundColor = Style.Current.DragWindow;
             }

Source/Editor/GUI/Docking/DockPanelProxy.cs

@@ -253,6 +253,12 @@ namespace FlaxEditor.GUI.Docking
                         tabColor = style.BackgroundHighlighted;
                         Render2D.FillRectangle(tabRect, tabColor);
                     }
+                    else
+                    {
+                        tabColor = style.BackgroundHighlighted;
+                        Render2D.DrawLine(tabRect.BottomLeft - new Float2(0 , 1), tabRect.UpperLeft, tabColor);
+                        Render2D.DrawLine(tabRect.BottomRight - new Float2(0 , 1), tabRect.UpperRight, tabColor);
+                    }
 
                     if (tab.Icon.IsValid)
                     {

Source/Editor/GUI/Drag/DragScripts.cs

@@ -58,7 +58,6 @@ namespace FlaxEditor.GUI.Drag
         {
             if (item == null)
                 throw new ArgumentNullException();
-
             return new DragDataText(DragPrefix + item.ID.ToString("N"));
         }
 
@@ -71,11 +70,9 @@ namespace FlaxEditor.GUI.Drag
         {
             if (items == null)
                 throw new ArgumentNullException();
-
             string text = DragPrefix;
             foreach (var item in items)
                 text += item.ID.ToString("N") + '\n';
-
             return new DragDataText(text);
         }
 
@@ -83,9 +80,7 @@ namespace FlaxEditor.GUI.Drag
         /// Tries to parse the drag data.
         /// </summary>
         /// <param name="data">The data.</param>
-        /// <returns>
-        /// Gathered objects or empty IEnumerable if cannot get any valid.
-        /// </returns>
+        /// <returns>Gathered objects or empty IEnumerable if cannot get any valid.</returns>
         public override IEnumerable<Script> FromDragData(DragData data)
         {
             if (data is DragDataText dataText)
@@ -97,12 +92,9 @@ namespace FlaxEditor.GUI.Drag
                     var results = new List<Script>(ids.Length);
                     for (int i = 0; i < ids.Length; i++)
                     {
-                        // Find element
                         if (Guid.TryParse(ids[i], out Guid id))
                         {
                             var obj = FlaxEngine.Object.Find<Script>(ref id);
-
-                            // Check it
                             if (obj != null)
                                 results.Add(obj);
                         }
@@ -111,11 +103,11 @@ namespace FlaxEditor.GUI.Drag
                     return results.ToArray();
                 }
             }
-            return new Script[0];
+            return Utils.GetEmptyArray<Script>();
         }
 
         /// <summary>
-        /// Tries to parse the drag data to validate if it has valid scripts darg.
+        /// Tries to parse the drag data to validate if it has valid scripts drag.
         /// </summary>
         /// <param name="data">The data.</param>
         /// <returns>True if drag data has valid scripts, otherwise false.</returns>
@@ -138,7 +130,6 @@ namespace FlaxEditor.GUI.Drag
                     }
                 }
             }
-
             return false;
         }
     }

Source/Editor/GUI/Input/SearchBox.cs

@@ -20,7 +20,7 @@ namespace FlaxEditor.GUI.Input
         : this(false, 0, 0)
         {
         }
-        
+
         /// <summary>
         /// Init search box
         /// </summary>
@@ -28,7 +28,7 @@ namespace FlaxEditor.GUI.Input
         : base(isMultiline, x, y, width)
         {
             WatermarkText = "Search...";
-            
+
             ClearSearchButton = new Button
             {
                 Parent = this,

Source/Editor/GUI/Input/ValueBox.cs

@@ -182,6 +182,7 @@ namespace FlaxEditor.GUI.Input
             }
             SlidingEnd?.Invoke();
             Defocus();
+            Parent?.Focus();
         }
 
         /// <inheritdoc />

Source/Editor/GUI/ItemsListContextMenu.cs

@@ -265,6 +265,35 @@ namespace FlaxEditor.GUI
             _searchBox.Focus();
         }
 
+        /// <summary>
+        /// Scrolls the scroll panel to a specific Item
+        /// </summary>
+        /// <param name="item">The item to scroll to.</param>
+        public void ScrollViewTo(Item item)
+        {
+            _scrollPanel.ScrollViewTo(item, true);
+        }
+
+        /// <summary>
+        /// Scrolls to the item and focuses it by name.
+        /// </summary>
+        /// <param name="itemName">The item name.</param>
+        public void ScrollToAndHighlightItemByName(string itemName)
+        {
+            foreach (var child in ItemsPanel.Children)
+            {
+                if (child is not ItemsListContextMenu.Item item)
+                    continue;
+                if (string.Equals(item.Name, itemName, StringComparison.Ordinal))
+                {
+                    // Highlight and scroll to item
+                    item.Focus();
+                    ScrollViewTo(item);
+                    break;
+                }
+            }
+        }
+
         /// <summary>
         /// Sorts the items list (by item name by default).
         /// </summary>

Source/Editor/GUI/MainMenu.cs

@@ -292,7 +292,8 @@ namespace FlaxEditor.GUI
                 return true;
 
 #if PLATFORM_WINDOWS
-            if (_useCustomWindowSystem)
+            var child = GetChildAtRecursive(location);
+            if (_useCustomWindowSystem && child is not Button && child is not MainMenuButton)
             {
                 if (_window.IsMaximized)
                     _window.Restore();
@@ -304,6 +305,17 @@ namespace FlaxEditor.GUI
             return true;
         }
 
+        /// <inheritdoc />
+        public override bool OnKeyDown(KeyboardKeys key)
+        {
+            if (base.OnKeyDown(key))
+                return true;
+
+            // Fallback to the edit window for shortcuts
+            var editor = Editor.Instance;
+            return editor.Windows.EditWin.InputActions.Process(editor, this, key);
+        }
+
         /// <inheritdoc />
         protected override void PerformLayoutAfterChildren()
         {

Source/Editor/GUI/NavigationBar.cs

@@ -50,14 +50,9 @@ namespace FlaxEditor.GUI
         {
             if (toolstrip == null)
                 return;
-
             var lastToolstripButton = toolstrip.LastButton;
             var parentSize = Parent.Size;
-            Bounds = new Rectangle
-            (
-             new Float2(lastToolstripButton.Right + 8.0f, 0),
-             new Float2(parentSize.X - X - 8.0f, toolstrip.Height)
-            );
+            Bounds = new Rectangle(lastToolstripButton.Right + 8.0f, 0, parentSize.X - X - 8.0f, toolstrip.Height);
         }
     }
 }

Source/Editor/GUI/Popups/ScriptSearchPopup.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
-using FlaxEditor.Scripting;
 using FlaxEngine;
 using FlaxEngine.GUI;
 using FlaxEngine.Utilities;

Source/Editor/GUI/Popups/TypeSearchPopup.cs

@@ -101,8 +101,11 @@ namespace FlaxEditor.GUI
                 if (_isValid(type))
                 {
                     var attributes = type.GetAttributes(true);
-                    if (attributes.FirstOrDefault(x => x is HideInEditorAttribute) == null)
+                    if (attributes.FirstOrDefault(x => x is HideInEditorAttribute || x is System.Runtime.CompilerServices.CompilerGeneratedAttribute) == null)
                     {
+                        var mType = type.Type;
+                        if (mType != null && mType.IsValueType && mType.ReflectedType != null && string.Equals(mType.ReflectedType.Name, "<PrivateImplementationDetails>", StringComparison.Ordinal))
+                            continue;
                         AddItem(new TypeItemView(type, attributes));
                     }
                 }

Source/Editor/GUI/Row.cs

@@ -37,6 +37,9 @@ namespace FlaxEditor.GUI
         : base(0, 0, 100, height)
         {
             Depth = -1;
+
+            if (Height < Style.Current.FontMedium.Height)
+                Height = Style.Current.FontMedium.Height + 4;
         }
 
         /// <inheritdoc />
@@ -238,7 +241,7 @@ namespace FlaxEditor.GUI
         {
             DoubleClick?.Invoke();
             RowDoubleClick?.Invoke(this);
-            
+
             return base.OnMouseDoubleClick(location, button);
         }
 

Source/Editor/GUI/Tabs/Tab.cs

@@ -77,5 +77,14 @@ namespace FlaxEditor.GUI.Tabs
         {
             Deselected?.Invoke(this);
         }
+
+        /// <summary>
+        /// Factory method for tabs header control (UI for the tabs strip to represent this tab).
+        /// </summary>
+        /// <returns>The tab header control.</returns>
+        public virtual Tabs.TabHeader CreateHeader()
+        {
+            return new Tabs.TabHeader((Tabs)Parent, this);
+        }
     }
 }

Source/Editor/GUI/Tabs/Tabs.cs

@@ -24,11 +24,6 @@ namespace FlaxEditor.GUI.Tabs
             /// </summary>
             protected Tabs Tabs;
 
-            /// <summary>
-            /// The index of the tab.
-            /// </summary>
-            protected int Index;
-
             /// <summary>
             /// The tab.
             /// </summary>
@@ -38,21 +33,22 @@ namespace FlaxEditor.GUI.Tabs
             /// Initializes a new instance of the <see cref="TabHeader"/> class.
             /// </summary>
             /// <param name="tabs">The tabs.</param>
-            /// <param name="index">The tab index.</param>
             /// <param name="tab">The tab.</param>
-            public TabHeader(Tabs tabs, int index, Tab tab)
+            public TabHeader(Tabs tabs, Tab tab)
             : base(Float2.Zero, tabs._tabsSize)
             {
                 Tabs = tabs;
-                Index = index;
                 Tab = tab;
             }
 
             /// <inheritdoc />
             public override bool OnMouseUp(Float2 location, MouseButton button)
             {
-                Tabs.SelectedTabIndex = Index;
-                Tabs.Focus();
+                if (EnabledInHierarchy && Tab.Enabled)
+                {
+                    Tabs.SelectedTab = Tab;
+                    Tabs.Focus();
+                }
                 return true;
             }
 
@@ -61,19 +57,20 @@ namespace FlaxEditor.GUI.Tabs
             {
                 base.Draw();
 
-                // Cache data
                 var style = Style.Current;
+                var enabled = EnabledInHierarchy && Tab.EnabledInHierarchy;
                 var tabRect = new Rectangle(Float2.Zero, Size);
-                bool isTabSelected = Tabs._selectedIndex == Index;
-                bool isMouseOverTab = IsMouseOver;
                 var textOffset = Tabs._orientation == Orientation.Horizontal ? 0 : 8;
 
                 // Draw bar
-                if (isTabSelected)
+                if (Tabs.SelectedTab == Tab)
                 {
+                    var color = style.BackgroundSelected;
+                    if (!enabled)
+                        color *= 0.6f;
                     if (Tabs._orientation == Orientation.Horizontal)
                     {
-                        Render2D.FillRectangle(tabRect, style.BackgroundSelected);
+                        Render2D.FillRectangle(tabRect, color);
                     }
                     else
                     {
@@ -84,10 +81,10 @@ namespace FlaxEditor.GUI.Tabs
                         fillRect.Size.X -= lefEdgeWidth;
                         fillRect.Location.X += lefEdgeWidth;
                         Render2D.FillRectangle(fillRect, style.Background);
-                        Render2D.FillRectangle(leftEdgeRect, style.BackgroundSelected);
+                        Render2D.FillRectangle(leftEdgeRect, color);
                     }
                 }
-                else if (isMouseOverTab)
+                else if (IsMouseOver && enabled)
                 {
                     Render2D.FillRectangle(tabRect, style.BackgroundHighlighted);
                 }
@@ -131,20 +128,15 @@ namespace FlaxEditor.GUI.Tabs
             {
                 base.PerformLayoutBeforeChildren();
 
-                // Cache data
-                var tabsSize = Tabs._tabsSize;
-                var clientSize = GetClientArea();
-                tabsSize = Float2.Min(tabsSize, clientSize.Size);
-                var tabRect = new Rectangle(Float2.Zero, tabsSize);
-                var tabStripOffset = Tabs._orientation == Orientation.Horizontal ? new Float2(tabsSize.X, 0) : new Float2(0, tabsSize.Y);
-
                 // Arrange tab header controls
+                var pos = Float2.Zero;
+                var sizeMask = Tabs._orientation == Orientation.Horizontal ? Float2.UnitX : Float2.UnitY;
                 for (int i = 0; i < Children.Count; i++)
                 {
                     if (Children[i] is TabHeader tabHeader)
                     {
-                        tabHeader.Bounds = tabRect;
-                        tabRect.Offset(tabStripOffset);
+                        tabHeader.Location = pos;
+                        pos += tabHeader.Size * sizeMask;
                     }
                 }
             }
@@ -160,6 +152,11 @@ namespace FlaxEditor.GUI.Tabs
         /// </summary>
         protected Float2 _tabsSize;
 
+        /// <summary>
+        /// Automatic tab size based on the fill axis.
+        /// </summary>
+        protected bool _autoTabsSizeAuto;
+
         /// <summary>
         /// The orientation.
         /// </summary>
@@ -174,15 +171,33 @@ namespace FlaxEditor.GUI.Tabs
             set
             {
                 _tabsSize = value;
-                for (int i = 0; i < TabsPanel.ChildrenCount; i++)
+                if (!_autoTabsSizeAuto)
                 {
-                    if (TabsPanel.Children[i] is TabHeader tabHeader)
-                        tabHeader.Size = value;
+                    for (int i = 0; i < TabsPanel.ChildrenCount; i++)
+                    {
+                        if (TabsPanel.Children[i] is TabHeader tabHeader)
+                            tabHeader.Size = value;
+                    }
                 }
                 PerformLayout();
             }
         }
 
+        /// <summary>
+        /// Enables automatic tabs size to fill the space.
+        /// </summary>
+        public bool AutoTabsSize
+        {
+            get => _autoTabsSizeAuto;
+            set
+            {
+                if (_autoTabsSizeAuto == value)
+                    return;
+                _autoTabsSizeAuto = value;
+                PerformLayout();
+            }
+        }
+
         /// <summary>
         /// Gets or sets the orientation.
         /// </summary>
@@ -191,11 +206,11 @@ namespace FlaxEditor.GUI.Tabs
             get => _orientation;
             set
             {
+                if (_orientation == value)
+                    return;
                 _orientation = value;
-
                 if (UseScroll)
                     TabsPanel.ScrollBars = _orientation == Orientation.Horizontal ? ScrollBars.Horizontal : ScrollBars.Vertical;
-
                 PerformLayout();
             }
         }
@@ -339,14 +354,10 @@ namespace FlaxEditor.GUI.Tabs
 
             // Update tabs headers
             TabsPanel.DisposeChildren();
-            int index = 0;
             for (int i = 0; i < Children.Count; i++)
             {
                 if (Children[i] is Tab tab)
-                {
-                    var tabHeader = new TabHeader(this, index++, tab);
-                    TabsPanel.AddChild(tabHeader);
-                }
+                    TabsPanel.AddChild(tab.CreateHeader());
             }
 
             TabsPanel.IsLayoutLocked = wasLocked;
@@ -371,23 +382,54 @@ namespace FlaxEditor.GUI.Tabs
         /// <inheritdoc />
         protected override void PerformLayoutBeforeChildren()
         {
+            var tabsSize = _tabsSize;
+            if (_autoTabsSizeAuto)
+            {
+                // Horizontal is default for Toolbox so tabs go to the right
+                int tabsCount = 0;
+                for (int i = 0; i < TabsPanel.ChildrenCount; i++)
+                {
+                    if (TabsPanel.Children[i] is TabHeader)
+                        tabsCount++;
+                }
+                if (tabsCount == 0)
+                    tabsCount = 1;
+                if (_orientation == Orientation.Horizontal)
+                    tabsSize.X = Width / tabsCount;
+                else
+                    tabsSize.Y = Height / tabsCount;
+                for (int i = 0; i < TabsPanel.ChildrenCount; i++)
+                {
+                    if (TabsPanel.Children[i] is TabHeader tabHeader)
+                        tabHeader.Size = tabsSize;
+                }
+            }
+            else if (UseScroll)
+            {
+                // If scroll bar is visible it covers part of the tab header so include this in tab size to improve usability
+                if (_orientation == Orientation.Horizontal && TabsPanel.HScrollBar.Visible)
+                    tabsSize.Y += TabsPanel.HScrollBar.Height;
+                else if (_orientation == Orientation.Vertical && TabsPanel.VScrollBar.Visible)
+                    tabsSize.X += TabsPanel.VScrollBar.Width;
+            }
+
             // Fit the tabs panel
-            TabsPanel.Size = _orientation == Orientation.Horizontal ? new Float2(Width, _tabsSize.Y) : new Float2(_tabsSize.X, Height);
+            TabsPanel.Size = _orientation == Orientation.Horizontal
+                             ? new Float2(Width, tabsSize.Y)
+                             : new Float2(tabsSize.X, Height);
 
             // Hide all pages except selected one
-            var clientArea = _orientation == Orientation.Horizontal
-                             ? new Rectangle(0, _tabsSize.Y, Width, Height - _tabsSize.Y)
-                             : new Rectangle(_tabsSize.X, 0, Width - _tabsSize.X, Height);
             for (int i = 0; i < Children.Count; i++)
             {
                 if (Children[i] is Tab tab)
                 {
-                    // Check if is selected or not
                     if (i - 1 == _selectedIndex)
                     {
                         // Show and fit size
                         tab.Visible = true;
-                        tab.Bounds = clientArea;
+                        tab.Bounds = _orientation == Orientation.Horizontal
+                                     ? new Rectangle(0, tabsSize.Y, Width, Height - tabsSize.Y)
+                                     : new Rectangle(tabsSize.X, 0, Width - tabsSize.X, Height);
                     }
                     else
                     {

Source/Editor/GUI/Timeline/GUI/Background.cs

@@ -282,7 +282,7 @@ namespace FlaxEditor.GUI.Timeline.GUI
                     var x = time * zoom + Timeline.StartOffset;
 
                     // Header line
-                    var lineRect = new Rectangle(x - 0.5f, -verticalLinesHeaderExtend + timeAxisHeaderOffset, 1.0f, verticalLinesHeaderExtend);
+                    var lineRect = new Rectangle(x - 0.5f, -verticalLinesHeaderExtend * 0.6f + timeAxisHeaderOffset, 1.0f, verticalLinesHeaderExtend * 0.6f);
                     Render2D.FillRectangle(lineRect, lineColor);
 
                     // Time label
@@ -300,7 +300,7 @@ namespace FlaxEditor.GUI.Timeline.GUI
                         break;
                     default: throw new ArgumentOutOfRangeException();
                     }
-                    var labelRect = new Rectangle(x + 2, -verticalLinesHeaderExtend + timeAxisHeaderOffset, 50, verticalLinesHeaderExtend);
+                    var labelRect = new Rectangle(x + 2, -verticalLinesHeaderExtend * 0.8f + timeAxisHeaderOffset, 50, verticalLinesHeaderExtend);
                     Render2D.DrawText(style.FontSmall, labelText, labelRect, labelColor, TextAlignment.Near, TextAlignment.Center, TextWrapping.NoWrap, 1.0f, 0.8f);
                 }
             }

Source/Editor/GUI/Timeline/GUI/PositionHandle.cs

@@ -1,5 +1,7 @@
 // Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
+using System;
+using System.Globalization;
 using FlaxEngine;
 using FlaxEngine.GUI;
 
@@ -30,11 +32,33 @@ namespace FlaxEditor.GUI.Timeline.GUI
             var timeAxisOverlap = Timeline.HeaderTopAreaHeight * 0.5f;
             var timeAxisHeaderOffset = -_timeline.MediaBackground.ViewOffset.Y - timeAxisOverlap;
 
+            // Time label
+            string labelText;
+            switch (_timeline.TimeShowMode)
+            {
+            case Timeline.TimeShowModes.Frames:
+                labelText = _timeline.CurrentFrame.ToString("###0", CultureInfo.InvariantCulture);
+                break;
+            case Timeline.TimeShowModes.Seconds:
+                labelText = _timeline.CurrentTime.ToString("###0.##'s'", CultureInfo.InvariantCulture);
+                break;
+            case Timeline.TimeShowModes.Time:
+                labelText = TimeSpan.FromSeconds(_timeline.CurrentTime).ToString("g");
+                break;
+            default: throw new ArgumentOutOfRangeException();
+            }
+            var color = (_timeline.IsMovingPositionHandle ? style.ProgressNormal : style.Foreground).AlphaMultiplied(0.6f);
             Matrix3x3.RotationZ(Mathf.PiOverTwo, out var m1);
             var m2 = Matrix3x3.Translation2D(0, timeAxisHeaderOffset);
             Matrix3x3.Multiply(ref m1, ref m2, out var m3);
             Render2D.PushTransform(ref m3);
-            Render2D.DrawSprite(icon, new Rectangle(new Float2(4, -Width), Size), _timeline.IsMovingPositionHandle ? style.ProgressNormal : style.Foreground);
+            // TODO: Convert to its own sprite or 9 slice
+            Render2D.DrawSprite(icon, new Rectangle(new Float2(10, -icon.Size.X * 0.5f - 1), Size + new Float2(0, 1)), color);
+            Render2D.FillRectangle(new Rectangle(new Float2(-6, -icon.Size.Y * 0.5f + 7), new Float2(timeAxisOverlap, 5)), color);
+            Render2D.PopTransform();
+            var textMatrix = Matrix3x3.Translation2D(12, timeAxisHeaderOffset);
+            Render2D.PushTransform(ref textMatrix);
+            Render2D.DrawText(style.FontSmall, labelText, style.Foreground, new Float2(2, -6));
             Render2D.PopTransform();
 
             Render2D.FillRectangle(new Rectangle(Width * 0.5f, Height + timeAxisHeaderOffset, 1, _timeline.MediaPanel.Height - timeAxisHeaderOffset - timeAxisOverlap), _timeline.IsMovingPositionHandle ? style.ProgressNormal : style.Foreground.RGBMultiplied(0.8f));

Source/Editor/GUI/Timeline/SceneAnimationTimeline.cs

@@ -33,7 +33,7 @@ namespace FlaxEditor.GUI.Timeline
         /// </summary>
         public SceneAnimationPlayer Player
         {
-            get => _player;
+            get => _player != null ? _player : null;
             set
             {
                 if (_player == value)
@@ -268,7 +268,7 @@ namespace FlaxEditor.GUI.Timeline
         /// <inheritdoc />
         public override void OnSeek(int frame)
         {
-            if (_player?.Animation)
+            if (_player != null && _player.Animation)
             {
                 _player.Animation.WaitForLoaded();
                 _player.Time = frame / _player.Animation.FramesPerSecond;

Source/Editor/GUI/Timeline/Timeline.UI.cs

@@ -50,6 +50,27 @@ namespace FlaxEditor.GUI.Timeline
                 }
             }
 
+            /// <inheritdoc />
+            public override void OnMouseEnter(Float2 location)
+            {
+                base.OnMouseEnter(location);
+                Cursor = CursorType.Hand;
+            }
+
+            /// <inheritdoc />
+            public override void OnMouseLeave()
+            {
+                Cursor = CursorType.Default;
+                base.OnMouseLeave();
+            }
+
+            /// <inheritdoc />
+            public override void Defocus()
+            {
+                Cursor = CursorType.Default;
+                base.Defocus();
+            }
+
             private void Seek(ref Float2 location)
             {
                 if (_timeline.PlaybackState == PlaybackStates.Disabled)

Source/Editor/GUI/Timeline/Timeline.cs

@@ -167,7 +167,7 @@ namespace FlaxEditor.GUI.Timeline
         /// <summary>
         /// The header top area height (in pixels).
         /// </summary>
-        public static readonly float HeaderTopAreaHeight = 22.0f;
+        public static readonly float HeaderTopAreaHeight = 40.0f;
 
         /// <summary>
         /// The timeline units per second (on time axis).

Source/Editor/GUI/Timeline/Tracks/AnimationEventTrack.cs

@@ -298,7 +298,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
             var animEventTypes = Editor.Instance.CodeEditing.All.Get().Where(x => new ScriptType(typeof(AnimEvent)).IsAssignableFrom(x));
             foreach (var type in animEventTypes)
             {
-                if (type.IsAbstract || !type.CanCreateInstance)
+                if (type.IsAbstract || !type.CanCreateInstance || type.HasAttribute(typeof(HideInEditorAttribute), true))
                     continue;
                 var add = new ScriptType(typeof(AnimContinuousEvent)).IsAssignableFrom(type) ? addContinuousEvent : addEvent;
                 var b = add.ContextMenu.AddButton(type.Name);
@@ -307,6 +307,10 @@ namespace FlaxEditor.GUI.Timeline.Tracks
                 b.Parent.Tag = time;
                 b.ButtonClicked += OnAddAnimEvent;
             }
+            if (!addEvent.ContextMenu.Items.Any())
+                addEvent.ContextMenu.AddButton("No Anim Events found").CloseMenuOnClick = false;
+            if (!addContinuousEvent.ContextMenu.Items.Any())
+                addContinuousEvent.ContextMenu.AddButton("No Continuous Anim Events found").CloseMenuOnClick = false;
         }
 
 

Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs

@@ -125,6 +125,8 @@ namespace FlaxEditor.GUI.Timeline.Tracks
                 fov = cam.FieldOfView;
                 customAspectRatio = cam.CustomAspectRatio;
                 view.RenderLayersMask = cam.RenderLayersMask;
+                view.Flags = cam.RenderFlags;
+                view.Mode = cam.RenderMode;
             }
 
             // Try to evaluate camera properties based on the animated tracks

Source/Editor/GUI/ToolStrip.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
+using FlaxEditor.Windows;
 using FlaxEngine;
 using FlaxEngine.GUI;
 
@@ -23,10 +24,15 @@ namespace FlaxEditor.GUI
         public const int DefaultMarginH = 2;
 
         /// <summary>
-        /// Event fired when button gets clicked.
+        /// Event fired when button gets clicked with the primary mouse button.
         /// </summary>
         public Action<ToolStripButton> ButtonClicked;
 
+        /// <summary>
+        /// Event fired when button gets clicked with the secondary mouse button.
+        /// </summary>
+        public Action<ToolStripButton> SecondaryButtonClicked;
+
         /// <summary>
         /// Tries to get the last button.
         /// </summary>
@@ -146,6 +152,11 @@ namespace FlaxEditor.GUI
             ButtonClicked?.Invoke(button);
         }
 
+        internal void OnSecondaryButtonClicked(ToolStripButton button)
+        {
+            SecondaryButtonClicked?.Invoke(button);
+        }
+
         /// <inheritdoc />
         protected override void PerformLayoutBeforeChildren()
         {
@@ -171,5 +182,25 @@ namespace FlaxEditor.GUI
 
             PerformLayout();
         }
+
+        /// <inheritdoc />
+        public override bool OnKeyDown(KeyboardKeys key)
+        {
+            if (base.OnKeyDown(key))
+                return true;
+
+            // Fallback to the owning window for shortcuts
+            EditorWindow editorWindow = null;
+            ContainerControl c = Parent;
+            while (c != null && editorWindow == null)
+            {
+                editorWindow = c as EditorWindow;
+                c = c.Parent;
+            }
+            var editor = Editor.Instance;
+            if (editorWindow == null)
+                editorWindow = editor.Windows.EditWin; // Fallback to main editor window
+            return editorWindow.InputActions.Process(editor, this, key);
+        }
     }
 }

Source/Editor/GUI/ToolStripButton.cs

@@ -20,13 +20,19 @@ namespace FlaxEditor.GUI
 
         private SpriteHandle _icon;
         private string _text;
-        private bool _mouseDown;
+        private bool _primaryMouseDown;
+        private bool _secondaryMouseDown;
 
         /// <summary>
         /// Event fired when user clicks the button.
         /// </summary>
         public Action Clicked;
 
+        /// <summary>
+        /// Event fired when user clicks the button.
+        /// </summary>
+        public Action SecondaryClicked;
+
         /// <summary>
         /// The checked state.
         /// </summary>
@@ -63,6 +69,11 @@ namespace FlaxEditor.GUI
             }
         }
 
+        /// <summary>
+        /// A reference to a context menu to raise when the secondary mouse button is pressed.
+        /// </summary>
+        public ContextMenu.ContextMenu ContextMenu;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ToolStripButton"/> class.
         /// </summary>
@@ -108,10 +119,11 @@ namespace FlaxEditor.GUI
             var iconRect = new Rectangle(DefaultMargin, DefaultMargin, iconSize, iconSize);
             var textRect = new Rectangle(DefaultMargin, 0, 0, Height);
             bool enabled = EnabledInHierarchy;
+            bool mouseButtonDown = _primaryMouseDown || _secondaryMouseDown;
 
             // Draw background
             if (enabled && (IsMouseOver || IsNavFocused || Checked))
-                Render2D.FillRectangle(clientRect, Checked ? style.BackgroundSelected : _mouseDown ? style.BackgroundHighlighted : (style.LightBackground * 1.3f));
+                Render2D.FillRectangle(clientRect, Checked ? style.BackgroundSelected : mouseButtonDown ? style.BackgroundHighlighted : (style.LightBackground * 1.3f));
 
             // Draw icon
             if (_icon.IsValid)
@@ -124,13 +136,7 @@ namespace FlaxEditor.GUI
             if (!string.IsNullOrEmpty(_text))
             {
                 textRect.Size.X = Width - DefaultMargin - textRect.Left;
-                Render2D.DrawText(
-                    style.FontMedium,
-                    _text,
-                    textRect,
-                    enabled ? style.Foreground : style.ForegroundDisabled,
-                    TextAlignment.Near,
-                    TextAlignment.Center);
+                Render2D.DrawText(style.FontMedium, _text, textRect, enabled ? style.Foreground : style.ForegroundDisabled, TextAlignment.Near, TextAlignment.Center);
             }
         }
 
@@ -155,9 +161,13 @@ namespace FlaxEditor.GUI
         {
             if (button == MouseButton.Left)
             {
-                // Set flag
-                _mouseDown = true;
-
+                _primaryMouseDown = true;
+                Focus();
+                return true;
+            }
+            if (button == MouseButton.Right)
+            {
+                _secondaryMouseDown = true;
                 Focus();
                 return true;
             }
@@ -168,12 +178,9 @@ namespace FlaxEditor.GUI
         /// <inheritdoc />
         public override bool OnMouseUp(Float2 location, MouseButton button)
         {
-            if (button == MouseButton.Left && _mouseDown)
+            if (button == MouseButton.Left && _primaryMouseDown)
             {
-                // Clear flag
-                _mouseDown = false;
-
-                // Fire events
+                _primaryMouseDown = false;
                 if (AutoCheck)
                     Checked = !Checked;
                 Clicked?.Invoke();
@@ -181,6 +188,14 @@ namespace FlaxEditor.GUI
 
                 return true;
             }
+            if (button == MouseButton.Right && _secondaryMouseDown)
+            {
+                _secondaryMouseDown = false;
+                SecondaryClicked?.Invoke();
+                (Parent as ToolStrip)?.OnSecondaryButtonClicked(this);
+                ContextMenu?.Show(this, new Float2(0, Height));
+                return true;
+            }
 
             return base.OnMouseUp(location, button);
         }
@@ -188,8 +203,8 @@ namespace FlaxEditor.GUI
         /// <inheritdoc />
         public override void OnMouseLeave()
         {
-            // Clear flag
-            _mouseDown = false;
+            _primaryMouseDown = false;
+            _secondaryMouseDown = false;
 
             base.OnMouseLeave();
         }
@@ -197,8 +212,8 @@ namespace FlaxEditor.GUI
         /// <inheritdoc />
         public override void OnLostFocus()
         {
-            // Clear flag
-            _mouseDown = false;
+            _primaryMouseDown = false;
+            _secondaryMouseDown = false;
 
             base.OnLostFocus();
         }

Source/Editor/GUI/Tree/TreeNode.cs

@@ -762,6 +762,10 @@ namespace FlaxEditor.GUI.Tree
                         // Add/Remove
                         tree.AddOrRemoveSelection(this);
                     }
+                    else if (button == MouseButton.Right && tree.Selection.Contains(this))
+                    {
+                        // Do nothing
+                    }
                     else
                     {
                         // Select
@@ -772,11 +776,20 @@ namespace FlaxEditor.GUI.Tree
                 // Check if mouse hits arrow
                 if (_mouseOverArrow && HasAnyVisibleChild)
                 {
-                    // Toggle open state
-                    if (_opened)
-                        Collapse();
+                    if (ParentTree.Root.GetKey(KeyboardKeys.Alt))
+                    {
+                        if (_opened)
+                            CollapseAll();
+                        else
+                            ExpandAll();
+                    }
                     else
-                        Expand();
+                    {
+                        if (_opened)
+                            Collapse();
+                        else
+                            Expand();
+                    }
                 }
 
                 // Check if mouse hits bar