Use the OpenAL Git repository as a source for building other platforms

.github/ISSUE_TEMPLATE/1-bug.yaml

@@ -31,7 +31,7 @@ body:
         - '1.10'
         - '1.11'
         - master branch
-      default: 3
+      default: 2
     validations:
       required: true
   - type: textarea

.github/workflows/build_ios.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 8.0.x
     - name: Setup .NET Workload
       run: |
         dotnet workload install ios
@@ -33,4 +33,4 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -dotnet=9 -arch=ARM64 -platform=iOS -configuration=Release -buildtargets=FlaxGame
+        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -dotnet=8 -arch=ARM64 -platform=iOS -configuration=Release -buildtargets=FlaxGame

Content/Editor/MaterialTemplates/Decal.shader

@@ -6,7 +6,6 @@
 @3
 
 #include "./Flax/Common.hlsl"
-#include "./Flax/Stencil.hlsl"
 #include "./Flax/MaterialCommon.hlsl"
 #include "./Flax/GBufferCommon.hlsl"
 @7
@@ -15,13 +14,10 @@ META_CB_BEGIN(0, Data)
 float4x4 WorldMatrix;
 float4x4 InvWorld;
 float4x4 SvPositionToWorld;
-float3 Padding0;
-uint RenderLayersMask;
 @1META_CB_END
 
 // Use depth buffer for per-pixel decal layering
 Texture2D DepthBuffer : register(t0);
-Texture2D<uint2> StencilBuffer : register(t1);
 
 // Material shader resources
 @2
@@ -204,14 +200,6 @@ void PS_Decal(
 #endif
 	)
 {
-	// Stencil masking
-	uint stencilObjectLayer = STENCIL_BUFFER_OBJECT_LAYER(STENCIL_BUFFER_LOAD(StencilBuffer, SvPosition.xy));
-	if ((RenderLayersMask & (1 << stencilObjectLayer)) == 0)
-	{
-		clip(-1);
-		return;
-	}
-
 	float2 screenUV = SvPosition.xy * ScreenSize.zw;
 	SvPosition.z = SAMPLE_RT(DepthBuffer, screenUV).r;
 

Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl

@@ -29,13 +29,6 @@ Buffer<float4> ShadowsBuffer : register(t__SRV__);
 Texture2D<float> ShadowMap : register(t__SRV__);
 Texture3D VolumetricFogTexture : register(t__SRV__);
 @4// Forward Shading: Utilities
-// Public accessors for lighting data, use them as data binding might change but those methods will remain.
-LightData GetDirectionalLight() { return DirectionalLight; }
-LightData GetSkyLight() { return SkyLight; }
-ProbeData GetEnvironmentProbe() { return EnvironmentProbe; }
-ExponentialHeightFogData GetExponentialHeightFog() { return ExponentialHeightFog; }
-uint GetLocalLightsCount() { return LocalLightsCount; }
-LightData GetLocalLight(uint i) { return LocalLights[i]; }
 @5// Forward Shading: Shaders
 
 // Pixel Shader function for Forward Pass
@@ -84,8 +77,9 @@ void PS_Forward(
 	gBuffer.ShadingModel = MATERIAL_SHADING_MODEL;
 
 	// Calculate lighting from a single directional light
+	float4 shadowMask = 1.0f;
 	ShadowSample shadow = SampleDirectionalLightShadow(DirectionalLight, ShadowsBuffer, ShadowMap, gBuffer);
-	float4 shadowMask = GetShadowMask(shadow);
+	shadowMask = GetShadowMask(shadow);
 	float4 light = GetLighting(ViewPos, DirectionalLight, gBuffer, shadowMask, false, false);
 
 	// Calculate lighting from sky light
@@ -152,13 +146,7 @@ void PS_Forward(
 
 #if USE_FOG && MATERIAL_SHADING_MODEL != SHADING_MODEL_UNLIT
 	// Calculate exponential height fog
-#if DIRECTX && FEATURE_LEVEL < FEATURE_LEVEL_SM6
-	// TODO: fix D3D11/D3D10 bug with incorrect distance
-	float fogSceneDistance = distance(materialInput.WorldPosition, ViewPos);
-#else
-	float fogSceneDistance = gBuffer.ViewPos.z;
-#endif
-	float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, 0, fogSceneDistance);
+	float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, 0, gBuffer.ViewPos.z);
 
 	if (ExponentialHeightFog.VolumetricFogMaxDistance > 0)
 	{

Content/Editor/MaterialTemplates/GUI.shader

@@ -21,7 +21,7 @@ float4 ViewInfo;
 float4 ScreenSize;
 float4 ViewSize;
 float3 ViewPadding0;
-float ScaledTimeParam;
+float UnscaledTimeParam;
 @1META_CB_END
 
 // Shader resources

Content/Editor/MaterialTemplates/PostProcess.shader

@@ -20,7 +20,7 @@ float4 ScreenSize;
 float4 TemporalAAJitter;
 float4x4 InverseViewProjectionMatrix;
 float3 ViewPadding0;
-float ScaledTimeParam;
+float UnscaledTimeParam;
 @1META_CB_END
 
 // Shader resources

Flax.flaxproj

@@ -2,9 +2,9 @@
   "Name": "Flax",
   "Version": {
     "Major": 1,
-    "Minor": 11,
+    "Minor": 10,
     "Revision": 0,
-    "Build": 6805
+    "Build": 6705
   },
   "Company": "Flax",
   "Copyright": "Copyright (c) 2012-2025 Wojciech Figat. All rights reserved.",

GenerateProjectFiles.bat

@@ -15,7 +15,7 @@ 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,FlaxGame
+Binaries\Tools\Flax.Build.exe -build -BuildBindingsOnly -arch=x64 -platform=Windows --buildTargets=FlaxEditor
 
 popd
 echo Done!

README.md

@@ -49,7 +49,7 @@ Follow the instructions below to compile and run the engine from source.
   * Fedora: `sudo dnf install dotnet-sdk-8.0`
   * Arch: `sudo pacman -S dotnet-sdk-8.0 dotnet-runtime-8.0 dotnet-targeting-pack-8.0 dotnet-host`
 * Install Vulkan SDK ([https://vulkan.lunarg.com/](https://vulkan.lunarg.com/))
-  * Ubuntu: `sudo apt install vulkan-sdk` (deprecated, follow official docs)
+  * Ubuntu: `sudo apt install vulkan-sdk`
   * Fedora: `sudo dnf install vulkan-headers vulkan-tools vulkan-validation-layers`
   * Arch: `sudo pacman -S vulkan-headers vulkan-tools vulkan-validation-layers`
 * Install Git with LFS
@@ -57,10 +57,10 @@ Follow the instructions below to compile and run the engine from source.
   * Arch: `sudo pacman -S git git-lfs`
   * `git-lfs install`
 * Install the required packages:
-  * Ubuntu: `sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev zlib1g-dev`
-  * Fedora: `sudo dnf install libX11-devel libXcursor-devel  libXinerama-devel ghc-zlib-devel`
-  * Arch: `sudo pacman -S base-devel libx11 libxcursor libxinerama zlib`
-* Install Clang compiler (version 14 or later):
+  * Ubuntu: `sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev zlib1g-dev zenity wayland-protocols libportal-dev`
+  * Fedora: `sudo dnf install libX11-devel libXcursor-devel  libXinerama-devel ghc-zlib-devel zenity wayland-protocols-devel libportal`
+  * Arch: `sudo pacman -S base-devel libx11 libxcursor libxinerama zlib zenity wayland-protocols libportal`
+* Install Clang compiler (version 6 or later):
   * Ubuntu: `sudo apt-get install clang lldb lld`
   * Fedora: `sudo dnf install clang llvm lldb lld`
   * Arch: `sudo pacman -S clang lldb lld`

Source/Editor/Analytics/EditorAnalytics.cpp

@@ -174,9 +174,7 @@ void EditorAnalytics::StartSession()
     // Bind events
     GameCooker::OnEvent.Bind<RegisterGameCookingStart>();
     ShadowsOfMordor::Builder::Instance()->OnBuildStarted.Bind<RegisterLightmapsBuildingStart>();
-#if LOG_ENABLE
     Log::Logger::OnError.Bind<RegisterError>();
-#endif
 }
 
 void EditorAnalytics::EndSession()
@@ -189,9 +187,7 @@ void EditorAnalytics::EndSession()
     // Unbind events
     GameCooker::OnEvent.Unbind<RegisterGameCookingStart>();
     ShadowsOfMordor::Builder::Instance()->OnBuildStarted.Unbind<RegisterLightmapsBuildingStart>();
-#if LOG_ENABLE
     Log::Logger::OnError.Unbind<RegisterError>();
-#endif
 
     // End session
     {

Source/Editor/Content/Items/ContentItem.cs

@@ -749,7 +749,7 @@ namespace FlaxEditor.Content
             }
 
             // Draw short name
-            Render2D.PushClip(textRect);
+            Render2D.PushClip(ref textRect);
             var scale = 0.95f * view.ViewScale;
             Render2D.DrawText(style.FontMedium, ShowFileExtension || view.ShowFileExtensions ? FileName : ShortName, textRect, style.Foreground, nameAlignment, TextAlignment.Center, TextWrapping.WrapWords, 1f, scale);
             Render2D.PopClip();

Source/Editor/Content/Items/VisualScriptItem.cs

@@ -281,13 +281,6 @@ namespace FlaxEditor.Content
 
         private void CacheData()
         {
-            if (!_asset)
-            {
-                _parameters = Utils.GetEmptyArray<ScriptMemberInfo>();
-                _methods = Utils.GetEmptyArray<ScriptMemberInfo>();
-                _attributes = Utils.GetEmptyArray<Attribute>();
-                return;
-            }
             if (_parameters != null)
                 return;
             if (_asset.WaitForLoaded())
@@ -351,13 +344,13 @@ namespace FlaxEditor.Content
         }
 
         /// <inheritdoc />
-        public string Name => _asset ? Path.GetFileNameWithoutExtension(_asset.Path) : null;
+        public string Name => Path.GetFileNameWithoutExtension(_asset.Path);
 
         /// <inheritdoc />
         public string Namespace => string.Empty;
 
         /// <inheritdoc />
-        public string TypeName => _asset ? JsonSerializer.GetStringID(_asset.ID) : null;
+        public string TypeName => JsonSerializer.GetStringID(_asset.ID);
 
         /// <inheritdoc />
         public bool IsPublic => true;

Source/Editor/Content/Proxy/AssetProxy.cs

@@ -130,11 +130,6 @@ namespace FlaxEditor.Content
             eyeAdaptation.Mode = EyeAdaptationMode.None;
             eyeAdaptation.OverrideFlags |= EyeAdaptationSettingsOverride.Mode;
             preview.PostFxVolume.EyeAdaptation = eyeAdaptation;
-
-            var antiAliasing = preview.PostFxVolume.AntiAliasing;
-            antiAliasing.Mode = AntialiasingMode.FastApproximateAntialiasing;
-            antiAliasing.OverrideFlags |= AntiAliasingSettingsOverride.Mode;
-            preview.PostFxVolume.AntiAliasing = antiAliasing;
         }
     }
 }

