Merge remote-tracking branch 'origin/1.10' into sdl_platform_1.10

# Conflicts:
#	Source/Editor/SceneGraph/Actors/StaticModelNode.cs
#	Source/Engine/Graphics/Models/Mesh.cs
#	Source/Engine/Graphics/Models/ModelData.h

.github/workflows/tests.yml

@@ -73,8 +73,11 @@ jobs:
         .\Development\Scripts\Windows\CallBuildTool.bat -build -log -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxTestsTarget
         dotnet msbuild Source\Tools\Flax.Build.Tests\Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo
     - name: Test
+      shell: pwsh
       run: |
+        $ErrorActionPreference = "Stop"
         .\Binaries\Editor\Win64\Development\FlaxTests.exe
+        if(!$?) { Write-Host "Tests failed with exit code $LastExitCode" -ForegroundColor Red; Exit $LastExitCode }
         dotnet test -f net8.0 Binaries\Tests\Flax.Build.Tests.dll
         xcopy /y Binaries\Editor\Win64\Development\FlaxEngine.CSharp.dll Binaries\Tests
         xcopy /y Binaries\Editor\Win64\Development\FlaxEngine.CSharp.runtimeconfig.json Binaries\Tests

.lfsconfig

@@ -1,4 +1,4 @@
 # Redirect to our own Git LFS server
 [lfs]
-#url="https://gitlab.flaxengine.com/flax/flaxengine.git/info/lfs"
-locksverify = false
+url="https://gitlab.flaxengine.com/flax/flaxengine.git/info/lfs"
+locksverify = false

Content/Editor/MaterialTemplates/Decal.shader

@@ -83,6 +83,12 @@ float3 GetObjectSize(MaterialInput input)
 	return float3(1, 1, 1);
 }
 
+// Gets the current object scale (supports instancing)
+float3 GetObjectScale(MaterialInput input)
+{
+	return float3(1, 1, 1);
+}
+
 // Get the current object random value supports instancing)
 float GetPerInstanceRandom(MaterialInput input)
 {

Content/Editor/MaterialTemplates/Deformable.shader

@@ -207,6 +207,20 @@ float3 GetObjectSize(MaterialInput input)
 	return GeometrySize * float3(world._m00, world._m11, world._m22);
 }
 
