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

# Conflicts: # Content/Editor/DebugMaterials/DDGIDebugProbes.flax # Source/Engine/Scripting/Scripting.cpp
2025-08-25 23:48:08 +02:00
parent 26f4bcbc25 4ca399af71
commit 826009c1b4
121 changed files with 2016 additions and 1305 deletions
--- a/Source/Engine/Content/Assets/ModelBase.cpp
+++ b/Source/Engine/Content/Assets/ModelBase.cpp
@@ -332,7 +332,7 @@ bool ModelBase::LoadHeader(ReadStream& stream, byte& headerVersion)
        stream.Read(slot.Name, 11);
    }

-    return false;
+    return stream.HasError();
 }

 bool ModelBase::LoadMesh(MemoryReadStream& stream, byte meshVersion, MeshBase* mesh, MeshData* dataIfReadOnly)