fix aabb errors on meshes with bones on multiple surfaces

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/gles3/storage/mesh_storage.cpp b/drivers/gles3/storage/mesh_storage.cpp
index 285f32f1a5..5bbbc7b91b 100644
--- a/drivers/gles3/storage/mesh_storage.cpp
+++ b/drivers/gles3/storage/mesh_storage.cpp
@@ -334,7 +334,14 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface)
 		for (int i = 0; i < p_surface.bone_aabbs.size(); i++) {
 			const AABB &bone = p_surface.bone_aabbs[i];
 			if (bone.has_volume()) {
-				mesh->bone_aabbs.write[i].merge_with(bone);
+				AABB &mesh_bone = mesh->bone_aabbs.write[i];
+				if (mesh_bone != AABB()) {
+					// Already initialized, merge AABBs.
+					mesh_bone.merge_with(bone);
+				} else {
+					// Not yet initialized, copy the bone AABB.
+					mesh_bone = bone;
+				}
 			}
 		}
 		mesh->aabb.merge_with(p_surface.aabb);