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

# Conflicts: # Source/Engine/GraphicsDevice/Vulkan/GPUSwapChainVulkan.cpp
2026-08-05 08:12:00 +02:00
parent 449c58a05d 70498fa42c
commit 49cb39e1f1
38 changed files with 1420 additions and 120 deletions
@@ -627,8 +627,9 @@ bool MaterialGenerator::Generate(WriteStream& source, MaterialInfo& materialInfo
                if (in.Length() > 0)
                {
                    tmp.EnsureCapacity(in.Length() + 1, false);
-                    StringUtils::ConvertUTF162ANSI(*in, tmp.Get(), in.Length());
+                    StringUtils::ConvertUTF162ASCII(*in, tmp.Get(), in.Length());
                    source.WriteBytes(tmp.Get(), in.Length());
+                    tmp.Clear();
                }
            }
        }