+// Gets the current object scale (supports instancing)
+float3 GetObjectScale(MaterialInput input)
+{
+    float4x4 world = WorldMatrix;
+
+    // Extract scale from the world matrix
+    float3 scale;
+    scale.x = length(float3(world._11, world._12, world._13));
+    scale.y = length(float3(world._21, world._22, world._23));
+    scale.z = length(float3(world._31, world._32, world._33));
+
+    return scale;
+}
+
 // Get the current object random value
 float GetPerInstanceRandom(MaterialInput input)
 {
@@ -297,7 +311,7 @@ VertexOutput VS_SplineModel(ModelInput input)
 	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 
 	// Pass vertex attributes
-	output.Geometry.TexCoord = input.TexCoord;
+	output.Geometry.TexCoord = input.TexCoord0;
 #if USE_VERTEX_COLOR
 	output.Geometry.VertexColor = input.Color;
 #endif

Content/Editor/MaterialTemplates/GPUParticles.shader

@@ -140,7 +140,7 @@ void SetParticleVec4(uint particleIndex, int offset, float4 value)
 bool AddParticle(out uint dstIndex)
 {
 	// Acquire the particle index in the destination buffer
-	DstParticlesData.InterlockedAdd(ParticleCounterOffset, 1, dstIndex);
+	DstParticlesData.InterlockedAdd(ParticleCounterOffset, 1u, dstIndex);
 	
 	// Prevent overflow
 	return dstIndex >= PARTICLE_CAPACITY;

Content/Editor/MaterialTemplates/GUI.shader

@@ -163,6 +163,12 @@ float3 GetObjectSize(MaterialInput input)
 	return float3(1, 1, 1);
 }
 
+// Gets the current object scale (supports instancing)
+float3 GetObjectScale(MaterialInput input)
+{
+	return float3(1, 1, 1);
+}
+
 // Get the current object random value supports instancing)
 float GetPerInstanceRandom(MaterialInput input)
 {

Content/Editor/MaterialTemplates/Particle.shader

@@ -299,24 +299,22 @@ half3x3 CalcTangentToLocal(ModelInput input)
 	float3 normal = input.Normal.xyz * 2.0 - 1.0;
 	float3 tangent = input.Tangent.xyz * 2.0 - 1.0;
 	float3 bitangent = cross(normal, tangent) * bitangentSign;
-	return float3x3(tangent, bitangent, normal);
+	return (half3x3)float3x3(tangent, bitangent, normal);
 }
 
 half3x3 CalcTangentToWorld(in float4x4 world, in half3x3 tangentToLocal)
 {
-	half3x3 localToWorld = RemoveScaleFromLocalToWorld((float3x3)world);
+	half3x3 localToWorld = (half3x3)RemoveScaleFromLocalToWorld((float3x3)world);
 	return mul(tangentToLocal, localToWorld); 
 }
 
-float3 GetParticlePosition(uint ParticleIndex)
+float3 GetParticlePosition(uint particleIndex)
 {
-	return TransformParticlePosition(GetParticleVec3(ParticleIndex, PositionOffset));
+	return TransformParticlePosition(GetParticleVec3(particleIndex, PositionOffset));
 }
 
 // Vertex Shader function for Sprite Rendering
 META_VS(true, FEATURE_LEVEL_ES2)
-META_VS_IN_ELEMENT(POSITION, 0, R32G32_FLOAT, 0, 0,     PER_VERTEX, 0, true)
-META_VS_IN_ELEMENT(TEXCOORD, 0, R32G32_FLOAT, 0, ALIGN, PER_VERTEX, 0, true)
 VertexOutput VS_Sprite(SpriteInput input, uint particleIndex : SV_InstanceID)
 {
 	VertexOutput output;
@@ -407,7 +405,7 @@ VertexOutput VS_Sprite(SpriteInput input, uint particleIndex : SV_InstanceID)
 	output.InstanceParams = PerInstanceRandom;
 
 	// Calculate tanget space to world space transformation matrix for unit vectors
-	half3x3 tangentToLocal = float3x3(axisX, axisY, axisZ);
+	half3x3 tangentToLocal = half3x3(axisX, axisY, axisZ);
 	half3x3 tangentToWorld = CalcTangentToWorld(world, tangentToLocal);
 	output.TBN = tangentToWorld;
 
@@ -516,7 +514,7 @@ VertexOutput VS_Model(ModelInput input, uint particleIndex : SV_InstanceID)
 	output.Position = mul(float4(output.WorldPosition, 1), ViewProjectionMatrix);
 
 	// Pass vertex attributes
-	output.TexCoord = input.TexCoord;
+	output.TexCoord = input.TexCoord0;
 	output.ParticleIndex = particleIndex;
 #if USE_VERTEX_COLOR
 	output.VertexColor = input.Color;
@@ -612,7 +610,7 @@ VertexOutput VS_Ribbon(RibbonInput input, uint vertexIndex : SV_VertexID)
 	{
 		output.TexCoord.x = (float)input.Order / (float)RibbonSegmentCount;
 	}
-	output.TexCoord.y = (vertexIndex + 1) & 0x1;
+	output.TexCoord.y = (float)((vertexIndex + 1) & 0x1);
 	output.TexCoord = output.TexCoord * RibbonUVScale + RibbonUVOffset;
 
 	// Compute world space vertex position
@@ -631,7 +629,7 @@ VertexOutput VS_Ribbon(RibbonInput input, uint vertexIndex : SV_VertexID)
 	output.InstanceParams = PerInstanceRandom;
 
 	// Calculate tanget space to world space transformation matrix for unit vectors
-	half3x3 tangentToLocal = float3x3(tangentRight, tangentUp, cross(tangentRight, tangentUp));
+	half3x3 tangentToLocal = half3x3(tangentRight, tangentUp, cross(tangentRight, tangentUp));
 	half3x3 tangentToWorld = CalcTangentToWorld(world, tangentToLocal);
 	output.TBN = tangentToWorld;
 

Content/Editor/MaterialTemplates/Surface.shader

@@ -2,6 +2,7 @@
 // Version: @0
 
 #define MATERIAL 1
+#define MATERIAL_TEXCOORDS 4
 #define USE_PER_VIEW_CONSTANTS 1
 #define USE_PER_DRAW_CONSTANTS 1
 @3
@@ -24,21 +25,29 @@ Buffer<float4> BoneMatrices : register(t1);
 Buffer<float4> PrevBoneMatrices : register(t2);
 #endif
 #endif
+
 // Geometry data passed though the graphics rendering stages up to the pixel shader
 struct GeometryData
 {
 	float3 WorldPosition : TEXCOORD0;
-	float2 TexCoord : TEXCOORD1;
-	float2 LightmapUV : TEXCOORD2;
+	float4 TexCoords01 : TEXCOORD1;
+	float4 TexCoords23 : TEXCOORD2;
+	float2 LightmapUV : TEXCOORD3;
 #if USE_VERTEX_COLOR
 	half4 VertexColor : COLOR;
 #endif
-	float3 WorldNormal : TEXCOORD3;
-	float4 WorldTangent : TEXCOORD4;
+	float3 WorldNormal : TEXCOORD4;
+	float4 WorldTangent : TEXCOORD5;
 	float3 PrevWorldPosition : TEXCOORD7;
 	nointerpolation uint ObjectIndex : TEXCOORD8;
 };
 
+float3 DecodeNormal(float4 normalMap)
+{
+    float2 xy = normalMap.rg * 2.0 - 1.0;
+    return float3(xy, sqrt(1.0 - saturate(dot(xy, xy))));
+}
+
 // Interpolants passed from the vertex shader
 struct VertexOutput
 {
@@ -68,7 +77,7 @@ struct MaterialInput
 {
 	float3 WorldPosition;
 	float TwoSidedSign;
-	float2 TexCoord;
+	float2 TexCoords[MATERIAL_TEXCOORDS];
 #if USE_LIGHTMAP
 	float2 LightmapUV;
 #endif
@@ -86,12 +95,18 @@ struct MaterialInput
 #endif
 };
 
+// Map access to the main texure coordinate channel as UV0
+#define TexCoord TexCoords[0]
+
 // Extracts geometry data to the material input
 MaterialInput GetGeometryMaterialInput(GeometryData geometry)
 {
 	MaterialInput output = (MaterialInput)0;
 	output.WorldPosition = geometry.WorldPosition;
-	output.TexCoord = geometry.TexCoord;
+	output.TexCoords[0] = geometry.TexCoords01.xy;
+	output.TexCoords[1] = geometry.TexCoords01.zw;
+	output.TexCoords[2] = geometry.TexCoords23.xy;
+	output.TexCoords[3] = geometry.TexCoords23.zw;
 #if USE_LIGHTMAP
 	output.LightmapUV = geometry.LightmapUV;
 #endif
@@ -126,8 +141,8 @@ MaterialInput GetGeometryMaterialInput(GeometryData geometry)
 GeometryData InterpolateGeometry(GeometryData p0, float w0, GeometryData p1, float w1, GeometryData p2, float w2)
 {
 	GeometryData output = (GeometryData)0;
-	output.TexCoord = p0.TexCoord * w0 + p1.TexCoord * w1 + p2.TexCoord * w2;
-	output.LightmapUV = p0.LightmapUV * w0 + p1.LightmapUV * w1 + p2.LightmapUV * w2;
+	output.TexCoords01 = p0.TexCoords01 * w0 + p1.TexCoords01 * w1 + p2.TexCoords01 * w2;
+	output.TexCoords23 = p0.TexCoords23 * w0 + p1.TexCoords23 * w1 + p2.TexCoords23 * w2;
 #if USE_VERTEX_COLOR
 	output.VertexColor = p0.VertexColor * w0 + p1.VertexColor * w1 + p2.VertexColor * w2;
 #endif
@@ -223,6 +238,24 @@ float3 GetObjectSize(MaterialInput input)
 	return input.Object.GeometrySize * float3(world._m00, world._m11, world._m22);
 }
 
+// Gets the current object scale (supports instancing)
+float3 GetObjectScale(MaterialInput input)
+{
+    float4x4 world = input.Object.WorldMatrix;
+
+    // Get the squares of the scale factors
+    float scaleXSquared = dot(world[0].xyz, world[0].xyz);
+    float scaleYSquared = dot(world[1].xyz, world[1].xyz);
+    float scaleZSquared = dot(world[2].xyz, world[2].xyz);
+
+    // Take square root to get actual scales
+    return float3(
+        sqrt(scaleXSquared),
+        sqrt(scaleYSquared),
+        sqrt(scaleZSquared)
+    );
+}
+
 // Get the current object random value (supports instancing)
 float GetPerInstanceRandom(MaterialInput input)
 {
@@ -312,14 +345,15 @@ VertexOutput VS(ModelInput input)
 	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 
 	// Pass vertex attributes
-	output.Geometry.TexCoord = input.TexCoord;
+	output.Geometry.TexCoords01 = float4(input.TexCoord0, input.TexCoord1);
+	output.Geometry.TexCoords23 = float4(input.TexCoord2, input.TexCoord3);
 #if USE_VERTEX_COLOR
 	output.Geometry.VertexColor = input.Color;
 #endif
 #if CAN_USE_LIGHTMAP
 	output.Geometry.LightmapUV = input.LightmapUV * object.LightmapArea.zw + object.LightmapArea.xy;
 #else
-	output.Geometry.LightmapUV = input.LightmapUV;
+	output.Geometry.LightmapUV = float2(0, 0);
 #endif
 
 	// Calculate tanget space to world space transformation matrix for unit vectors
@@ -459,7 +493,7 @@ META_VS_IN_ELEMENT(TEXCOORD,     0, R16G16_FLOAT,      0, ALIGN, PER_VERTEX, 0,
 META_VS_IN_ELEMENT(NORMAL,       0, R10G10B10A2_UNORM, 0, ALIGN, PER_VERTEX, 0, true)
 META_VS_IN_ELEMENT(TANGENT,      0, R10G10B10A2_UNORM, 0, ALIGN, PER_VERTEX, 0, true)
 META_VS_IN_ELEMENT(BLENDINDICES, 0, R8G8B8A8_UINT,     0, ALIGN, PER_VERTEX, 0, true)
-META_VS_IN_ELEMENT(BLENDWEIGHT,  0, R16G16B16A16_FLOAT,0, ALIGN, PER_VERTEX, 0, true)
+META_VS_IN_ELEMENT(BLENDWEIGHTS, 0, R16G16B16A16_FLOAT,0, ALIGN, PER_VERTEX, 0, true)
 VertexOutput VS_Skinned(ModelInput_Skinned input)
 {
 	VertexOutput output;
@@ -486,9 +520,10 @@ VertexOutput VS_Skinned(ModelInput_Skinned input)
 	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 
 	// Pass vertex attributes
-	output.Geometry.TexCoord = input.TexCoord;
+	output.Geometry.TexCoords01 = float4(input.TexCoord0, input.TexCoord1);
+	output.Geometry.TexCoords23 = float4(input.TexCoord2, input.TexCoord3);
 #if USE_VERTEX_COLOR
-	output.Geometry.VertexColor = float4(0, 0, 0, 1);
+	output.Geometry.VertexColor = input.Color;
 #endif
 	output.Geometry.LightmapUV = float2(0, 0);
 

Content/Editor/MaterialTemplates/Terrain.shader

@@ -236,6 +236,12 @@ float3 GetObjectSize(MaterialInput input)
 	return float3(1, 1, 1);
 }
 
+// Gets the current object scale (supports instancing)
+float3 GetObjectScale(MaterialInput input)
+{
+	return float3(1, 1, 1);
+}
+
 // Get the current object random value
 float GetPerInstanceRandom(MaterialInput input)
 {
@@ -319,8 +325,6 @@ struct TerrainVertexInput
 
 // Vertex Shader function for terrain rendering
 META_VS(true, FEATURE_LEVEL_ES2)
-META_VS_IN_ELEMENT(TEXCOORD, 0, R32G32_FLOAT,   0, ALIGN, PER_VERTEX, 0, true)
-META_VS_IN_ELEMENT(TEXCOORD, 1, R8G8B8A8_UNORM, 0, ALIGN, PER_VERTEX, 0, true)
 VertexOutput VS(TerrainVertexInput input)
 {
 	VertexOutput output;

Flax.flaxproj

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

Flax.sln.DotSettings

@@ -237,6 +237,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/GrammarAndSpelling/GrammarChecking/Exceptions/=Try_0020to_0020scripting/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/GrammarAndSpelling/GrammarChecking/RulesStates/=LanguageTool_002EEN_002EE_005FG/@EntryIndexedValue">DisabledByUser</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/Todo/TodoPatterns/=EEA05B0ED8200E4BA9D2D3F1052EBFFD/@KeyIndexDefined">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/Todo/TodoPatterns/=EEA05B0ED8200E4BA9D2D3F1052EBFFD/Color/@EntryValue">Blue</s:String>

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!

GenerateProjectFiles.command

@@ -14,4 +14,4 @@ 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,FlaxGame
+Binaries/Tools/Flax.Build -build -BuildBindingsOnly -arch=ARM64 -platform=Mac --buildTargets=FlaxEditor

GenerateProjectFiles.sh

@@ -14,4 +14,4 @@ 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,FlaxGame
+Binaries/Tools/Flax.Build -build -BuildBindingsOnly -arch=x64 -platform=Linux --buildTargets=FlaxEditor

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

@@ -8,6 +8,7 @@
 #include "Engine/Core/Math/Color32.h"
 #include "Engine/Core/Config/GameSettings.h"
 #include "Editor/Utilities/EditorUtilities.h"
+#include "Engine/Graphics/PixelFormatSampler.h"
 #include "Engine/Graphics/Textures/TextureData.h"
 #include "Engine/Tools/TextureTool/TextureTool.h"
 #include "Engine/Content/Content.h"
@@ -240,7 +241,7 @@ void UpdateIconData(uint8* iconData, const TextureData* icon)
     const TextureMipData* srcPixels = icon->GetData(0, srcPixelsMip);
     const Color32* srcPixelsData = (Color32*)srcPixels->Data.Get();
     const Int2 srcPixelsSize(Math::Max(1, icon->Width >> srcPixelsMip), Math::Max(1, icon->Height >> srcPixelsMip));
-    const auto sampler = TextureTool::GetSampler(icon->Format);
+    const auto sampler = PixelFormatSampler::Get(icon->Format);
     ASSERT_LOW_LAYER(sampler);
 
     // Write colors
@@ -252,7 +253,7 @@ void UpdateIconData(uint8* iconData, const TextureData* icon)
         for (uint32 x = 0; x < width; x++)
         {
             float u = (float)x / width;
-            const Color c = TextureTool::SampleLinear(sampler, Float2(u, v), srcPixelsData, srcPixelsSize, srcPixels->RowPitch);
+            const Color c = sampler->SampleLinear(srcPixelsData, Float2(u, v), srcPixelsSize, srcPixels->RowPitch);
             colorData[idx++] = Color32(c).GetAsBGRA();
         }
     }
@@ -271,7 +272,7 @@ void UpdateIconData(uint8* iconData, const TextureData* icon)
             {
                 uint32 x = packedX * 8 + pixelIdx;
                 float u = (float)x / width;
-                const Color c = TextureTool::SampleLinear(sampler, Float2(u, v), srcPixelsData, srcPixelsSize, srcPixels->RowPitch);
+                const Color c = sampler->SampleLinear(srcPixelsData, Float2(u, v), srcPixelsSize, srcPixels->RowPitch);
                 if (c.A < 0.25f)
                     mask |= 1 << (7 - pixelIdx);
             }
@@ -322,7 +323,7 @@ bool UpdateExeIcon(const String& path, const TextureData& icon)
     const TextureData* iconRGBA8 = &icon;
     TextureData tmpData1;
     //if (icon.Format != PixelFormat::R8G8B8A8_UNorm)
-    if (TextureTool::GetSampler(icon.Format) == nullptr)
+    if (PixelFormatSampler::Get(icon.Format) == nullptr)
     {
         if (TextureTool::Convert(tmpData1, *iconRGBA8, PixelFormat::R8G8B8A8_UNorm))
         {

Source/Editor/Cooker/Steps/CookAssetsStep.cpp

@@ -137,10 +137,7 @@ void CookAssetsStep::CacheData::Load(CookingData& data)
     if (!FileSystem::DirectoryExists(CacheFolder))
         FileSystem::CreateDirectory(CacheFolder);
     if (!FileSystem::FileExists(HeaderFilePath))
-    {
-        LOG(Warning, "Missing incremental build cooking assets cache.");
         return;
-    }
 
     auto file = FileReadStream::Open(HeaderFilePath);
     if (file == nullptr)
@@ -158,7 +155,7 @@ void CookAssetsStep::CacheData::Load(CookingData& data)
 
     LOG(Info, "Loading incremental build cooking cache (entries count: {0})", entriesCount);
     file->ReadBytes(&Settings, sizeof(Settings));
-    Entries.EnsureCapacity(Math::RoundUpToPowerOf2(static_cast<int32>(entriesCount * 3.0f)));
+    Entries.EnsureCapacity(entriesCount);
 
     Array<Pair<String, DateTime>> fileDependencies;
     for (int32 i = 0; i < entriesCount; i++)
@@ -166,7 +163,7 @@ void CookAssetsStep::CacheData::Load(CookingData& data)
         Guid id;
         file->Read(id);
         String typeName;
-        file->ReadString(&typeName);
+        file->Read(typeName);
         DateTime fileModified;
         file->Read(fileModified);
         int32 fileDependenciesCount;
@@ -176,7 +173,7 @@ void CookAssetsStep::CacheData::Load(CookingData& data)
         for (int32 j = 0; j < fileDependenciesCount; j++)
         {
             Pair<String, DateTime>& f = fileDependencies[j];
-            file->ReadString(&f.First, 10);
+            file->Read(f.First, 10);
             file->Read(f.Second);
         }
 
@@ -311,9 +308,9 @@ void CookAssetsStep::CacheData::Save(CookingData& data)
     {
         auto& e = i->Value;
         file->Write(e.ID);
-        file->WriteString(e.TypeName);
+        file->Write(e.TypeName);
         file->Write(e.FileModified);
-        file->WriteInt32(e.FileDependencies.Count());
+        file->Write(e.FileDependencies.Count());
         for (auto& f : e.FileDependencies)
         {
             file->Write(f.First, 10);
@@ -365,17 +362,27 @@ bool CookAssetsStep::ProcessDefaultAsset(AssetCookData& options)
 
 bool CookAssetsStep::Process(CookingData& data, CacheData& cache, Asset* asset)
 {
-    // Validate asset
+    PROFILE_CPU_ASSET(asset);
     if (asset->IsVirtual())
     {
         // Virtual assets are not included into the build
         return false;
     }
+    const bool wasLoaded = asset->IsLoaded();
     if (asset->WaitForLoaded())
     {
         LOG(Error, "Failed to load asset \'{0}\'", asset->ToString());
         return true;
     }
+    if (!wasLoaded)
+    {
+        // HACK: give some time to resave any old assets in Asset::onLoad after it's loaded
+        // This assumes that if Load Thread enters Asset::Save then it will get asset lock and hold it until asset is saved
+        // So we can take the same lock to wait for save end but first we need to wait for it to get that lock
+        // (in future try to handle it in a better way)
+        Platform::Sleep(5);
+    }
+    ScopeLock lock(asset->Locker);
 
     // Switch based on an asset type
     const auto asBinaryAsset = dynamic_cast<BinaryAsset*>(asset);
@@ -793,7 +800,10 @@ bool CookAssetsStep::Process(CookingData& data, CacheData& cache, BinaryAsset* a
     // Prepare asset data
     AssetInitData initData;
     if (asset->Storage->LoadAssetHeader(asset->GetID(), initData))
+    {
+        LOG(Warning, "Failed to load asset {} header from storage '{}'", asset->GetID(), asset->Storage->GetPath());
         return true;
+    }
     initData.Header.UnlinkChunks();
     initData.Metadata.Release();
     for (auto& e : initData.Dependencies)
@@ -1165,7 +1175,7 @@ bool CookAssetsStep::Perform(CookingData& data)
         assetRef = Content::LoadAsync<Asset>(assetId);
         if (assetRef == nullptr)
         {
-            data.Error(TEXT("Failed to load asset included in build."));
+            LOG(Error, "Failed to load asset {} included in build", assetId);
             return true;
         }
         e.Info.TypeName = assetRef->GetTypeName();
@@ -1173,6 +1183,7 @@ bool CookAssetsStep::Perform(CookingData& data)
         // Cook asset
         if (Process(data, cache, assetRef.Get()))
         {
+            LOG(Error, "Failed to process asset {}", assetRef->ToString());
             cache.Save(data);
             return true;
         }
@@ -1205,10 +1216,17 @@ bool CookAssetsStep::Perform(CookingData& data)
         // Copy file
         if (!FileSystem::FileExists(cookedPath) || FileSystem::GetFileLastEditTime(cookedPath) >= FileSystem::GetFileLastEditTime(filePath))
         {
-            if (FileSystem::CreateDirectory(StringUtils::GetDirectoryName(cookedPath)))
+            const String cookedFolder = StringUtils::GetDirectoryName(cookedPath);
+            if (FileSystem::CreateDirectory(cookedFolder))
+            {
+                LOG(Error, "Failed to create directory '{}'", cookedFolder);
                 return true;
+            }
             if (FileSystem::CopyFile(cookedPath, filePath))
+            {
+                LOG(Error, "Failed to copy file from '{}' to '{}'", filePath, cookedPath);
                 return true;
+            }
         }
 
         // Count stats of file extension
@@ -1249,7 +1267,7 @@ bool CookAssetsStep::Perform(CookingData& data)
         *(int32*)(bytes.Get() + 804) = contentKey;
         *(Guid*)(bytes.Get() + 808) = gameSettings->SplashScreen;
         Encryption::EncryptBytes(bytes.Get(), bytes.Count());
-        stream->WriteArray(bytes);
+        stream->Write(bytes);
 
         Delete(stream);
     }
@@ -1277,8 +1295,6 @@ bool CookAssetsStep::Perform(CookingData& data)
             assetStats.Count++;
             assetStats.ContentSize += FileSystem::GetFileSize(cookedFilePath);
 
-            LOG(Info, "Cooked size of {0}: {1}KB", assetId, (FileSystem::GetFileSize(cookedFilePath) / (1024)));
-
             if (packageBuilder.Add(data, i->Value, cookedFilePath))
                 return true;
         }

Source/Editor/Cooker/Steps/DeployDataStep.cpp

@@ -213,38 +213,59 @@ bool DeployDataStep::Perform(CookingData& data)
                 }
                 FileSystem::NormalizePath(srcDotnet);
                 LOG(Info, "Using .NET Runtime {} at {}", TEXT("Host"), srcDotnet);
+                const bool srcDotnetFromEngine = srcDotnet.Contains(TEXT("Source/Platforms"));
+                String packFolder = srcDotnet / TEXT("../../../");
 
-                // Get major Version
-                Array<String> pathParts;
-                srcDotnet.Split('/', pathParts);
+                // Get .NET runtime version
                 String version;
-                for (int i = 0; i < pathParts.Count(); i++)
                 {
-                    if (pathParts[i] == TEXT("runtimes"))
+                    // Detect from path provided by build tool
+                    Array<String> pathParts;
+                    srcDotnet.Split('/', pathParts);
+                    for (int32 i = 1; i < pathParts.Count(); i++)
                     {
-                        Array<String> versionParts;
-                        pathParts[i - 1].Split('.', versionParts);
-                        if (!versionParts.IsEmpty())
+                        if (pathParts[i] == TEXT("runtimes"))
                         {
-                            const String majorVersion = versionParts[0].TrimTrailing();
-                            int32 versionNum;
-                            StringUtils::Parse(*majorVersion, majorVersion.Length(), &versionNum);
-                            if (Math::IsInRange(versionNum, GAME_BUILD_DOTNET_RUNTIME_MIN_VER, GAME_BUILD_DOTNET_RUNTIME_MAX_VER)) // Check for major part
-                                version = majorVersion;
+                            Array<String> versionParts;
+                            pathParts[i - 1].Split('.', versionParts);
+                            if (!versionParts.IsEmpty())
+                            {
+                                const String majorVersion = versionParts[0].TrimTrailing();
+                                int32 versionNum;
+                                StringUtils::Parse(*majorVersion, majorVersion.Length(), &versionNum);
+                                if (Math::IsInRange(versionNum, GAME_BUILD_DOTNET_RUNTIME_MIN_VER, GAME_BUILD_DOTNET_RUNTIME_MAX_VER)) // Check for major part
+                                    version = majorVersion;
+                            }
+                        }
+                    }
+                    if (version.IsEmpty())
+                    {
+                        if (srcDotnetFromEngine)
+                        {
+                            // Detect version from runtime files inside Engine Platform folder
+                            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);
+                                String testPath2 = packFolder / String::Format(TEXT("Dotnet/lib/net{}.0"), i);
+                                if ((FileSystem::DirectoryExists(testPath1) && FileSystem::GetDirectorySize(testPath1) > 0) ||
+                                    (FileSystem::DirectoryExists(testPath2) && FileSystem::GetDirectorySize(testPath2) > 0))
+                                {
+                                    version = StringUtils::ToString(i);
+                                    break;
+                                }
+                            }
+                        }
+                        if (version.IsEmpty())
+                        {
+                            data.Error(TEXT("Failed to find supported .NET version for the current host platform."));
+                            return true;
                         }
                     }
                 }
 
-                if (version.IsEmpty())
-                {
-                    data.Error(TEXT("Failed to find supported .NET version for the current host platform."));
-                    return true;
-                }
-
                 // Deploy runtime files
                 const Char* corlibPrivateName = TEXT("System.Private.CoreLib.dll");
-                const bool srcDotnetFromEngine = srcDotnet.Contains(TEXT("Source/Platforms"));
-                String packFolder = srcDotnet / TEXT("../../../");
                 String dstDotnetLibs = dstDotnet, srcDotnetLibs = srcDotnet;
                 StringUtils::PathRemoveRelativeParts(packFolder);
                 if (usAOT)
@@ -415,9 +436,9 @@ bool DeployDataStep::Perform(CookingData& data)
     data.AddRootEngineAsset(TEXT("Engine/Textures/NormalTexture"));
     data.AddRootEngineAsset(TEXT("Engine/Textures/BlackTexture"));
     data.AddRootEngineAsset(TEXT("Engine/Textures/WhiteTexture"));
-    //data.AddRootEngineAsset(TEXT("Engine/Textures/DefaultLensStarburst"));
-    //data.AddRootEngineAsset(TEXT("Engine/Textures/DefaultLensColor"));
-    //data.AddRootEngineAsset(TEXT("Engine/Textures/DefaultLensDirt"));
+    data.AddRootEngineAsset(TEXT("Engine/Textures/DefaultLensStarburst"));
+    data.AddRootEngineAsset(TEXT("Engine/Textures/DefaultLensColor"));
+    data.AddRootEngineAsset(TEXT("Engine/Textures/DefaultLensDirt"));
     data.AddRootEngineAsset(TEXT("Engine/Textures/Bokeh/Circle"));
     data.AddRootEngineAsset(TEXT("Engine/Textures/Bokeh/Hexagon"));
     data.AddRootEngineAsset(TEXT("Engine/Textures/Bokeh/Octagon"));

Source/Editor/CustomEditors/CustomEditorPresenter.cs

@@ -195,15 +195,6 @@ namespace FlaxEditor.CustomEditors
                 Presenter.AfterLayout?.Invoke(layout);
             }
 
-            /// <inheritdoc />
-            protected override void Deinitialize()
-            {
-                Editor = null;
-                _overrideEditor = null;
-
-                base.Deinitialize();
-            }
-
             /// <inheritdoc />
             protected override void OnModified()
             {

Source/Editor/CustomEditors/CustomEditorsUtil.cpp

@@ -39,14 +39,9 @@ CustomEditorsUtilService CustomEditorsUtilServiceInstance;
 
 struct Entry
 {
-    MClass* DefaultEditor;
-    MClass* CustomEditor;
-
-    Entry()
-    {
-        DefaultEditor = nullptr;
-        CustomEditor = nullptr;
-    }
+    MClass* DefaultEditor = nullptr;
+    MClass* CustomEditor = nullptr;
+    MType* CustomEditorType = nullptr;
 };
 
 Dictionary<MType*, Entry> Cache(512);
@@ -63,11 +58,11 @@ MTypeObject* CustomEditorsUtil::GetCustomEditor(MTypeObject* refType)
     Entry result;
     if (Cache.TryGet(type, result))
     {
+        if (result.CustomEditorType)
+            return INTERNAL_TYPE_GET_OBJECT(result.CustomEditorType);
         MClass* editor = result.CustomEditor ? result.CustomEditor : result.DefaultEditor;
         if (editor)
-        {
             return MUtils::GetType(editor);
-        }
     }
     return nullptr;
 }
@@ -157,7 +152,7 @@ void OnAssemblyLoaded(MAssembly* assembly)
         else if (typeClass)
         {
             auto& entry = Cache[mclass->GetType()];
-            entry.CustomEditor = typeClass;
+            entry.CustomEditorType = type;
 
             //LOG(Info, "Custom Editor {0} for type {1}", String(typeClass->GetFullName()), String(mclass->GetFullName()));
         }

Source/Editor/CustomEditors/Dedicated/ActorEditor.cs

@@ -69,8 +69,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                         Values.SetReferenceValue(prefabInstance);
 
                         // Display prefab UI (when displaying object inside Prefab Window then display only nested prefabs)
-                        var prefabId = prefab.ID;
-                        Editor.GetPrefabNestedObject(ref prefabId, ref 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.CustomContainer<UniformGridPanel>();
                         panel.CustomControl.Height = 20.0f;
@@ -206,7 +205,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             if (_linkedPrefabId != Guid.Empty)
             {
                 _linkedPrefabId = Guid.Empty;
-                Editor.Instance.Prefabs.PrefabApplying -= OnPrefabApplying;
+                Editor.Instance.Prefabs.PrefabApplied -= OnPrefabApplying;
                 Editor.Instance.Prefabs.PrefabApplied -= OnPrefabApplied;
             }
         }

Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs

@@ -1057,7 +1057,6 @@ namespace FlaxEditor.CustomEditors.Dedicated
         protected override void Deinitialize()
         {
             _scriptToggles = null;
-            _scripts.Clear();
 
             base.Deinitialize();
         }

Source/Editor/CustomEditors/Dedicated/SplineEditor.cs

@@ -92,7 +92,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             {
                 if (IsLinearTangentMode(spline, index) || IsSmoothInTangentMode(spline, index) || IsSmoothOutTangentMode(spline, index))
                 {
-                    SetPointSmooth(spline, index);
+                    SetPointSmooth(Editor, spline, index);
                 }
             }
         }
@@ -145,7 +145,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             {
                 if (!IsAlignedTangentMode(spline, index))
                 {
-                    SetPointSmooth(spline, index);
+                    SetPointSmooth(Editor, spline, index);
                 }
             }
 
@@ -176,7 +176,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             /// <inheritdoc/>
             public override void OnSetMode(Spline spline, int index)
             {
-                SetTangentSmoothIn(spline, index);
+                SetTangentSmoothIn(Editor, spline, index);
                 Editor.SetSelectTangentIn(spline, index);
             }
         }
@@ -190,7 +190,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             /// <inheritdoc/>
             public override void OnSetMode(Spline spline, int index)
             {
-                SetTangentSmoothOut(spline, index);
+                SetTangentSmoothOut(Editor, spline, index);
                 Editor.SetSelectTangentOut(spline, index);
             }
         }
@@ -756,14 +756,15 @@ namespace FlaxEditor.CustomEditors.Dedicated
             spline.UpdateSpline();
         }
 
-        private static void SetTangentSmoothIn(Spline spline, int index)
+        private static void SetTangentSmoothIn(SplineEditor editor, 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 cameraTransform = editor.Presenter.Owner.PresenterViewport.ViewTransform.Translation;
+                var smoothRange = SplineNode.NodeSizeByDistance(spline.GetSplineTangent(index, false).Translation, 10f, cameraTransform);
                 var previousKeyframe = spline.GetSplineKeyframe(index - 1);
                 var tangentDirection = keyframe.Value.WorldToLocalVector(previousKeyframe.Value.Translation - keyframe.Value.Translation);
                 tangentDirection = tangentDirection.Normalized * smoothRange;
@@ -775,14 +776,15 @@ namespace FlaxEditor.CustomEditors.Dedicated
             spline.UpdateSpline();
         }
 
-        private static void SetTangentSmoothOut(Spline spline, int index)
+        private static void SetTangentSmoothOut(SplineEditor editor, 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 cameraTransform = editor.Presenter.Owner.PresenterViewport.ViewTransform.Translation;
+                var smoothRange = SplineNode.NodeSizeByDistance(spline.GetSplineTangent(index, false).Translation, 10f, cameraTransform);
                 var nextKeyframe = spline.GetSplineKeyframe(index + 1);
                 var tangentDirection = keyframe.Value.WorldToLocalVector(nextKeyframe.Value.Translation - keyframe.Value.Translation);
                 tangentDirection = tangentDirection.Normalized * smoothRange;
@@ -795,7 +797,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             spline.UpdateSpline();
         }
 
-        private static void SetPointSmooth(Spline spline, int index)
+        private static void SetPointSmooth(SplineEditor editor, Spline spline, int index)
         {
             var keyframe = spline.GetSplineKeyframe(index);
             var tangentInSize = keyframe.TangentIn.Translation.Length;
@@ -803,7 +805,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
 
             var isLastKeyframe = index >= spline.SplinePointsCount - 1;
             var isFirstKeyframe = index <= 0;
-            var smoothRange = SplineNode.NodeSizeByDistance(spline.GetSplinePoint(index), 10f);
+            var cameraTransform = editor.Presenter.Owner.PresenterViewport.ViewTransform.Translation;
+            var smoothRange = SplineNode.NodeSizeByDistance(spline.GetSplinePoint(index), 10f, cameraTransform);
 
             // Force smooth it's linear point
             if (tangentInSize == 0f)

Source/Editor/CustomEditors/Editors/AssetRefEditor.cs

@@ -95,7 +95,7 @@ namespace FlaxEditor.CustomEditors.Editors
             if (assetReference != null)
             {
                 if (assetReference.UseSmallPicker)
-                    height = 32;
+                    height = 36;
                 if (string.IsNullOrEmpty(assetReference.TypeName))
                 {
                 }

Source/Editor/CustomEditors/Editors/ControlReferenceEditor.cs

@@ -0,0 +1,84 @@
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEditor.CustomEditors.Elements;
+using FlaxEditor.Scripting;
+using FlaxEngine;
+using FlaxEngine.GUI;
+using Object = FlaxEngine.Object;
+
+namespace FlaxEditor.CustomEditors.Editors;
+
+/// <summary>
+/// The reference picker control used for UIControls using ControlReference.
+/// </summary>
+internal class UIControlRefPickerControl : FlaxObjectRefPickerControl
+{
+    /// <summary>
+    /// Type of the control to pick.
+    /// </summary>
+    public Type ControlType;
+
+    /// <inheritdoc />
+    protected override bool IsValid(Object obj)
+    {
+        return obj == null || (obj is UIControl control && control.Control.GetType() == ControlType);
+    }
+}
+
+/// <summary>
+/// ControlReferenceEditor class.
+/// </summary>
+[CustomEditor(typeof(ControlReference<>)), DefaultEditor]
+internal class ControlReferenceEditor : CustomEditor
+{
+    private CustomElement<UIControlRefPickerControl> _element;
+
+    /// <inheritdoc />
+    public override DisplayStyle Style => DisplayStyle.Inline;
+
+    /// <inheritdoc />
+    public override void Initialize(LayoutElementsContainer layout)
+    {
+        if (!HasDifferentTypes)
+        {
+            _element = layout.Custom<UIControlRefPickerControl>();
+            if (ValuesTypes == null || ValuesTypes[0] == null)
+            {
+                Editor.LogWarning("ControlReference needs to be assigned in code.");
+                return;
+            }
+            Type genType = ValuesTypes[0].GetGenericArguments()[0];
+            if (typeof(Control).IsAssignableFrom(genType))
+            {
+                _element.CustomControl.PresenterContext = Presenter.Owner;
+                _element.CustomControl.ControlType = genType;
+                _element.CustomControl.Type = new ScriptType(typeof(UIControl));
+            }
+            _element.CustomControl.ValueChanged += () =>
+            {
+                Type genericType = ValuesTypes[0].GetGenericArguments()[0];
+                if (typeof(Control).IsAssignableFrom(genericType))
+                {
+                    Type t = typeof(ControlReference<>);
+                    Type tw = t.MakeGenericType(new Type[] { genericType });
+                    var instance = Activator.CreateInstance(tw);
+                    ((IControlReference)instance).UIControl = (UIControl)_element.CustomControl.Value;
+                    SetValue(instance);
+                }
+            };
+        }
+    }
+
+    /// <inheritdoc />
+    public override void Refresh()
+    {
+        base.Refresh();
+
+        if (!HasDifferentValues)
+        {
+            if (Values[0] is IControlReference cr)
+                _element.CustomControl.Value = cr.UIControl;
+        }
+    }
+}

Source/Editor/CustomEditors/Editors/FlaxObjectRefEditor.cs

@@ -48,7 +48,7 @@ namespace FlaxEditor.CustomEditors.Editors
         public IPresenterOwner PresenterContext;
 
         /// <summary>
-        /// Gets or sets the allowed objects type (given type and all sub classes). Must be <see cref="Object"/> type of any subclass.
+        /// Gets or sets the allowed objects type (given type and all subclasses). Must be <see cref="Object"/> type of any subclass.
         /// </summary>
         public ScriptType Type
         {
@@ -61,7 +61,8 @@ namespace FlaxEditor.CustomEditors.Editors
                     throw new ArgumentException(string.Format("Invalid type for FlaxObjectRefEditor. Input type: {0}", value != ScriptType.Null ? value.TypeName : "null"));
 
                 _type = value;
-                _supportsPickDropDown = new ScriptType(typeof(Actor)).IsAssignableFrom(value) || new ScriptType(typeof(Script)).IsAssignableFrom(value);
+                _supportsPickDropDown = new ScriptType(typeof(Actor)).IsAssignableFrom(value) || 
+                                        new ScriptType(typeof(Script)).IsAssignableFrom(value);
 
                 // Deselect value if it's not valid now
                 if (!IsValid(_value))
@@ -80,7 +81,7 @@ namespace FlaxEditor.CustomEditors.Editors
                 if (_value == value)
                     return;
                 if (!IsValid(value))
-                    throw new ArgumentException("Invalid object type.");
+                    value = null;
 
                 // Special case for missing objects (eg. referenced actor in script that is deleted in editor)
                 if (value != null && (Object.GetUnmanagedPtr(value) == IntPtr.Zero || value.ID == Guid.Empty))
@@ -91,27 +92,17 @@ namespace FlaxEditor.CustomEditors.Editors
 
                 // Get name to display
                 if (_value is Script script)
-                {
                     _valueName = script.Actor ? $"{type.Name} ({script.Actor.Name})" : type.Name;
-                }
                 else if (_value != null)
-                {
                     _valueName = _value.ToString();
-                }
                 else
-                {
                     _valueName = string.Empty;
-                }
 
                 // Update tooltip
                 if (_value is SceneObject sceneObject)
-                {
                     TooltipText = Utilities.Utils.GetTooltip(sceneObject);
-                }
                 else
-                {
                     TooltipText = string.Empty;
-                }
 
                 OnValueChanged();
             }
@@ -150,7 +141,12 @@ namespace FlaxEditor.CustomEditors.Editors
             _type = ScriptType.Object;
         }
 
-        private bool IsValid(Object obj)
+        /// <summary>
+        /// Object validation check routine.
+        /// </summary>
+        /// <param name="obj">Input object to check.</param>
+        /// <returns>True if it can be assigned, otherwise false.</returns>
+        protected virtual bool IsValid(Object obj)
         {
             var type = TypeUtils.GetObjectType(obj);
             return obj == null || _type.IsAssignableFrom(type) && (CheckValid == null || CheckValid(obj, type));
@@ -168,6 +164,15 @@ namespace FlaxEditor.CustomEditors.Editors
                     Focus();
                 }, PresenterContext);
             }
+            else if (new ScriptType(typeof(Control)).IsAssignableFrom(_type))
+            {
+                ActorSearchPopup.Show(this, new Float2(0, Height), IsValid, actor =>
+                {
+                    Value = actor as UIControl;
+                    RootWindow.Focus();
+                    Focus();
+                }, PresenterContext);
+            }
             else
             {
                 ScriptSearchPopup.Show(this, new Float2(0, Height), IsValid, script =>
@@ -199,7 +204,7 @@ namespace FlaxEditor.CustomEditors.Editors
             var frameRect = new Rectangle(0, 0, Width, 16);
             if (isSelected)
                 frameRect.Width -= 16;
-            if (_supportsPickDropDown)
+            if (_supportsPickDropDown && isEnabled)
                 frameRect.Width -= 16;
             var nameRect = new Rectangle(2, 1, frameRect.Width - 4, 14);
             var button1Rect = new Rectangle(nameRect.Right + 2, 1, 14, 14);
@@ -235,7 +240,7 @@ namespace FlaxEditor.CustomEditors.Editors
             }
 
             // Draw picker button
-            if (_supportsPickDropDown)
+            if (_supportsPickDropDown && isEnabled)
             {
                 var pickerRect = isSelected ? button2Rect : button1Rect;
                 Render2D.DrawSprite(style.ArrowDown, pickerRect, isEnabled && pickerRect.Contains(_mousePos) ? style.Foreground : style.ForegroundGrey);
@@ -400,20 +405,9 @@ namespace FlaxEditor.CustomEditors.Editors
 
                 // Select object
                 if (_value is Actor actor)
-                {
-                    if (PresenterContext is PropertiesWindow)
-                        Editor.Instance.SceneEditing.Select(actor);
-                    else if (PresenterContext is PrefabWindow prefabWindow)
-                        prefabWindow.Select(prefabWindow.Graph.Root.Find(actor));
-                }
+                    Select(actor);
                 else if (_value is Script script && script.Actor)
-                {
-                    var a = script.Actor;
-                    if (PresenterContext is PropertiesWindow)
-                        Editor.Instance.SceneEditing.Select(a);
-                    else if (PresenterContext is PrefabWindow prefabWindow)
-                        prefabWindow.Select(prefabWindow.Graph.Root.Find(a));
-                }
+                    Select(script.Actor);
                 else if (_value is Asset asset)
                     Editor.Instance.Windows.ContentWin.Select(asset);
             }
@@ -431,6 +425,14 @@ namespace FlaxEditor.CustomEditors.Editors
                 ShowDropDownMenu();
         }
 
+        private void Select(Actor actor)
+        {
+            if (PresenterContext is PropertiesWindow)
+                Editor.Instance.SceneEditing.Select(actor);
+            else if (PresenterContext is PrefabWindow prefabWindow)
+                prefabWindow.Select(prefabWindow.Graph.Root.Find(actor));
+        }
+
         private void DoDrag()
         {
             // Do the drag drop operation if has selected element

Source/Editor/CustomEditors/Editors/GenericEditor.cs

@@ -819,15 +819,6 @@ namespace FlaxEditor.CustomEditors.Editors
             OnGroupsEnd();
         }
 
-        /// <inheritdoc />
-        protected override void Deinitialize()
-        {
-            _visibleIfCaches = null;
-            _visibleIfPropertiesListsCache = null;
-
-            base.Deinitialize();
-        }
-
         /// <inheritdoc />
         public override void Refresh()
         {

Source/Editor/CustomEditors/Editors/GuidEditor.cs

@@ -36,7 +36,7 @@ namespace FlaxEditor.CustomEditors.Editors
 
                 float height = 48;
                 if (assetReference.UseSmallPicker)
-                    height = 32;
+                    height = 36;
 
                 if (string.IsNullOrEmpty(assetReference.TypeName))
                 {

Source/Editor/Editor.Build.cs

@@ -41,6 +41,9 @@ public class Editor : EditorModule
         options.ScriptingAPI.SystemReferences.Add("System.Xml.ReaderWriter");
         options.ScriptingAPI.SystemReferences.Add("System.Text.RegularExpressions");
         options.ScriptingAPI.SystemReferences.Add("System.IO.Compression.ZipFile");
+        options.ScriptingAPI.SystemReferences.Add("System.Diagnostics.Process");
+        if (Profiler.Use(options))
+            options.ScriptingAPI.Defines.Add("USE_PROFILER");
 
         // Enable optimizations for Editor, disable this for debugging the editor
         if (options.Configuration == TargetConfiguration.Development)

Source/Editor/Editor.cpp

@@ -79,10 +79,6 @@ bool Editor::CheckProjectUpgrade()
             Delete(file);
         }
     }
-    else
-    {
-        LOG(Warning, "Missing version cache file");
-    }
 
     // Check if project is in the old, deprecated layout
     if (EditorImpl::IsOldProjectXmlFormat)
@@ -403,7 +399,7 @@ int32 Editor::LoadProduct()
     }
 
     // Create new project option
-    if (CommandLine::Options.NewProject)
+    if (CommandLine::Options.NewProject.IsTrue())
     {
         Array<String> projectFiles;
         FileSystem::DirectoryGetFiles(projectFiles, projectPath, TEXT("*.flaxproj"), DirectorySearchOption::TopDirectoryOnly);
@@ -428,7 +424,7 @@ int32 Editor::LoadProduct()
             }
         }
     }
