Merge pull request #77265 from lyuma/aabb_bone_lod_inside

Fix calculation of skinned AABB for unused bones.
godotengine · May 22, 2023 · 05ddc82 · 05ddc82
2 parents 7ed55c8 + 791d800
commit 05ddc82
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/drivers/gles3/storage/mesh_storage.cpp b/drivers/gles3/storage/mesh_storage.cpp
@@ -534,7 +534,7 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
 
  if (skeleton->use_2d) {
  for (int j = 0; j < bs; j++) {
- if (skbones[0].size == Vector3()) {
+ if (skbones[j].size == Vector3(-1, -1, -1)) {
  continue; //bone is unused
  }
 
@@ -561,7 +561,7 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
  }
  } else {
  for (int j = 0; j < bs; j++) {
- if (skbones[0].size == Vector3()) {
+ if (skbones[j].size == Vector3(-1, -1, -1)) {
  continue; //bone is unused
  }
 

diff --git a/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp b/servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
@@ -627,7 +627,7 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
 
  if (skeleton->use_2d) {
  for (int j = 0; j < bs; j++) {
- if (skbones[0].size == Vector3()) {
+ if (skbones[j].size == Vector3(-1, -1, -1)) {
  continue; //bone is unused
  }
 
@@ -654,7 +654,7 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
  }
  } else {
  for (int j = 0; j < bs; j++) {
- if (skbones[0].size == Vector3()) {
+ if (skbones[j].size == Vector3(-1, -1, -1)) {
  continue; //bone is unused
  }