Source/Editor/Content/Thumbnails/ThumbnailsModule.cs

@@ -263,7 +263,7 @@ namespace FlaxEditor.Content.Thumbnails
             // Create render task but disabled for now
             _output = GPUDevice.Instance.CreateTexture("ThumbnailsOutput");
             var desc = GPUTextureDescription.New2D(PreviewsCache.AssetIconSize, PreviewsCache.AssetIconSize, PreviewsCache.AssetIconsAtlasFormat);
-            _output.Init(desc);
+            _output.Init(ref desc);
             _task = Object.New<RenderTask>();
             _task.Order = 50; // Render this task later
             _task.Enabled = false;

Source/Editor/Cooker/CookingData.h

@@ -20,6 +20,13 @@ class PlatformTools;
 #define GAME_BUILD_DOTNET_RUNTIME_MAX_VER 9
 #endif
 
+#if OFFICIAL_BUILD
+// Use the fixed .NET SDK version in packaged builds for compatibility (FlaxGame is precompiled with it)
+#define GAME_BUILD_DOTNET_VER TEXT("-dotnet=" MACRO_TO_STR(GAME_BUILD_DOTNET_RUNTIME_MIN_VER))
+#else
+#define GAME_BUILD_DOTNET_VER TEXT("")
+#endif
+
 /// <summary>
 /// Game building options. Used as flags.
 /// </summary>
@@ -367,8 +374,6 @@ public:
     /// </summary>
     void GetBuildPlatformName(const Char*& platform, const Char*& architecture) const;
 
-    String GetDotnetCommandArg() const;
-
 public:
 
     /// <summary>

Source/Editor/Cooker/GameCooker.cpp

@@ -30,7 +30,6 @@
 #include "Engine/Scripting/ManagedCLR/MAssembly.h"
 #include "Engine/Content/JsonAsset.h"
 #include "Engine/Content/AssetReference.h"
-#include "Engine/Profiler/ProfilerMemory.h"
 #if PLATFORM_TOOLS_WINDOWS
 #include "Platform/Windows/WindowsPlatformTools.h"
 #include "Engine/Platform/Windows/WindowsPlatformSettings.h"
@@ -312,14 +311,6 @@ void CookingData::GetBuildPlatformName(const Char*& platform, const Char*& archi
     }
 }
 