-    if (CommandLine::Options.NewProject)
+    if (CommandLine::Options.NewProject.IsTrue())
     {
         if (projectPath.IsEmpty())
             projectPath = Platform::GetWorkingDirectory();
@@ -529,7 +525,7 @@ int32 Editor::LoadProduct()
     if (projectPath.IsEmpty())
     {
 #if PLATFORM_HAS_HEADLESS_MODE
-        if (CommandLine::Options.Headless)
+        if (CommandLine::Options.Headless.IsTrue())
         {
             Platform::Fatal(TEXT("Missing project path."));
             return -1;
@@ -612,7 +608,7 @@ int32 Editor::LoadProduct()
     // Validate project min supported version (older engine may try to load newer project)
     // Special check if project specifies only build number, then major/minor fields are set to 0
     const auto engineVersion = FLAXENGINE_VERSION;
-    for (auto e : projects)
+    for (const auto& e : projects)
     {
         const auto project = e.Item;
         if (project->MinEngineVersion > engineVersion ||
@@ -657,7 +653,7 @@ Window* Editor::CreateMainWindow()
 bool Editor::Init()
 {
     // Scripts project files generation from command line
-    if (CommandLine::Options.GenProjectFiles)
+    if (CommandLine::Options.GenProjectFiles.IsTrue())
     {
         const String customArgs = TEXT("-verbose -log -logfile=\"Cache/Intermediate/ProjectFileLog.txt\"");
         const bool failed = ScriptsBuilder::GenerateProject(customArgs);

Source/Editor/Editor.cs

@@ -1550,9 +1550,9 @@ namespace FlaxEditor
                 // Handle case when Game window is not selected in tab view
                 var dockedTo = gameWin.ParentDockPanel;
                 if (dockedTo != null && dockedTo.SelectedTab != gameWin && dockedTo.SelectedTab != null)
-                    result = dockedTo.SelectedTab.Size * root.DpiScale;
+                    result = dockedTo.SelectedTab.Size;
                 else
-                    result = gameWin.Viewport.Size * root.DpiScale;
+                    result = gameWin.Viewport.Size;
 
                 result = Float2.Round(result);
             }

Source/Editor/GUI/ContextMenu/ContextMenu.cs

@@ -355,14 +355,14 @@ namespace FlaxEditor.GUI.ContextMenu
         }
 
         /// <inheritdoc />
-        public override void Show(Control parent, Float2 location)
+        public override void Show(Control parent, Float2 location, ContextMenuDirection? direction = null)
         {
             // Remove last separator to make context menu look better
             int lastIndex = _panel.Children.Count - 1;
             if (lastIndex >= 0 && _panel.Children[lastIndex] is ContextMenuSeparator separator)
                 separator.Dispose();
 
-            base.Show(parent, location);
+            base.Show(parent, location, direction);
         }
 
         /// <inheritdoc />

Source/Editor/GUI/ContextMenu/ContextMenuBase.cs

@@ -101,6 +101,16 @@ namespace FlaxEditor.GUI.ContextMenu
         /// </summary>
         public List<Window> ExternalPopups = new List<Window>();
 
+        /// <summary>
+        /// Optional flag that can disable popup visibility based on window focus and use external control via Hide.
+        /// </summary>
+        public bool UseVisibilityControl = true;
+
+        /// <summary>
+        /// Optional flag that can disable popup input capturing. Useful for transparent or visual-only popups.
+        /// </summary>
+        public bool UseInput = true;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ContextMenuBase"/> class.
         /// </summary>
@@ -137,21 +147,26 @@ namespace FlaxEditor.GUI.ContextMenu
         /// </summary>
         /// <param name="parent">Parent control to attach to it.</param>
         /// <param name="location">Popup menu origin location in parent control coordinates.</param>
-        public virtual void Show(Control parent, Float2 location)
+        /// <param name="direction">The custom popup direction. Null to use automatic direction.</param>
+        public virtual void Show(Control parent, Float2 location, ContextMenuDirection? direction = null)
         {
             Assert.IsNotNull(parent);
-
-            // Ensure to be closed
-            Hide();
+            bool isAlreadyVisible = Visible && _window;
+            if (!isAlreadyVisible)
+                Hide();
 
             // Peek parent control window
             var parentWin = parent.RootWindow;
             if (parentWin == null)
+            {
+                Hide();
                 return;
+            }
 
             // Check if show menu inside the other menu - then link as a child to prevent closing the calling menu window on lost focus
             if (_parentCM == null && parentWin.ChildrenCount == 1 && parentWin.Children[0] is ContextMenuBase parentCM)
             {
+                Hide();
                 parentCM.ShowChild(this, parentCM.PointFromScreen(parent.PointToScreen(location)), false);
                 return;
             }
@@ -169,7 +184,7 @@ namespace FlaxEditor.GUI.ContextMenu
             var monitorBounds = Platform.GetMonitorBounds(locationSS);
             var rightBottomLocationSS = locationSS + dpiSize;
             bool isUp = false, isLeft = false;
-            if (UseAutomaticDirectionFix)
+            if (UseAutomaticDirectionFix && direction == null)
             {
                 var parentMenu = parent as ContextMenu;
                 if (monitorBounds.Bottom < rightBottomLocationSS.Y)
@@ -196,6 +211,26 @@ namespace FlaxEditor.GUI.ContextMenu
                         locationSS.X -= dpiSize.X;
                 }
             }
+            else if (direction.HasValue)
+            {
+                switch (direction.Value)
+                {
+                case ContextMenuDirection.RightUp:
+                    isUp = true;
+                    break;
+                case ContextMenuDirection.LeftDown:
+                    isLeft = true;
+                    break;
+                case ContextMenuDirection.LeftUp:
+                    isLeft = true;
+                    isUp = true;
+                    break;
+                }
+                if (isLeft)
+                    locationSS.X -= dpiSize.X;
+                if (isUp)
+                    locationSS.Y -= dpiSize.Y;
+            }
 
             // Update direction flag
             if (isUp)
@@ -203,47 +238,62 @@ namespace FlaxEditor.GUI.ContextMenu
             else
                 _direction = isLeft ? ContextMenuDirection.LeftDown : ContextMenuDirection.RightDown;
 
-            // Create window
-            var desc = CreateWindowSettings.Default;
-            desc.Position = locationSS;
-            desc.StartPosition = WindowStartPosition.Manual;
-            desc.Size = dpiSize;
-            desc.Fullscreen = false;
-            desc.HasBorder = false;
-            desc.SupportsTransparency = false;
-            desc.ShowInTaskbar = false;
-            desc.ActivateWhenFirstShown = true;
-            desc.AllowInput = true;
-            desc.AllowMinimize = false;
-            desc.AllowMaximize = false;
-            desc.AllowDragAndDrop = false;
-            desc.IsTopmost = true;
-            desc.Type = WindowType.Popup;
-            desc.Parent = parentWin.Window;
-            desc.Title = "ContextMenu";
-            desc.HasSizingFrame = false;
-            OnWindowCreating(ref desc);
-            _window = Platform.CreateWindow(ref desc);
-            _window.GotFocus += OnWindowGotFocus;
-            _window.LostFocus += OnWindowLostFocus;
+            if (isAlreadyVisible)
+            {
+                _window.ClientBounds = new Rectangle(locationSS, dpiSize);
+            }
+            else
+            {
+                // Create window
+                var desc = CreateWindowSettings.Default;
+                desc.Position = locationSS;
+                desc.StartPosition = WindowStartPosition.Manual;
+                desc.Size = dpiSize;
+                desc.Fullscreen = false;
+                desc.HasBorder = false;
+                desc.SupportsTransparency = false;
+                desc.ShowInTaskbar = false;
+                desc.ActivateWhenFirstShown = UseInput;
+                desc.AllowInput = UseInput;
+                desc.AllowMinimize = false;
+                desc.AllowMaximize = false;
+                desc.AllowDragAndDrop = false;
+                desc.IsTopmost = true;
+                desc.Type = WindowType.Popup;
+                desc.Parent = parentWin.Window;
+                desc.Title = "ContextMenu";
+                desc.HasSizingFrame = false;
+                OnWindowCreating(ref desc);
+                _window = Platform.CreateWindow(ref desc);
+                if (UseVisibilityControl)
+                {
+                    _window.GotFocus += OnWindowGotFocus;
+                    _window.LostFocus += OnWindowLostFocus;
+                }
 
 #if USE_IS_FOREGROUND && USE_SDL_WORKAROUNDS
-            // The focus between popup and parent windows doesn't change, force hide the popup when clicked on parent
-            parentWin.Window.MouseDown += OnWindowMouseDown;
-            _window.Closed += () => parentWin.Window.MouseDown -= OnWindowMouseDown;
+                // The focus between popup and parent windows doesn't change, force hide the popup when clicked on parent
+                parentWin.Window.MouseDown += OnWindowMouseDown;
+                _window.Closed += () => parentWin.Window.MouseDown -= OnWindowMouseDown;
 #endif
 
-            // Attach to the window
-            _parentCM = parent as ContextMenuBase;
-            Parent = _window.GUI;
+                // Attach to the window
+                _parentCM = parent as ContextMenuBase;
+                Parent = _window.GUI;
+            }
 
             // Show
             Visible = true;
+            if (_window == null)
+                return;
             _window.Show();
             PerformLayout();
-            _previouslyFocused = parentWin.FocusedControl;
-            Focus();
-            OnShow();
+            if (UseVisibilityControl)
+            {
+                _previouslyFocused = parentWin.FocusedControl;
+                Focus();
+                OnShow();
+            }
         }
 
         /// <summary>
@@ -508,7 +558,7 @@ namespace FlaxEditor.GUI.ContextMenu
             base.Update(deltaTime);
 
             // Let root context menu to check if none of the popup windows
-            if (_parentCM == null && !IsForeground)
+            if (_parentCM == null && UseVisibilityControl && !IsForeground)
             {
 #if USE_SDL_WORKAROUNDS
                 if (!IsMouseOver)

Source/Editor/GUI/Docking/DockWindow.cs

@@ -486,7 +486,7 @@ namespace FlaxEditor.GUI.Docking
         {
             base.Focus();
 
-            SelectTab(false);
+            SelectTab();
             BringToFront();
         }
 

Source/Editor/GUI/ItemsListContextMenu.cs

@@ -56,6 +56,11 @@ namespace FlaxEditor.GUI
             /// </summary>
             public event Action<Item> Clicked;
 
+            /// <summary>
+            /// Occurs when items gets focused.
+            /// </summary>
+            public event Action<Item> Focused;
+
             /// <summary>
             /// The tint color of the text.
             /// </summary>
@@ -141,6 +146,10 @@ namespace FlaxEditor.GUI
             protected virtual void GetTextRect(out Rectangle rect)
             {
                 rect = new Rectangle(2, 0, Width - 4, Height);
+
+                // Indent for drop panel items is handled by drop panel margin
+                if (Parent is not DropPanel)
+                    rect.Location += new Float2(Editor.Instance.Icons.ArrowRight12.Size.X + 2, 0);
             }
 
             /// <inheritdoc />
@@ -155,10 +164,6 @@ namespace FlaxEditor.GUI
                 if (IsMouseOver || IsFocused)
                     Render2D.FillRectangle(new Rectangle(Float2.Zero, Size), style.BackgroundHighlighted);
 
-                // Indent for drop panel items is handled by drop panel margin
-                if (Parent is not DropPanel)
-                    textRect.Location += new Float2(Editor.Instance.Icons.ArrowRight12.Size.X + 2, 0);
-
                 // Draw all highlights
                 if (_highlights != null)
                 {
@@ -207,6 +212,14 @@ namespace FlaxEditor.GUI
                 base.OnMouseLeave();
             }
 
+            /// <inheritdoc />
+            public override void OnGotFocus()
+            {
+                base.OnGotFocus();
+
+                Focused?.Invoke(this);
+            }
+
             /// <inheritdoc />
             public override int Compare(Control other)
             {
@@ -227,6 +240,7 @@ namespace FlaxEditor.GUI
         private readonly Panel _scrollPanel;
         private List<DropPanel> _categoryPanels;
         private bool _waitingForInput;
+        private string _customSearch;
 
         /// <summary>
         /// Event fired when any item in this popup menu gets clicked.
@@ -248,26 +262,30 @@ namespace FlaxEditor.GUI
         /// </summary>
         /// <param name="width">The control width.</param>
         /// <param name="height">The control height.</param>
-        public ItemsListContextMenu(float width = 320, float height = 220)
+        /// <param name="withSearch">Enables search field.</param>
+        public ItemsListContextMenu(float width = 320, float height = 220, bool withSearch = true)
         {
             // Context menu dimensions
             Size = new Float2(width, height);
 
-            // Search box
-            _searchBox = new SearchBox(false, 1, 1)
+            if (withSearch)
             {
-                Parent = this,
-                Width = Width - 3,
-            };
-            _searchBox.TextChanged += OnSearchFilterChanged;
-            _searchBox.ClearSearchButton.Clicked += () => PerformLayout();
+                // Search box
+                _searchBox = new SearchBox(false, 1, 1)
+                {
+                    Parent = this,
+                    Width = Width - 3,
+                };
+                _searchBox.TextChanged += OnSearchFilterChanged;
+                _searchBox.ClearSearchButton.Clicked += () => PerformLayout();
+            }
 
             // Panel with scrollbar
             _scrollPanel = new Panel(ScrollBars.Vertical)
             {
                 Parent = this,
                 AnchorPreset = AnchorPresets.StretchAll,
-                Bounds = new Rectangle(0, _searchBox.Bottom + 1, Width, Height - _searchBox.Bottom - 2),
+                Bounds = withSearch ? new Rectangle(0, _searchBox.Bottom + 1, Width, Height - _searchBox.Bottom - 2) : new Rectangle(Float2.Zero, Size),
             };
 
             // Items list panel
@@ -286,12 +304,13 @@ namespace FlaxEditor.GUI
 
             LockChildrenRecursive();
 
+            var searchText = _searchBox?.Text ?? _customSearch;
             var items = ItemsPanel.Children;
             for (int i = 0; i < items.Count; i++)
             {
                 if (items[i] is Item item)
                 {
-                    item.UpdateFilter(_searchBox.Text);
+                    item.UpdateFilter(searchText);
                     item.UpdateScore();
                 }
             }
@@ -305,13 +324,13 @@ namespace FlaxEditor.GUI
                     {
                         if (category.Children[j] is Item item2)
                         {
-                            item2.UpdateFilter(_searchBox.Text);
+                            item2.UpdateFilter(searchText);
                             item2.UpdateScore();
                             anyVisible |= item2.Visible;
                         }
                     }
                     category.Visible = anyVisible;
-                    if (string.IsNullOrEmpty(_searchBox.Text))
+                    if (string.IsNullOrEmpty(searchText))
                         category.Close(false);
                     else
                         category.Open(false);
@@ -322,8 +341,8 @@ namespace FlaxEditor.GUI
 
             UnlockChildrenRecursive();
             PerformLayout(true);
-            _searchBox.Focus();
-            TextChanged?.Invoke(_searchBox.Text);
+            _searchBox?.Focus();
+            TextChanged?.Invoke(searchText);
         }
 
         /// <summary>
@@ -355,6 +374,14 @@ namespace FlaxEditor.GUI
             }
         }
 
+        /// <summary>
+        /// Removes all added items.
+        /// </summary>
+        public void ClearItems()
+        {
+            ItemsPanel.DisposeChildren();
+        }
+
         /// <summary>
         /// Sorts the items list (by item name by default).
         /// </summary>
@@ -368,6 +395,34 @@ namespace FlaxEditor.GUI
             }
         }
 
+        /// <summary>
+        /// Focuses and scroll to the given item to be selected.
+        /// </summary>
+        /// <param name="item">The item to select.</param>
+        public void SelectItem(Item item)
+        {
+            item.Focus();
+            ScrollViewTo(item);
+        }
+
+        /// <summary>
+        /// Applies custom search text query on the items list. Works even if search field is disabled
+        /// </summary>
+        /// <param name="text">The custom search text. Null to clear search.</param>
+        public void Search(string text)
+        {
+            if (_searchBox != null)
+            {
+                _searchBox.SetText(text);
+            }
+            else
+            {
+                _customSearch = text;
+                if (VisibleInHierarchy)
+                    OnSearchFilterChanged();
+            }
+        }
+
         /// <summary>
         /// Adds the item to the view and registers for the click event.
         /// </summary>
@@ -446,9 +501,11 @@ namespace FlaxEditor.GUI
                 }
             }
 
-            _searchBox.Clear();
+            _searchBox?.Clear();
             UnlockChildrenRecursive();
             PerformLayout(true);
+            if (_customSearch != null)
+                OnSearchFilterChanged();
         }
 
         private List<Item> GetVisibleItems()
@@ -510,7 +567,7 @@ namespace FlaxEditor.GUI
                 if (RootWindow.FocusedControl == null)
                 {
                     // Focus search box if nothing is focused
-                    _searchBox.Focus();
+                    _searchBox?.Focus();
                     return true;
                 }
 
@@ -536,7 +593,7 @@ namespace FlaxEditor.GUI
                     var focusedIndex = items.IndexOf(focusedItem);
                     if (focusedIndex == 0)
                     {
-                        _searchBox.Focus();
+                        _searchBox?.Focus();
                     }
                     else if (focusedIndex > 0)
                     {
@@ -556,7 +613,7 @@ namespace FlaxEditor.GUI
                 break;
             }
 
-            if (_waitingForInput)
+            if (_waitingForInput && _searchBox != null)
             {
                 _waitingForInput = false;
                 _searchBox.Focus();