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

2025-06-16 14:09:29 +03:00
parent 88d2b72822 3c74b315a8
commit 6ff260d052
65 changed files with 3633 additions and 880 deletions
--- a/Source/Editor/Modules/ContentDatabaseModule.cs
+++ b/Source/Editor/Modules/ContentDatabaseModule.cs
@@ -1135,6 +1135,7 @@ namespace FlaxEditor.Modules
            Proxy.Add(new FontProxy());
            Proxy.Add(new ShaderProxy());
            Proxy.Add(new ShaderSourceProxy());
+            Proxy.Add(new ShaderHeaderProxy());
            Proxy.Add(new ParticleEmitterProxy());
            Proxy.Add(new ParticleEmitterFunctionProxy());
            Proxy.Add(new ParticleSystemProxy());