-String CookingData::GetDotnetCommandArg() const
-{
-    int32 version = Tools->GetDotnetVersion();
-    if (version == 0)
-        return String::Empty;
-    return String::Format(TEXT("-dotnet={}"), version);
-}
-
 void CookingData::StepProgress(const String& info, const float stepProgress) const
 {
     const float singleStepProgress = 1.0f / (StepsCount + 1);
@@ -389,7 +380,6 @@ bool GameCooker::IsCancelRequested()
 
 PlatformTools* GameCooker::GetTools(BuildPlatform platform)
 {
-    PROFILE_MEM(Editor);
     PlatformTools* result = nullptr;
     if (!Tools.TryGet(platform, result))
     {
@@ -481,7 +471,6 @@ bool GameCooker::Build(BuildPlatform platform, BuildConfiguration configuration,
         LOG(Error, "Build platform {0} is not supported.", ::ToString(platform));
         return true;
     }
-    PROFILE_MEM(Editor);
 
     // Setup
     CancelFlag = 0;
@@ -635,7 +624,6 @@ void GameCookerImpl::ReportProgress(const String& info, float totalProgress)
 
 void GameCookerImpl::OnCollectAssets(HashSet<Guid>& assets)
 {
-    PROFILE_MEM(Editor);
     if (Internal_OnCollectAssets == nullptr)
     {
         auto c = GameCooker::GetStaticClass();
@@ -663,7 +651,6 @@ void GameCookerImpl::OnCollectAssets(HashSet<Guid>& assets)
 
 bool GameCookerImpl::Build()
 {
-    PROFILE_MEM(Editor);
     CookingData& data = *Data;
     LOG(Info, "Starting Game Cooker...");
     LOG(Info, "Platform: {0}, Configuration: {2}, Options: {1}", ::ToString(data.Platform), (int32)data.Options, ::ToString(data.Configuration));
@@ -683,7 +670,8 @@ bool GameCookerImpl::Build()
 
     MCore::Thread::Attach();
 
-    // Build start
+    // Build Started
+    if (!EnumHasAnyFlags(data.Options, BuildOptions::NoCook))
     {
         CallEvent(GameCooker::EventType::BuildStarted);
         data.Tools->OnBuildStarted(data);
@@ -756,8 +744,8 @@ bool GameCookerImpl::Build()
     }
     IsRunning = false;
     CancelFlag = 0;
+    if (!EnumHasAnyFlags(data.Options, BuildOptions::NoCook))
     {
-        // Build end
         for (int32 stepIndex = 0; stepIndex < Steps.Count(); stepIndex++)
             Steps[stepIndex]->OnBuildEnded(data, failed);
         data.Tools->OnBuildEnded(data, failed);
@@ -790,8 +778,6 @@ int32 GameCookerImpl::ThreadFunction()
 
 bool GameCookerService::Init()
 {
-    PROFILE_MEM(Editor);
-
     auto editorAssembly = ((NativeBinaryModule*)GetBinaryModuleFlaxEngine())->Assembly;
     editorAssembly->Unloading.Bind(OnEditorAssemblyUnloading);
     GameCooker::OnCollectAssets.Bind(OnCollectAssets);
@@ -803,7 +789,6 @@ void GameCookerService::Update()
 {
     if (IsRunning)
     {
-        PROFILE_MEM(Editor);
         ScopeLock lock(ProgressLocker);
 
         if (ProgressMsg.HasChars())

Source/Editor/Cooker/Platform/GDK/GDKPlatformTools.cpp

@@ -15,32 +15,26 @@
 #include "Editor/ProjectInfo.h"
 #include "Editor/Utilities/EditorUtilities.h"
 
-String GetGDK()
+GDKPlatformTools::GDKPlatformTools()
 {
-    String gdk;
-    Platform::GetEnvironmentVariable(TEXT("GameDKLatest"), gdk);
-    if (gdk.IsEmpty() || !FileSystem::DirectoryExists(gdk))
+    // Find GDK
+    Platform::GetEnvironmentVariable(TEXT("GameDKLatest"), _gdkPath);
+    if (_gdkPath.IsEmpty() || !FileSystem::DirectoryExists(_gdkPath))
     {
-        gdk.Clear();
-        Platform::GetEnvironmentVariable(TEXT("GRDKLatest"), gdk);
-        if (gdk.IsEmpty() || !FileSystem::DirectoryExists(gdk))
+        _gdkPath.Clear();
+        Platform::GetEnvironmentVariable(TEXT("GRDKLatest"), _gdkPath);
+        if (_gdkPath.IsEmpty() || !FileSystem::DirectoryExists(_gdkPath))
         {
-            gdk.Clear();
+            _gdkPath.Clear();
         }
         else
         {
-            if (gdk.EndsWith(TEXT("GRDK\\")))
-                gdk.Remove(gdk.Length() - 6);
-            else if (gdk.EndsWith(TEXT("GRDK")))
-                gdk.Remove(gdk.Length() - 5);
+            if (_gdkPath.EndsWith(TEXT("GRDK\\")))
+                _gdkPath.Remove(_gdkPath.Length() - 6);
+            else if (_gdkPath.EndsWith(TEXT("GRDK")))
+                _gdkPath.Remove(_gdkPath.Length() - 5);
         }
     }
-    return gdk;
-}
-
-GDKPlatformTools::GDKPlatformTools()
-{
-    _gdkPath = GetGDK();
 }
 
 DotNetAOTModes GDKPlatformTools::UseAOT() const
@@ -127,7 +121,7 @@ bool GDKPlatformTools::OnPostProcess(CookingData& data, GDKPlatformSettings* pla
         validName.Add('\0');
 
         sb.Append(TEXT("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"));
-        sb.Append(TEXT("<Game configVersion=\"1\">\n"));
+        sb.Append(TEXT("<Game configVersion=\"0\">\n"));
         sb.AppendFormat(TEXT("  <Identity Name=\"{0}\" Publisher=\"{1}\" Version=\"{2}\"/>\n"),
                         validName.Get(),
                         platformSettings->PublisherName.HasChars() ? platformSettings->PublisherName : TEXT("CN=") + gameSettings->CompanyName,
@@ -201,9 +195,4 @@ bool GDKPlatformTools::OnPostProcess(CookingData& data, GDKPlatformSettings* pla
     return false;
 }
 
-int32 GDKPlatformTools::GetDotnetVersion() const
-{
-    return GAME_BUILD_DOTNET_RUNTIME_MIN_VER;
-}
-
 #endif

Source/Editor/Cooker/Platform/GDK/GDKPlatformTools.h

@@ -26,7 +26,6 @@ public:
 public:
 
     // [PlatformTools]
-    int32 GetDotnetVersion() const override;
     DotNetAOTModes UseAOT() const override;
     bool OnDeployBinaries(CookingData& data) override;
 };

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

@@ -186,7 +186,7 @@ bool MacPlatformTools::OnPostProcess(CookingData& data)
         ADD_ENTRY("CFBundlePackageType", "APPL");
         ADD_ENTRY("NSPrincipalClass", "NSApplication");
         ADD_ENTRY("LSApplicationCategoryType", "public.app-category.games");
-        ADD_ENTRY("LSMinimumSystemVersion", "13");
+        ADD_ENTRY("LSMinimumSystemVersion", "10.15");
         ADD_ENTRY("CFBundleIconFile", "icon.icns");
         ADD_ENTRY_STR("CFBundleExecutable", executableName);
         ADD_ENTRY_STR("CFBundleIdentifier", appIdentifier);
@@ -231,8 +231,6 @@ bool MacPlatformTools::OnPostProcess(CookingData& data)
     LOG(Info, "Building app package...");
     {
         const String dmgPath = data.OriginalOutputPath / appName + TEXT(".dmg");
-        if (FileSystem::FileExists(dmgPath))
-            FileSystem::DeleteFile(dmgPath);
         CreateProcessSettings procSettings;
         procSettings.HiddenWindow = true;
         procSettings.WorkingDirectory = data.OriginalOutputPath;

Source/Editor/Cooker/Platform/Windows/WindowsPlatformTools.cpp

@@ -528,9 +528,6 @@ bool WindowsPlatformTools::OnDeployBinaries(CookingData& data)
 
 void WindowsPlatformTools::OnBuildStarted(CookingData& data)
 {
-    if (EnumHasAllFlags(data.Options, BuildOptions::NoCook))
-        return;
-
     // Remove old executable
     Array<String> files;
     FileSystem::DirectoryGetFiles(files, data.NativeCodeOutputPath, TEXT("*.exe"), DirectorySearchOption::TopDirectoryOnly);

Source/Editor/Cooker/PlatformTools.h

@@ -70,20 +70,6 @@ public:
     /// </summary>
     virtual ArchitectureType GetArchitecture() const = 0;
 
-    /// <summary>
-    /// Gets the .Net version to use for the cooked game.
-    /// </summary>
-    virtual int32 GetDotnetVersion() const
-    {
-#if OFFICIAL_BUILD
-        // Use the fixed .NET SDK version in packaged builds for compatibility (FlaxGame is precompiled with it)
-        return GAME_BUILD_DOTNET_RUNTIME_MIN_VER;
-#else
-        // Use the highest version found on a system (Flax.Build will decide)
-        return 0;
-#endif
-    }
-
     /// <summary>
     /// Gets the value indicating whenever platform requires AOT (needs C# assemblies to be precompiled).
     /// </summary>

Source/Editor/Cooker/Steps/CompileScriptsStep.cpp

@@ -10,10 +10,9 @@
 #include "Engine/Serialization/JsonTools.h"
 #include "Engine/Serialization/JsonWriters.h"
 #include "Editor/Cooker/PlatformTools.h"
-#include "Engine/Engine/Globals.h"
 #include "Editor/Editor.h"
 #include "Editor/ProjectInfo.h"
-#include "Editor/Utilities/EditorUtilities.h"
+#include "Engine/Engine/Globals.h"
 #if PLATFORM_MAC
 #include <sys/stat.h>
 #endif
@@ -128,7 +127,7 @@ bool CompileScriptsStep::DeployBinaries(CookingData& data, const String& path, c
         const String dst = dstPath / StringUtils::GetFileName(file);
         if (dst == file)
             continue;
-        if (EditorUtilities::CopyFileIfNewer(dst, file))
+        if (FileSystem::CopyFile(dst, file))
         {
             data.Error(String::Format(TEXT("Failed to copy file from {0} to {1}."), file, dst));
             return true;
@@ -190,7 +189,7 @@ bool CompileScriptsStep::Perform(CookingData& data)
     const String logFile = data.CacheDirectory / TEXT("CompileLog.txt");
     auto args = String::Format(
         TEXT("-log -logfile=\"{4}\" -build -mutex -buildtargets={0} -platform={1} -arch={2} -configuration={3} -aotMode={5} {6}"),
-        target, platform, architecture, configuration, logFile, ToString(data.Tools->UseAOT()), data.GetDotnetCommandArg());
+        target, platform, architecture, configuration, logFile, ToString(data.Tools->UseAOT()), GAME_BUILD_DOTNET_VER);
 #if PLATFORM_WINDOWS
     if (data.Platform == BuildPlatform::LinuxX64)
 #elif PLATFORM_LINUX

Source/Editor/Cooker/Steps/CookAssetsStep.cpp

@@ -36,7 +36,6 @@
 #include "Engine/Engine/Base/GameBase.h"
 #include "Engine/Engine/Globals.h"
 #include "Engine/Tools/TextureTool/TextureTool.h"
-#include "Engine/Threading/Threading.h"
 #include "Engine/Profiler/ProfilerCPU.h"
 #include "Engine/Scripting/Enums.h"
 #if PLATFORM_TOOLS_WINDOWS
@@ -526,7 +525,6 @@ bool ProcessShaderBase(CookAssetsStep::AssetCookData& data, ShaderAssetBase* ass
 #if PLATFORM_TOOLS_XBOX_SCARLETT
     case BuildPlatform::XboxScarlett:
     {
-        options.Platform = PlatformType::XboxScarlett;
         const char* platformDefineName = "PLATFORM_XBOX_SCARLETT";
         COMPILE_PROFILE(DirectX_SM6, SHADER_FILE_CHUNK_INTERNAL_D3D_SM6_CACHE);
         break;
@@ -1368,10 +1366,7 @@ bool CookAssetsStep::Perform(CookingData& data)
             {
                 typeName = e.TypeName;
             }
-            if (e.Count == 1)
-                LOG(Info, "{0}:    1 asset  of total size {1}", typeName, Utilities::BytesToText(e.ContentSize));
-            else
-                LOG(Info, "{0}: {1:>4} assets of total size {2}", typeName, e.Count, Utilities::BytesToText(e.ContentSize));
+            LOG(Info, "{0}: {1:>4} assets of total size {2}", typeName, e.Count, Utilities::BytesToText(e.ContentSize));
         }
         LOG(Info, "");
     }

Source/Editor/Cooker/Steps/DeployDataStep.cpp

@@ -88,7 +88,7 @@ bool DeployDataStep::Perform(CookingData& data)
             {
                 // Ask Flax.Build to provide .NET SDK location for the current platform
                 String sdks;
-                bool failed = ScriptsBuilder::RunBuildTool(String::Format(TEXT("-log -logMessagesOnly -logFileWithConsole -logfile=SDKs.txt -printSDKs {}"), data.GetDotnetCommandArg()), data.CacheDirectory);
+                bool failed = ScriptsBuilder::RunBuildTool(String::Format(TEXT("-log -logMessagesOnly -logFileWithConsole -logfile=SDKs.txt -printSDKs {}"), GAME_BUILD_DOTNET_VER), data.CacheDirectory);
                 failed |= File::ReadAllText(data.CacheDirectory / TEXT("SDKs.txt"), sdks);
                 int32 idx = sdks.Find(TEXT("DotNetSdk, "), StringSearchCase::CaseSensitive);
                 if (idx != -1)
@@ -200,7 +200,7 @@ bool DeployDataStep::Perform(CookingData& data)
                 String sdks;
                 const Char *platformName, *archName;
                 data.GetBuildPlatformName(platformName, archName);
-                String args = String::Format(TEXT("-log -logMessagesOnly -logFileWithConsole -logfile=SDKs.txt -printDotNetRuntime -platform={} -arch={} {}"), platformName, archName, data.GetDotnetCommandArg());
+                String args = String::Format(TEXT("-log -logMessagesOnly -logFileWithConsole -logfile=SDKs.txt -printDotNetRuntime -platform={} -arch={} {}"), platformName, archName, GAME_BUILD_DOTNET_VER);
                 bool failed = ScriptsBuilder::RunBuildTool(args, data.CacheDirectory);
                 failed |= File::ReadAllText(data.CacheDirectory / TEXT("SDKs.txt"), sdks);
                 Array<String> parts;
@@ -244,13 +244,10 @@ bool DeployDataStep::Perform(CookingData& data)
                     }
                     if (version.IsEmpty())
                     {
-                        int32 minVer = GAME_BUILD_DOTNET_RUNTIME_MIN_VER, maxVer = GAME_BUILD_DOTNET_RUNTIME_MAX_VER;
                         if (srcDotnetFromEngine)
                         {
                             // Detect version from runtime files inside Engine Platform folder
-                            if (data.Tools->GetDotnetVersion() != 0)
-                                minVer = maxVer = data.Tools->GetDotnetVersion();
-                            for (int32 i = maxVer; i >= minVer; i--)
+                            for (int32 i = GAME_BUILD_DOTNET_RUNTIME_MAX_VER; i >= GAME_BUILD_DOTNET_RUNTIME_MIN_VER; i--)
                             {
                                 // Check runtime files inside Engine Platform folder
                                 String testPath1 = srcDotnet / String::Format(TEXT("lib/net{}.0"), i);
@@ -265,7 +262,7 @@ bool DeployDataStep::Perform(CookingData& data)
                         }
                         if (version.IsEmpty())
                         {
-                            data.Error(String::Format(TEXT("Failed to find supported .NET {} version (min {}) for {} platform."), maxVer, minVer, platformName));
+                            data.Error(String::Format(TEXT("Failed to find supported .NET {} version for the current host platform."), GAME_BUILD_DOTNET_RUNTIME_MIN_VER));
                             return true;
                         }
                     }
@@ -367,7 +364,7 @@ bool DeployDataStep::Perform(CookingData& data)
             const String logFile = data.CacheDirectory / TEXT("StripDotnetLibs.txt");
             String args = String::Format(
                 TEXT("-log -logfile=\"{}\" -runDotNetClassLibStripping -mutex -binaries=\"{}\" {}"),
-                logFile, data.DataOutputPath, data.GetDotnetCommandArg());
+                logFile, data.DataOutputPath, GAME_BUILD_DOTNET_VER);
             for (const String& define : data.CustomDefines)
             {
                 args += TEXT(" -D");

Source/Editor/Cooker/Steps/PrecompileAssembliesStep.cpp

@@ -12,7 +12,7 @@
 void PrecompileAssembliesStep::OnBuildStarted(CookingData& data)
 {
     const DotNetAOTModes aotMode = data.Tools->UseAOT();
-    if (aotMode == DotNetAOTModes::None || EnumHasAllFlags(data.Options, BuildOptions::NoCook))
+    if (aotMode == DotNetAOTModes::None)
         return;
     const auto& buildSettings = *BuildSettings::Get();
 
@@ -59,7 +59,6 @@ bool PrecompileAssembliesStep::Perform(CookingData& data)
     data.StepProgress(infoMsg, 0);
 
     // Override Newtonsoft.Json with AOT-version (one that doesn't use System.Reflection.Emit)
-    // TODO: remove it since EngineModule does properly reference AOT lib now
     EditorUtilities::CopyFileIfNewer(data.ManagedCodeOutputPath / TEXT("Newtonsoft.Json.dll"), Globals::StartupFolder / TEXT("Source/Platforms/DotNet/AOT/Newtonsoft.Json.dll"));
     FileSystem::DeleteFile(data.ManagedCodeOutputPath / TEXT("Newtonsoft.Json.xml"));
     FileSystem::DeleteFile(data.ManagedCodeOutputPath / TEXT("Newtonsoft.Json.pdb"));
@@ -70,7 +69,7 @@ bool PrecompileAssembliesStep::Perform(CookingData& data)
     const String logFile = data.CacheDirectory / TEXT("AOTLog.txt");
     String args = String::Format(
         TEXT("-log -logfile=\"{}\" -runDotNetAOT -mutex -platform={} -arch={} -configuration={} -aotMode={} -binaries=\"{}\" -intermediate=\"{}\" {}"),
-        logFile, platform, architecture, configuration, ToString(aotMode), data.DataOutputPath, data.ManagedCodeOutputPath, data.GetDotnetCommandArg());
+        logFile, platform, architecture, configuration, ToString(aotMode), data.DataOutputPath, data.ManagedCodeOutputPath, GAME_BUILD_DOTNET_VER);
     if (!buildSettings.SkipUnusedDotnetLibsPackaging)
         args += TEXT(" -skipUnusedDotnetLibs=false"); // Run AOT on whole class library (not just used libs)
     for (const String& define : data.CustomDefines)

Source/Editor/CustomEditors/CustomEditorsUtil.cpp

@@ -6,8 +6,6 @@
 #include "Engine/Core/Types/TimeSpan.h"
 #include "Engine/Core/Types/Stopwatch.h"
 #include "Engine/Core/Collections/Dictionary.h"
-#include "Engine/Profiler/ProfilerCPU.h"
-#include "Engine/Profiler/ProfilerMemory.h"
 #include "Engine/Engine/EngineService.h"
 #include "Engine/Scripting/Scripting.h"
 #include "Engine/Scripting/BinaryModule.h"
@@ -71,7 +69,6 @@ MTypeObject* CustomEditorsUtil::GetCustomEditor(MTypeObject* refType)
 
 bool CustomEditorsUtilService::Init()
 {
-    PROFILE_MEM(Editor);
     TRACK_ASSEMBLY(((NativeBinaryModule*)GetBinaryModuleFlaxEngine())->Assembly);
     Scripting::BinaryModuleLoaded.Bind(&OnBinaryModuleLoaded);
 
@@ -80,8 +77,6 @@ bool CustomEditorsUtilService::Init()
 
 void OnAssemblyLoaded(MAssembly* assembly)
 {
-    PROFILE_CPU_NAMED("CustomEditors.OnAssemblyLoaded");
-    PROFILE_MEM(Editor);
     Stopwatch stopwatch;
 
     // Prepare FlaxEngine

Source/Editor/CustomEditors/CustomEditorsUtil.cs

@@ -139,7 +139,7 @@ namespace FlaxEditor.CustomEditors
             return new GenericEditor();
         }
 
-        [LibraryImport("FlaxEngine", EntryPoint = "CustomEditorsUtilInternal_GetCustomEditor", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "CustomEditorsUtilInternal_GetCustomEditor", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalUsing(typeof(SystemTypeMarshaller))]
         internal static partial Type Internal_GetCustomEditor([MarshalUsing(typeof(SystemTypeMarshaller))] Type targetType);
     }

Source/Editor/CustomEditors/Dedicated/ActorEditor.cs

@@ -60,14 +60,14 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 if (prefab && !prefab.WaitForLoaded())
                 {
                     var prefabObjectId = actor.PrefabObjectID;
-                    var prefabInstance = prefab.GetDefaultInstance(prefabObjectId);
+                    var prefabInstance = prefab.GetDefaultInstance(ref prefabObjectId);
                     if (prefabInstance != null)
                     {
                         // Use default prefab instance as a reference for the editor
                         Values.SetReferenceValue(prefabInstance);
 
                         // Display prefab UI (when displaying object inside Prefab Window then display only nested prefabs)
-                        prefab.GetNestedObject(prefabObjectId, out var nestedPrefabId, out var nestedPrefabObjectId);
+                        prefab.GetNestedObject(ref prefabObjectId, out var nestedPrefabId, out var nestedPrefabObjectId);
                         var nestedPrefab = FlaxEngine.Content.Load<Prefab>(nestedPrefabId);
                         var panel = layout.UniformGrid();
                         panel.CustomControl.Height = 20.0f;
@@ -207,7 +207,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 {
                     var actor = (Actor)Values[0];
                     var prefabObjectId = actor.PrefabObjectID;
-                    var prefabInstance = prefab.GetDefaultInstance(prefabObjectId);
+                    var prefabInstance = prefab.GetDefaultInstance(ref prefabObjectId);
                     if (prefabInstance != null)
                     {
                         Values.SetReferenceValue(prefabInstance);
@@ -525,7 +525,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 var restored = actor.AddScript(removed.PrefabObject.GetType());
                 var prefabId = actor.PrefabID;
                 var prefabObjectId = restored.PrefabObjectID;
-                Script.Internal_LinkPrefab(FlaxEngine.Object.GetUnmanagedPtr(restored), prefabId, prefabObjectId);
+                Script.Internal_LinkPrefab(FlaxEngine.Object.GetUnmanagedPtr(restored), ref prefabId, ref prefabObjectId);
                 string data = JsonSerializer.Serialize(removed.PrefabObject);
                 JsonSerializer.Deserialize(restored, data);
 
@@ -547,7 +547,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 string data = JsonSerializer.Serialize(removedActor.PrefabObject);
                 JsonSerializer.Deserialize(restored, data);
                 Presenter.Owner.SceneContext.Spawn(restored, parentActor, removedActor.OrderInParent);
-                Actor.Internal_LinkPrefab(FlaxEngine.Object.GetUnmanagedPtr(restored), prefabId, prefabObjectId);
+                Actor.Internal_LinkPrefab(FlaxEngine.Object.GetUnmanagedPtr(restored), ref prefabId, ref prefabObjectId);
                 return;
             }
 

Source/Editor/CustomEditors/Dedicated/EnvironmentProbeEditor.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
-using FlaxEngine.GUI;
 
 namespace FlaxEditor.CustomEditors.Dedicated
 {
@@ -12,7 +11,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
     [CustomEditor(typeof(EnvironmentProbe)), DefaultEditor]
     public class EnvironmentProbeEditor : ActorEditor
     {
-        private Button _bake;
+        private FlaxEngine.GUI.Button _bake;
 
         /// <inheritdoc />
         public override void Initialize(LayoutElementsContainer layout)
@@ -21,9 +20,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
 
             if (Values.HasDifferentTypes == false)
             {
-                var group = layout.Group("Bake");
-                group.Panel.ItemsMargin = new Margin(Utilities.Constants.UIMargin * 2);
-                _bake = group.Button("Bake").Button;
+                layout.Space(10);
+                _bake = layout.Button("Bake").Button;
                 _bake.Clicked += BakeButtonClicked;
             }
         }

Source/Editor/CustomEditors/Dedicated/MeshReferenceEditor.cs

@@ -164,11 +164,11 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 var button2Rect = new Rectangle(button1Rect.Right + 2, 1, 14, 14);
 
                 // Deselect
-                if (isSelected && button1Rect.Contains(location))
+                if (isSelected && button1Rect.Contains(ref location))
                     Value = new ModelInstanceActor.MeshReference { Actor = null, LODIndex = -1, MeshIndex = -1 };
 
                 // Picker dropdown menu
-                if ((isSelected ? button2Rect : button1Rect).Contains(location))
+                if ((isSelected ? button2Rect : button1Rect).Contains(ref location))
                     ShowDropDownMenu();
 
                 return base.OnMouseUp(location, button);

Source/Editor/CustomEditors/Dedicated/ModelPrefabEditor.cs

@@ -40,7 +40,7 @@ public class ModelPrefabEditor : GenericEditor
             if (prefab)
             {
                 var prefabObjectId = modelPrefab.PrefabObjectID;
-                var prefabObject = prefab.GetDefaultInstance(prefabObjectId);
+                var prefabObject = prefab.GetDefaultInstance(ref prefabObjectId);
                 if (prefabObject.PrefabID == _prefabId)
                     break;
                 _prefabId = prefabObject.PrefabID;

Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs

@@ -914,11 +914,9 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 // Remove drop down arrows and containment lines if no objects in the group
                 if (group.Children.Count == 0)
                 {
-                    group.Panel.Close();
                     group.Panel.ArrowImageOpened = null;
                     group.Panel.ArrowImageClosed = null;
                     group.Panel.EnableContainmentLines = false;
-                    group.Panel.CanOpenClose = false;
                 }
 
                 // Scripts arrange bar

Source/Editor/CustomEditors/Dedicated/SkyLightEditor.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
-using FlaxEngine.GUI;
 
 namespace FlaxEditor.CustomEditors.Dedicated
 {
@@ -20,9 +19,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
             if (Values.HasDifferentTypes == false)
             {
                 // Add 'Bake' button
-                var group = layout.Group("Bake");
-                group.Panel.ItemsMargin = new Margin(Utilities.Constants.UIMargin * 2);
-                var button = group.Button("Bake");
+                layout.Space(10);
+                var button = layout.Button("Bake");
                 button.Button.Clicked += BakeButtonClicked;
             }
         }

Source/Editor/CustomEditors/Editors/AssetRefEditor.cs

@@ -123,8 +123,6 @@ namespace FlaxEditor.CustomEditors.Editors
         {
             base.Refresh();
 
-            if (Picker == null)
-                return;
             var differentValues = HasDifferentValues;
             Picker.DifferentValues = differentValues;
             if (!differentValues)
@@ -192,7 +190,7 @@ namespace FlaxEditor.CustomEditors.Editors
 
             public override bool OnMouseDown(Float2 location, MouseButton button)
             {
-                if (DropdownRect.Contains(location))
+                if (DropdownRect.Contains(ref location))
                 {
                     Focus();
                     ShowPicker();
@@ -206,7 +204,7 @@ namespace FlaxEditor.CustomEditors.Editors
             {
                 base.OnMouseMove(location);
 
-                if (DropdownRect.Contains(location))
+                if (DropdownRect.Contains(ref location))
                     Cursor = CursorType.Default;
                 else
                     Cursor = CursorType.IBeam;

Source/Editor/CustomEditors/Editors/CollectionEditor.cs

@@ -71,7 +71,7 @@ namespace FlaxEditor.CustomEditors.Editors
 
                 menu.AddButton("Copy", linkedEditor.Copy);
                 var b = menu.AddButton("Duplicate", () => Editor.Duplicate(Index));
-                b.Enabled = !Editor._readOnly && Editor._canResize;
+                b.Enabled = linkedEditor.CanPaste && !Editor._readOnly && Editor._canResize;
                 b = menu.AddButton("Paste", linkedEditor.Paste);
                 b.Enabled = linkedEditor.CanPaste && !Editor._readOnly;
 
@@ -155,7 +155,7 @@ namespace FlaxEditor.CustomEditors.Editors
             /// <inheritdoc />
             public override bool OnMouseDown(Float2 location, MouseButton button)
             {
-                if (button == MouseButton.Left && _arrangeButtonRect.Contains(location))
+                if (button == MouseButton.Left && _arrangeButtonRect.Contains(ref location))
                 {
                     _arrangeButtonInUse = true;
                     Focus();
@@ -371,7 +371,7 @@ namespace FlaxEditor.CustomEditors.Editors
             /// <inheritdoc />
             public override bool OnMouseDown(Float2 location, MouseButton button)
             {
-                if (button == MouseButton.Left && _arrangeButtonRect.Contains(location))
+                if (button == MouseButton.Left && _arrangeButtonRect.Contains(ref location))
                 {
                     _arrangeButtonInUse = true;
                     Focus();
@@ -407,7 +407,7 @@ namespace FlaxEditor.CustomEditors.Editors
 
                 menu.AddButton("Copy", linkedEditor.Copy);
                 var b = menu.AddButton("Duplicate", () => Editor.Duplicate(Index));
-                b.Enabled = !Editor._readOnly && Editor._canResize;
+                b.Enabled = linkedEditor.CanPaste && !Editor._readOnly && Editor._canResize;
                 var paste = menu.AddButton("Paste", linkedEditor.Paste);
                 paste.Enabled = linkedEditor.CanPaste && !Editor._readOnly;
 
@@ -650,7 +650,7 @@ namespace FlaxEditor.CustomEditors.Editors
                 panel.Panel.Size = new Float2(0, 18);
                 panel.Panel.Margin = new Margin(0, 0, Utilities.Constants.UIMargin, 0);
 
-                var removeButton = panel.Button("-", "Remove the last item.");
+                var removeButton = panel.Button("-", "Remove the last item");
                 removeButton.Button.Size = new Float2(16, 16);
                 removeButton.Button.Enabled = size > _minCount;
                 removeButton.Button.AnchorPreset = AnchorPresets.TopRight;
@@ -661,7 +661,7 @@ namespace FlaxEditor.CustomEditors.Editors
                     Resize(Count - 1);
                 };
 
-                var addButton = panel.Button("+", "Add a new item.");
+                var addButton = panel.Button("+", "Add a new item");
                 addButton.Button.Size = new Float2(16, 16);
                 addButton.Button.Enabled = (!NotNullItems || size > 0) && size < _maxCount;
                 addButton.Button.AnchorPreset = AnchorPresets.TopRight;

Source/Editor/CustomEditors/Editors/ControlReferenceEditor.cs

@@ -22,7 +22,7 @@ internal class UIControlRefPickerControl : FlaxObjectRefPickerControl
     /// <inheritdoc />
     protected override bool IsValid(Object obj)
     {
-        return obj == null || (obj is UIControl control && ControlType.IsAssignableFrom(control.Control.GetType()));
+        return obj == null || (obj is UIControl control && control.Control.GetType() == ControlType);
     }
 }
 

Source/Editor/CustomEditors/Editors/FlaxObjectRefEditor.cs

@@ -321,11 +321,11 @@ namespace FlaxEditor.CustomEditors.Editors
             var button2Rect = new Rectangle(button1Rect.Right + 2, 1, 14, 14);
 
             // Deselect
-            if (_value != null && button1Rect.Contains(location))
+            if (_value != null && button1Rect.Contains(ref location))
                 Value = null;
 
             // Picker dropdown menu
-            if (_supportsPickDropDown && (isSelected ? button2Rect : button1Rect).Contains(location))
+            if (_supportsPickDropDown && (isSelected ? button2Rect : button1Rect).Contains(ref location))
             {
                 ShowDropDownMenu();
                 return true;

Source/Editor/CustomEditors/Editors/GenericEditor.cs

@@ -247,7 +247,7 @@ namespace FlaxEditor.CustomEditors.Editors
         /// <returns>The items.</returns>
         protected virtual List<ItemInfo> GetItemsForType(ScriptType type)
         {
-            return GetItemsForType(type, type.IsClass, true, true);
+            return GetItemsForType(type, type.IsClass, true);
         }
 
         /// <summary>
@@ -273,14 +273,10 @@ namespace FlaxEditor.CustomEditors.Editors
                     var attributes = p.GetAttributes(true);
                     var showInEditor = attributes.Any(x => x is ShowInEditorAttribute);
 
-                    // Skip properties without getter
+                    // Skip properties without getter or setter
                     if (!p.HasGet || (!p.HasSet && !showInEditor && !usePropertiesWithoutSetter))
                         continue;
 
-                    // Skip getter-only properties declared in built-in types
-                    if (!p.HasSet && usePropertiesWithoutSetter && p.Type.DeclaringType.Assembly == typeof(Editor).Assembly)
-                        continue;
-
                     // Skip hidden fields, handle special attributes
                     if ((!p.IsPublic && !showInEditor) || attributes.Any(x => x is HideInEditorAttribute))
                         continue;

Source/Editor/CustomEditors/Editors/TypeEditor.cs

@@ -104,7 +104,7 @@ namespace FlaxEditor.CustomEditors.Editors
         public event Action<TypePickerControl> TypePickerValueChanged;
 
         /// <summary>
-        /// The custom callback for types validation. Can be used to implement a rule for types to pick.
+        /// The custom callback for types validation. Cane be used to implement a rule for types to pick.
         /// </summary>
         public Func<ScriptType, bool> CheckValid;
 
@@ -219,11 +219,11 @@ namespace FlaxEditor.CustomEditors.Editors
             var button2Rect = new Rectangle(button1Rect.Right + 2, 1, 14, 14);
 
             // Deselect
-            if (_value && button1Rect.Contains(location) && _type == ScriptType.Null)
+            if (_value && button1Rect.Contains(ref location) && _type == ScriptType.Null)
                 Value = ScriptType.Null;
 
             // Picker dropdown menu
-            if ((isSelected && _type == ScriptType.Null ? button2Rect : button1Rect).Contains(location))
+            if ((isSelected && _type == ScriptType.Null ? button2Rect : button1Rect).Contains(ref location))
                 ShowDropDownMenu();
 
             return base.OnMouseUp(location, button);
@@ -353,13 +353,7 @@ namespace FlaxEditor.CustomEditors.Editors
                     }
                     if (!string.IsNullOrEmpty(typeReference.CheckMethod))
                     {
-                        var parentEditor = ParentEditor;
-                        // Find actual parent editor if parent editor is collection editor
-                        while (parentEditor.GetType().IsAssignableTo(typeof(CollectionEditor)))
-                            parentEditor = parentEditor.ParentEditor;
-                            
-                        var parentType = parentEditor.Values[0].GetType();
-
+                        var parentType = ParentEditor.Values[0].GetType();
                         var method = parentType.GetMethod(typeReference.CheckMethod, BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
                         if (method != null)
                         {

Source/Editor/Editor.cpp

@@ -20,7 +20,6 @@
 #include "Engine/Engine/Engine.h"
 #include "Engine/ShadowsOfMordor/Builder.h"
 #include "Engine/Profiler/ProfilerCPU.h"
-#include "Engine/Profiler/ProfilerMemory.h"
 #include "FlaxEngine.Gen.h"
 #if PLATFORM_LINUX
 #include "Engine/Tools/TextureTool/TextureTool.h"
@@ -48,7 +47,6 @@ void Editor::CloseSplashScreen()
 
 bool Editor::CheckProjectUpgrade()
 {
-    PROFILE_MEM(Editor);
     const auto versionFilePath = Globals::ProjectCacheFolder / TEXT("version");
 
     // Load version cache file
@@ -268,8 +266,8 @@ bool Editor::CheckProjectUpgrade()
     // Check if last version was older
     else if (lastVersion.Major < FLAXENGINE_VERSION_MAJOR || (lastVersion.Major == FLAXENGINE_VERSION_MAJOR && lastVersion.Minor < FLAXENGINE_VERSION_MINOR))
     {
-        LOG(Warning, "The project was last opened with an older editor version");
-        const auto result = MessageBox::Show(TEXT("The project was last opened with an older editor version.\nLoading it may modify existing data, which can result in older editor versions being unable to open it.\n\nDo you want to perform a backup before or cancel the operation?"), TEXT("Project upgrade"), MessageBoxButtons::YesNoCancel, MessageBoxIcon::Question);
+        LOG(Warning, "The project was opened with the older editor version last time");
+        const auto result = MessageBox::Show(TEXT("The project was opened with the older editor version last time. Loading it may modify existing data so older editor version won't open it. Do you want to perform a backup before or cancel operation?"), TEXT("Project upgrade"), MessageBoxButtons::YesNoCancel, MessageBoxIcon::Question);
         if (result == DialogResult::Yes)
         {
             if (BackupProject())
@@ -291,8 +289,8 @@ bool Editor::CheckProjectUpgrade()
     // Check if last version was newer
     else if (lastVersion.Major > FLAXENGINE_VERSION_MAJOR || (lastVersion.Major == FLAXENGINE_VERSION_MAJOR && lastVersion.Minor > FLAXENGINE_VERSION_MINOR))
     {
-        LOG(Warning, "The project was last opened with a newer editor version");
-        const auto result = MessageBox::Show(TEXT("The project was last opened with a newer editor version.\nLoading it may fail and corrupt existing data.\n\nDo you want to perform a backup before loading or cancel the operation?"), TEXT("Project upgrade"), MessageBoxButtons::YesNoCancel, MessageBoxIcon::Warning);
+        LOG(Warning, "The project was opened with the newer editor version last time");
+        const auto result = MessageBox::Show(TEXT("The project was opened with the newer editor version last time. Loading it may fail and corrupt existing data. Do you want to perform a backup before or cancel operation?"), TEXT("Project upgrade"), MessageBoxButtons::YesNoCancel, MessageBoxIcon::Warning);
         if (result == DialogResult::Yes)
         {
             if (BackupProject())
@@ -368,8 +366,6 @@ bool Editor::BackupProject()
 
 int32 Editor::LoadProduct()
 {
-    PROFILE_MEM(Editor);
-
     // Flax Editor product
     Globals::ProductName = TEXT("Flax Editor");
     Globals::CompanyName = TEXT("Flax");
@@ -526,23 +522,6 @@ int32 Editor::LoadProduct()
             return 12;
     }
 
-    // Get the last opened project path
-    String localCachePath;
-    FileSystem::GetSpecialFolderPath(SpecialFolder::AppData, localCachePath);
-    String editorConfigPath = localCachePath / TEXT("Flax");
-    String lastProjectSettingPath = editorConfigPath / TEXT("LastProject.txt");
-    if (!FileSystem::DirectoryExists(editorConfigPath))
-        FileSystem::CreateDirectory(editorConfigPath);
-    String lastProjectPath;
-    if (FileSystem::FileExists(lastProjectSettingPath))
-        File::ReadAllText(lastProjectSettingPath, lastProjectPath);
-    if (!FileSystem::DirectoryExists(lastProjectPath))
-        lastProjectPath = String::Empty;
-
-    // Try to open the last project when requested
-    if (projectPath.IsEmpty() && CommandLine::Options.LastProject.IsTrue() && !lastProjectPath.IsEmpty())
-        projectPath = lastProjectPath;
-
     // Missing project case
     if (projectPath.IsEmpty())
     {
@@ -558,7 +537,7 @@ int32 Editor::LoadProduct()
         Array<String> files;
         if (FileSystem::ShowOpenFileDialog(
             nullptr,
-            lastProjectPath,
+            StringView::Empty,
             TEXT("Project files (*.flaxproj)\0*.flaxproj\0All files (*.*)\0*.*\0"),
             false,
             TEXT("Select project to open in Editor"),
@@ -642,16 +621,11 @@ int32 Editor::LoadProduct()
         }
     }
 
-    // Update the last opened project path
-    if (lastProjectPath.Compare(Project->ProjectFolderPath) != 0)
-        File::WriteAllText(lastProjectSettingPath, Project->ProjectFolderPath, Encoding::UTF8);
-
     return 0;
 }
 
 Window* Editor::CreateMainWindow()
 {
-    PROFILE_MEM(Editor);
     Window* window = Managed->GetMainWindow();
 
 #if PLATFORM_LINUX
@@ -688,7 +662,6 @@ bool Editor::Init()
         return true;
     }
     PROFILE_CPU();
-    PROFILE_MEM(Editor);
 
     // If during last lightmaps baking engine crashed we could try to restore the progress
     ShadowsOfMordor::Builder::Instance()->CheckIfRestoreState();
@@ -720,13 +693,11 @@ bool Editor::Init()
 
 void Editor::BeforeRun()
 {
-    PROFILE_MEM(Editor);
     Managed->BeforeRun();
 }
 
 void Editor::BeforeExit()
 {
-    PROFILE_MEM(Editor);
     CloseSplashScreen();
 
     Managed->Exit();
@@ -737,8 +708,6 @@ void Editor::BeforeExit()
 
 void EditorImpl::OnUpdate()
 {
-    PROFILE_MEM(Editor);
-
     // Update c# editor
     Editor::Managed->Update();
 

Source/Editor/Editor.cs

@@ -69,18 +69,18 @@ namespace FlaxEditor
         /// <summary>
         /// Gets a value indicating whether this Editor is running a dev instance of the engine.
         /// </summary>
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_IsDevInstance")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_IsDevInstance", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool IsDevInstance();
 
         /// <summary>
         /// Gets a value indicating whether this Editor is running as official build (distributed via Flax services).
         /// </summary>
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_IsOfficialBuild")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_IsOfficialBuild", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool IsOfficialBuild();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_IsPlayMode")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_IsPlayMode", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_IsPlayMode();
 
@@ -1056,7 +1056,7 @@ namespace FlaxEditor
             if (actor)
             {
                 Internal_GetEditorBoxWithChildren(FlaxEngine.Object.GetUnmanagedPtr(actor), out var box);
-                BoundingSphere.FromBox(box, out sphere);
+                BoundingSphere.FromBox(ref box, out sphere);
                 if (sphere == BoundingSphere.Empty)
                     sphere = new BoundingSphere(actor.Position, sphere.Radius);
                 sphere.Radius = Math.Max(sphere.Radius, 15.0f);
@@ -1390,7 +1390,6 @@ namespace FlaxEditor
         public void BuildAllMeshesSDF()
         {
             var models = new List<Model>();
-            var forceRebuild = Input.GetKey(KeyboardKeys.F);
             Scene.ExecuteOnGraph(node =>
             {
                 if (node is StaticModelNode staticModelNode && staticModelNode.Actor is StaticModel staticModel)
@@ -1400,7 +1399,7 @@ namespace FlaxEditor
                         model != null &&
                         !models.Contains(model) &&
                         !model.IsVirtual &&
-                        (forceRebuild || model.SDF.Texture == null))
+                        model.SDF.Texture == null)
                     {
                         models.Add(model);
                     }
@@ -1413,17 +1412,7 @@ namespace FlaxEditor
                 {
                     var model = models[i];
                     Log($"[{i}/{models.Count}] Generating SDF for {model}");
-                    float resolutionScale = 1.0f, backfacesThreshold = 0.6f;
-                    int lodIndex = 6;
-                    bool useGPU = true;
-                    var sdf = model.SDF;
-                    if (sdf.Texture != null)
-                    {
-                        // Preserve options set on this model
-                        resolutionScale = sdf.ResolutionScale;
-                        lodIndex = sdf.LOD;
-                    }
-                    if (!model.GenerateSDF(resolutionScale, lodIndex, true, backfacesThreshold, useGPU))
+                    if (!model.GenerateSDF())
                         model.Save();
                 }
             });
@@ -1598,7 +1587,7 @@ namespace FlaxEditor
                 if (dockedTo != null && dockedTo.SelectedTab != gameWin && dockedTo.SelectedTab != null)
                     result = dockedTo.SelectedTab.Size;
                 else
-                    result = gameWin.Viewport.ContentSize;
+                    result = gameWin.Viewport.Size;
 
                 result *= root.DpiScale;
                 result = Float2.Round(result);
@@ -1647,103 +1636,96 @@ namespace FlaxEditor
         }
 
         [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_ReadOutputLogs", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
-        internal static partial int Internal_ReadOutputLogs([MarshalUsing(typeof(FlaxEngine.Interop.NativeArrayMarshaller<string, FlaxEngine.Interop.NativeString>), CountElementName = "outCapacity")] ref string[] outMessages, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.U1, SizeParamIndex = 3)] ref byte[] outLogTypes, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.I8, SizeParamIndex = 3)] ref long[] outLogTimes, int outCapacity);
+        internal static partial int Internal_ReadOutputLogs([MarshalUsing(typeof(FlaxEngine.Interop.ArrayMarshaller<,>), CountElementName = "outCapacity")] ref string[] outMessages, [MarshalUsing(typeof(FlaxEngine.Interop.ArrayMarshaller<,>), CountElementName = "outCapacity")] ref byte[] outLogTypes, [MarshalUsing(typeof(FlaxEngine.Interop.ArrayMarshaller<,>), CountElementName = "outCapacity")] ref long[] outLogTimes, int outCapacity);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SetPlayMode")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SetPlayMode", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
         internal static partial void Internal_SetPlayMode([MarshalAs(UnmanagedType.U1)] bool value);
 
-        internal static string Internal_GetProjectPath()
-        {
-            Internal_GetProjectPath(out string projectPath);
-            return projectPath;
-        }
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetProjectPath", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
+        internal static partial string Internal_GetProjectPath();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetProjectPath", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
-        internal static partial void Internal_GetProjectPath([MarshalUsing(typeof(FlaxEngine.Interop.StringViewMarshaller))] out string projectPath);
-
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CloneAssetFile", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CloneAssetFile", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_CloneAssetFile(string dstPath, string srcPath, ref Guid dstId);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetAudioClipMetadata")]
+        [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);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SaveJsonAsset", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SaveJsonAsset", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_SaveJsonAsset(string outputPath, string data, string typename);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CopyCache")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CopyCache", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_CopyCache(ref Guid dstId, ref Guid srcId);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_BakeLightmaps")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_BakeLightmaps", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_BakeLightmaps([MarshalAs(UnmanagedType.U1)] bool cancel);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetShaderAssetSourceCode", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
-        [return: MarshalUsing(typeof(FlaxEngine.Interop.StringViewMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetShaderAssetSourceCode", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial string Internal_GetShaderAssetSourceCode(IntPtr obj);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CookMeshCollision", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CookMeshCollision", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_CookMeshCollision(string path, CollisionDataType type, IntPtr model, int modelLodIndex, uint materialSlotsMask, ConvexMeshGenerationFlags convexFlags, int convexVertexLimit);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetCollisionWires")]
-        internal static partial void Internal_GetCollisionWires(IntPtr collisionData, [MarshalUsing(typeof(FlaxEngine.Interop.NativeArrayMarshaller<,>), CountElementName = "trianglesCount")] out Float3[] triangles, [MarshalUsing(typeof(FlaxEngine.Interop.ArrayMarshaller<,>), CountElementName = "indicesCount")] out int[] indices, out int trianglesCount, out int indicesCount);
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetCollisionWires", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
+        internal static partial void Internal_GetCollisionWires(IntPtr collisionData, [MarshalUsing(typeof(FlaxEngine.Interop.ArrayMarshaller<,>), CountElementName = "trianglesCount")] out Float3[] triangles, [MarshalUsing(typeof(FlaxEngine.Interop.ArrayMarshaller<,>), CountElementName = "indicesCount")] out int[] indices, out int trianglesCount, out int indicesCount);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetEditorBoxWithChildren")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetEditorBoxWithChildren", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_GetEditorBoxWithChildren(IntPtr obj, out BoundingBox resultAsRef);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SetOptions")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SetOptions", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_SetOptions(ref InternalOptions options);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_DrawNavMesh")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_DrawNavMesh", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_DrawNavMesh();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CloseSplashScreen")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CloseSplashScreen", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_CloseSplashScreen();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CreateVisualScript", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CreateVisualScript", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_CreateVisualScript(string outputPath, string baseTypename);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CanImport", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CanImport", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial string Internal_CanImport(string extension);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CanExport", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CanExport", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_CanExport(string path);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_Export", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_Export", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_Export(string inputPath, string outputFolder);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetIsEveryAssemblyLoaded")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetIsEveryAssemblyLoaded", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_GetIsEveryAssemblyLoaded();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetLastProjectOpenedEngineBuild")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetLastProjectOpenedEngineBuild", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial int Internal_GetLastProjectOpenedEngineBuild();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetIsCSGActive")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetIsCSGActive", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_GetIsCSGActive();
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_RunVisualScriptBreakpointLoopTick")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_RunVisualScriptBreakpointLoopTick", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_RunVisualScriptBreakpointLoopTick(float deltaTime);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_DeserializeSceneObject", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(FlaxEngine.Interop.StringMarshaller))]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_DeserializeSceneObject", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_DeserializeSceneObject(IntPtr sceneObject, string json);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_LoadAsset")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_LoadAsset", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_LoadAsset(ref Guid id);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CanSetToRoot")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_CanSetToRoot", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         [return: MarshalAs(UnmanagedType.U1)]
         internal static partial bool Internal_CanSetToRoot(IntPtr prefab, IntPtr newRoot);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetAnimationTime")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_GetAnimationTime", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial float Internal_GetAnimationTime(IntPtr animatedModel);
 
-        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SetAnimationTime")]
+        [LibraryImport("FlaxEngine", EntryPoint = "EditorInternal_SetAnimationTime", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(StringMarshaller))]
         internal static partial void Internal_SetAnimationTime(IntPtr animatedModel, float time);
 
         #endregion

Source/Editor/GUI/AssetPicker.cs

@@ -96,7 +96,7 @@ namespace FlaxEditor.GUI
         private void DoDrag()
         {
             // Do the drag drop operation if has selected element
-            if (new Rectangle(Float2.Zero, Size).Contains(_mouseDownPos))
+            if (new Rectangle(Float2.Zero, Size).Contains(ref _mouseDownPos))
             {
                 if (Validator.SelectedAsset != null)
                     DoDragDrop(DragAssets.GetDragData(Validator.SelectedAsset));

Source/Editor/GUI/ColumnDefinition.cs

@@ -51,7 +51,7 @@ namespace FlaxEditor.GUI
         /// <summary>
         /// The column title horizontal text alignment
         /// </summary>
-        public TextAlignment TitleAlignment = TextAlignment.Center;
+        public TextAlignment TitleAlignment = TextAlignment.Near;
 
         /// <summary>
         /// The column title margin.

Source/Editor/GUI/ContextMenu/ContextMenuBase.cs

@@ -117,10 +117,9 @@ namespace FlaxEditor.GUI.ContextMenu
         public ContextMenuBase()
         : base(0, 0, 120, 32)
         {
-            Visible = false;
-            AutoFocus = true;
-
             _direction = ContextMenuDirection.RightDown;
+            Visible = false;
+
             _isSubMenu = true;
         }
 

Source/Editor/GUI/CurveEditor.Contents.cs

@@ -62,7 +62,7 @@ namespace FlaxEditor.GUI
                 for (int i = 0; i < children.Count; i++)
                 {
                     if (children[i] is KeyframePoint p)
-                        p.IsSelected = p.Bounds.Intersects(selectionRect);
+                        p.IsSelected = p.Bounds.Intersects(ref selectionRect);
                 }
                 _editor.UpdateTangents();
             }
@@ -85,7 +85,7 @@ namespace FlaxEditor.GUI
             internal void OnMove(Float2 location)
             {
                 // Skip updating keyframes until move actual starts to be meaningful
-                if (Float2.Distance(_movingSelectionStartPosLock, location) < 1.5f)
+                if (Float2.Distance(ref _movingSelectionStartPosLock, ref location) < 1.5f)
                     return;
                 _movingSelectionStartPosLock = Float2.Minimum;
 

Source/Editor/GUI/CurveEditor.cs

@@ -689,8 +689,8 @@ namespace FlaxEditor.GUI
                 if (selectedOnly && !point.IsSelected)
                     continue;
                 var pos = point.Point;
-                Float2.Min(posMin, pos, out posMin);
-                Float2.Max(posMax, pos, out posMax);
+                Float2.Min(ref posMin, ref pos, out posMin);
+                Float2.Max(ref posMax, ref pos, out posMax);
             }
 
             // Apply margin around the area
@@ -703,16 +703,16 @@ namespace FlaxEditor.GUI
             PointFromKeyframesToContents(ref posMin, ref viewRect);
             PointFromKeyframesToContents(ref posMax, ref viewRect);
             var tmp = posMin;
-            Float2.Min(posMin, posMax, out posMin);
-            Float2.Max(posMax, tmp, out posMax);
+            Float2.Min(ref posMin, ref posMax, out posMin);
+            Float2.Max(ref posMax, ref tmp, out posMax);
             var contentsSize = posMax - posMin;
 
             // Convert from Contents to Main Panel
             posMin = _contents.PointToParent(posMin);
             posMax = _contents.PointToParent(posMax);
             tmp = posMin;
-            Float2.Min(posMin, posMax, out posMin);
-            Float2.Max(posMax, tmp, out posMax);
+            Float2.Min(ref posMin, ref posMax, out posMin);
+            Float2.Max(ref posMax, ref tmp, out posMax);
 
             // Update zoom (leave unchanged when focusing a single point)
             var zoomMask = EnableZoom;
@@ -941,7 +941,7 @@ namespace FlaxEditor.GUI
             {
                 SetupGrid(out var min, out var max, out var pixelRange);
 
-                Render2D.PushClip(viewRect);
+                Render2D.PushClip(ref viewRect);
 
                 if ((ShowAxes & UseMode.Vertical) == UseMode.Vertical)
                     DrawAxis(Float2.UnitX, viewRect, min.X, max.X, pixelRange.X);
@@ -954,7 +954,7 @@ namespace FlaxEditor.GUI
             // Draw curve
             if (!_showCollapsed)
             {
-                Render2D.PushClip(rect);
+                Render2D.PushClip(ref rect);
                 DrawCurve(ref viewRect);
                 Render2D.PopClip();
             }

Source/Editor/GUI/Dialogs/ColorSelector.cs

@@ -76,8 +76,6 @@ namespace FlaxEditor.GUI.Dialogs
         public ColorSelector(float wheelSize)
         : base(0, 0, wheelSize, wheelSize)
         {
-            AutoFocus = true;
-
             _colorWheelSprite = Editor.Instance.Icons.ColorWheel128;
             _wheelRect = new Rectangle(0, 0, wheelSize, wheelSize);
         }

Source/Editor/GUI/Docking/DockPanelProxy.cs

@@ -71,6 +71,8 @@ namespace FlaxEditor.GUI.Docking
         internal DockPanelProxy(DockPanel panel)
         : base(0, 0, 64, 64)
         {
+            AutoFocus = false;
+
             _panel = panel;
             AnchorPreset = AnchorPresets.StretchAll;
             Offsets = Margin.Zero;

Source/Editor/GUI/Input/ColorValueBox.cs

@@ -129,39 +129,11 @@ namespace FlaxEditor.GUI.Input
         {
             base.Draw();
 
-            bool isTransparent = _value.A < 1;
-
             var style = Style.Current;
-            var fullRect = new Rectangle(0, 0, Width, Height);
-            var colorRect = new Rectangle(0, 0, isTransparent ? Width * 0.7f : Width, Height);
+            var r = new Rectangle(0, 0, Width, Height);
 
-            if (isTransparent)
-            {
-                var alphaRect = new Rectangle(colorRect.Right, 0, Width - colorRect.Right, Height);
-
-                // Draw checkerboard pattern to part of the color value box
-                Render2D.FillRectangle(alphaRect, Color.White);
-                var smallRectSize = 7.9f;
-                var numHor = Mathf.CeilToInt(alphaRect.Width / smallRectSize);
-                var numVer = Mathf.CeilToInt(alphaRect.Height / smallRectSize);
-                for (int i = 0; i < numHor; i++)
-                {
-                    for (int j = 0; j < numVer; j++)
-                    {
-                        if ((i + j) % 2 == 0)
-                        {
-                            var rect = new Rectangle(alphaRect.X + smallRectSize * i, alphaRect.Y + smallRectSize * j, new Float2(smallRectSize));
-                            Render2D.PushClip(alphaRect);
-                            Render2D.FillRectangle(rect, Color.Gray);
-                            Render2D.PopClip();
-                        }
-                    }
-                }
-                Render2D.FillRectangle(alphaRect, _value);
-            }
-
-            Render2D.FillRectangle(colorRect, _value with { A = 1 });
-            Render2D.DrawRectangle(fullRect, IsMouseOver || IsNavFocused ? style.BackgroundSelected : Color.Black);
+            Render2D.FillRectangle(r, _value);
+            Render2D.DrawRectangle(r, IsMouseOver || IsNavFocused ? style.BackgroundSelected : Color.Black);
         }
 
         /// <inheritdoc />

Source/Editor/GUI/Input/SliderControl.cs

@@ -180,7 +180,7 @@ namespace FlaxEditor.GUI.Input
                     Focus();
                     float mousePosition = location.X;
 
-                    if (_thumbRect.Contains(location))
+                    if (_thumbRect.Contains(ref location))
                     {
                         // Start sliding
                         _isSliding = true;
@@ -368,8 +368,6 @@ namespace FlaxEditor.GUI.Input
         public SliderControl(float value, float x = 0, float y = 0, float width = 120, float min = float.MinValue, float max = float.MaxValue)
         : base(x, y, width, TextBox.DefaultHeight)
         {
-            AutoFocus = true;
-
             _min = min;
             _max = max;
             _value = Mathf.Clamp(value, min, max);

Source/Editor/GUI/Timeline/EditCurveTrackGizmo.cs

@@ -144,7 +144,7 @@ namespace FlaxEditor.GUI.Timeline
                 var k = keyframes[i];
 
                 var sphere = new BoundingSphere(k.Value, KeyframeSize);
-                if (sphere.Intersects(selectRay))
+                if (sphere.Intersects(ref selectRay))
                 {
                     SelectKeyframe(_track, i, 0);
                     return;
@@ -154,7 +154,7 @@ namespace FlaxEditor.GUI.Timeline
                 {
                     var t = k.Value + k.TangentIn;
                     var box = BoundingBox.FromSphere(new BoundingSphere(t, TangentSize));
-                    if (box.Intersects(selectRay))
+                    if (box.Intersects(ref selectRay))
                     {
                         SelectKeyframe(_track, i, 1);
                         return;
@@ -165,7 +165,7 @@ namespace FlaxEditor.GUI.Timeline
                 {
                     var t = k.Value + k.TangentOut;
                     var box = BoundingBox.FromSphere(new BoundingSphere(t, TangentSize));
-                    if (box.Intersects(selectRay))
+                    if (box.Intersects(ref selectRay))
                     {
                         SelectKeyframe(_track, i, 2);
                         return;

Source/Editor/GUI/Timeline/GUI/GradientEditor.cs

@@ -115,7 +115,7 @@ namespace FlaxEditor.GUI.Timeline.GUI
             /// <inheritdoc />
             public override void OnMouseMove(Float2 location)
             {
-                if (_isMoving && Float2.DistanceSquared(location, _startMovePos) > 25.0f)
+                if (_isMoving && Float2.DistanceSquared(ref location, ref _startMovePos) > 25.0f)
                 {
                     _startMovePos = Float2.Minimum;
                     var x = PointToParent(location).X;
@@ -387,7 +387,7 @@ namespace FlaxEditor.GUI.Timeline.GUI
         {
             // Push clipping mask
             GetDesireClientArea(out var clientArea);
-            Render2D.PushClip(clientArea);
+            Render2D.PushClip(ref clientArea);
 
             var style = Style.Current;
             var bounds = new Rectangle(Float2.Zero, Size);

Source/Editor/GUI/Timeline/GUI/KeyframesEditor.cs

@@ -115,7 +115,7 @@ namespace FlaxEditor.GUI
                 {
                     if (Children[i] is KeyframePoint p)
                     {
-                        p.IsSelected = p.Bounds.Intersects(selectionRect);
+                        p.IsSelected = p.Bounds.Intersects(ref selectionRect);
                     }
                 }
             }
@@ -401,7 +401,7 @@ namespace FlaxEditor.GUI
                     Cursor = CursorType.Default;
 
                     // Check if no move has been made at all
-                    if (Float2.Distance(location, _rightMouseDownPos) < 2.0f)
+                    if (Float2.Distance(ref location, ref _rightMouseDownPos) < 2.0f)
                     {
                         var selectionCount = _editor.SelectionCount;
                         var point = GetChildAt(location) as KeyframePoint;

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

@@ -50,14 +50,14 @@ namespace FlaxEditor.GUI.Timeline.GUI
             var color = (_timeline.IsMovingPositionHandle ? style.SelectionBorder : style.Foreground).AlphaMultiplied(0.6f);
             Matrix3x3.RotationZ(Mathf.PiOverTwo, out var m1);
             var m2 = Matrix3x3.Translation2D(0, timeAxisHeaderOffset);
-            Matrix3x3.Multiply(m1, m2, out var m3);
-            Render2D.PushTransform(m3);
+            Matrix3x3.Multiply(ref m1, ref m2, out var m3);
+            Render2D.PushTransform(ref m3);
             // 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(textMatrix);
+            Render2D.PushTransform(ref textMatrix);
             Render2D.DrawText(style.FontSmall, labelText, style.Foreground, new Float2(2, -6));
             Render2D.PopTransform();
 

Source/Editor/GUI/Timeline/Media.cs

@@ -356,7 +356,7 @@ namespace FlaxEditor.GUI.Timeline
             {
                 Render2D.DrawLine(bounds.UpperLeft, bounds.BottomLeft, moveColor, moveThickness);
             }
-            else if (IsMouseOver && CanResize && MoveLeftEdgeRect.Contains(_mouseLocation))
+            else if (IsMouseOver && CanResize && MoveLeftEdgeRect.Contains(ref _mouseLocation))
             {
                 Render2D.DrawLine(bounds.UpperLeft, bounds.BottomLeft, Color.Yellow);
             }
@@ -364,7 +364,7 @@ namespace FlaxEditor.GUI.Timeline
             {
                 Render2D.DrawLine(bounds.UpperRight, bounds.BottomRight, moveColor, moveThickness);
             }
-            else if (IsMouseOver && CanResize && MoveRightEdgeRect.Contains(_mouseLocation))
+            else if (IsMouseOver && CanResize && MoveRightEdgeRect.Contains(ref _mouseLocation))
             {
                 Render2D.DrawLine(bounds.UpperRight, bounds.BottomRight, Color.Yellow);
             }
@@ -384,8 +384,8 @@ namespace FlaxEditor.GUI.Timeline
                 _startMoveLocation = Root.MousePosition;
                 _startMoveStartFrame = StartFrame;
                 _startMoveDuration = DurationFrames;
-                _startMoveLeftEdge = MoveLeftEdgeRect.Contains(location) && CanResize;
-                _startMoveRightEdge = MoveRightEdgeRect.Contains(location) && CanResize;
+                _startMoveLeftEdge = MoveLeftEdgeRect.Contains(ref location) && CanResize;
+                _startMoveRightEdge = MoveRightEdgeRect.Contains(ref location) && CanResize;
                 StartMouseCapture(true);
                 if (_startMoveLeftEdge || _startMoveRightEdge)
                     return true;

Source/Editor/GUI/Timeline/SceneAnimationTimeline.cs

@@ -337,7 +337,7 @@ namespace FlaxEditor.GUI.Timeline
                             DebugDraw.DrawSphere(sphere, selected ? Color.Yellow : Color.Red);
                             sphere.Radius *= 0.95f;
                             DebugDraw.DrawSphere(sphere, new Color(1, 0, 0, coveredAlpha), 0, false);
-                            if (select && sphere.Intersects(selectRay))
+                            if (select && sphere.Intersects(ref selectRay))
                                 SelectKeyframeGizmo(curveTrack, i, 0);
 
                             if (!k.TangentIn.IsZero)
@@ -349,7 +349,7 @@ namespace FlaxEditor.GUI.Timeline
                                 var box = BoundingBox.FromSphere(new BoundingSphere(t, EditCurveTrackGizmo.TangentSize));
                                 DebugDraw.DrawBox(box, selected ? Color.Yellow : Color.AliceBlue);
                                 DebugDraw.DrawBox(box, Color.AliceBlue.AlphaMultiplied(coveredAlpha), 0, false);
-                                if (select && box.Intersects(selectRay))
+                                if (select && box.Intersects(ref selectRay))
                                     SelectKeyframeGizmo(curveTrack, i, 2);
                             }
 
@@ -362,7 +362,7 @@ namespace FlaxEditor.GUI.Timeline
                                 var box = BoundingBox.FromSphere(new BoundingSphere(t, EditCurveTrackGizmo.TangentSize));
                                 DebugDraw.DrawBox(box, selected ? Color.Yellow : Color.AliceBlue);
                                 DebugDraw.DrawBox(box, Color.AliceBlue.AlphaMultiplied(coveredAlpha), 0, false);
-                                if (select && box.Intersects(selectRay))
+                                if (select && box.Intersects(ref selectRay))
                                     SelectKeyframeGizmo(curveTrack, i, 2);
                             }