godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #77265 from lyuma/aabb_bone_lod_inside

Browse Source 
Fix calculation of skinned AABB for unused bones.
This commit is contained in:
Rémi Verschelde
2023-05-22 13:49:19 +02:00
parent 7ed55c8833 791d8001db
commit 05ddc822fb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gles3/storage/mesh_storage.cpp
View File

@@ -534,7 +534,7 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
if (skeleton->use_2d) { if (skeleton->use_2d) {
for (int j = 0; j < bs; j++) { for (int j = 0; j < bs; j++) {
if (skbones[0].size == Vector3()) { if (skbones[j].size == Vector3(-1, -1, -1)) {
continue; //bone is unused continue; //bone is unused
} }
@@ -561,7 +561,7 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
} }
} else { } else {
for (int j = 0; j < bs; j++) { for (int j = 0; j < bs; j++) {
if (skbones[0].size == Vector3()) { if (skbones[j].size == Vector3(-1, -1, -1)) {
continue; //bone is unused continue; //bone is unused
} }

4
servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
View File

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