From 72f13e0593d2014a585aa9d6c5f69e3af3a0ae80 Mon Sep 17 00:00:00 2001
From: nikitalita <69168929+nikitalita@users.noreply.github.com>
Date: Tue, 30 Dec 2025 18:51:18 -0800
Subject: [PATCH] GLTF: zero out padding bytes when encoding buffer views

---
 modules/gltf/structures/gltf_buffer_view.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/gltf/structures/gltf_buffer_view.cpp b/modules/gltf/structures/gltf_buffer_view.cpp
index 832934de62..2758309a11 100644
--- a/modules/gltf/structures/gltf_buffer_view.cpp
+++ b/modules/gltf/structures/gltf_buffer_view.cpp
@@ -154,10 +154,15 @@ GLTFBufferViewIndex GLTFBufferView::write_new_buffer_view_into_state(const Ref<G
 	// This is used by accessors. The byte offset of an accessor MUST be a multiple of the accessor's component size.
 	// https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#data-alignment
 	int64_t byte_offset = state_buffer.size();
+	int64_t padding_bytes = 0;
 	if (byte_offset % p_alignment != 0) {
-		byte_offset += p_alignment - (byte_offset % p_alignment);
+		padding_bytes = p_alignment - (byte_offset % p_alignment);
+		byte_offset += padding_bytes;
 	}
 	state_buffer.resize(byte_offset + input_data_size);
+	if (padding_bytes > 0) {
+		memset(state_buffer.ptrw() + (byte_offset - padding_bytes), 0, padding_bytes);
+	}
 	uint8_t *buffer_ptr = state_buffer.ptrw();
 	memcpy(buffer_ptr + byte_offset, p_input_data.ptr(), input_data_size);
 	state_buffers.set(p_buffer_index, state_buffer);