Don't write empty buffers

godotengine · Jul 1, 2024 · 07c6e6a · 07c6e6a
1 parent 6febff0
commit 07c6e6a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/gltf/GltfModel.hpp b/src/gltf/GltfModel.hpp
@@ -191,9 +191,14 @@ class GltfModel {
     if (!holder.ptrs.empty()) {
       std::vector<json> bits;
       for (const auto& ptr : holder.ptrs) {
-        bits.push_back(ptr->serialize());
+        json bit = ptr->serialize();
+        if (!bit.empty()) {
+          bits.push_back(ptr->serialize());
+        }
+      }
+      if (!bits.empty()) {
+        glTFJson[key] = bits;
       }
-      glTFJson[key] = bits;
     }
   }
 

diff --git a/src/gltf/properties/BufferData.cpp b/src/gltf/properties/BufferData.cpp
@@ -20,6 +20,10 @@ BufferData::BufferData(
     : Holdable(), isGlb(false), uri(isEmbedded ? "" : std::move(uri)), binData(binData) {}
 
 json BufferData::serialize() const {
+  if (binData->size() == 0) {
+    return json{};
+  }
+
   json result{{"byteLength", binData->size()}};
   if (!isGlb) {
     if (!uri.empty()) {