From e0d80b37e94c4518114e16fdc7ee7a9727b58675 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Sun, 14 Aug 2022 21:14:34 -0500 Subject: Don't try to merge unused bone AABBs in the rendering server --- servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'servers/rendering') diff --git a/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp b/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp index dc3f35f942..08cfeb2019 100644 --- a/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp +++ b/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp @@ -416,7 +416,10 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface) mesh->bone_aabbs.resize(p_surface.bone_aabbs.size()); } for (int i = 0; i < p_surface.bone_aabbs.size(); i++) { - mesh->bone_aabbs.write[i].merge_with(p_surface.bone_aabbs[i]); + AABB bone = p_surface.bone_aabbs[i]; + if (!bone.has_no_volume()) { + mesh->bone_aabbs.write[i].merge_with(p_surface.bone_aabbs[i]); + } } mesh->aabb.merge_with(p_surface.aabb); } -- cgit v1.2.3