godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77194 from lyuma/pose_global_no_override

Browse Source 
Fix get_bone_pose_global_no_override()
This commit is contained in:
Yuri Sizov 2023-05-18 18:55:00 +02:00 committed by GitHub
commit ca8bbf24ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/3d/skeleton_3d.cpp
View File

@ -932,18 +932,18 @@ void Skeleton3D::force_update_bone_children_transforms(int p_bone_idx) {
if (b.parent >= 0) { if (b.parent >= 0) {
b.pose_global = bonesptr[b.parent].pose_global * pose; b.pose_global = bonesptr[b.parent].pose_global * pose;
b.pose_global_no_override = b.pose_global; b.pose_global_no_override = bonesptr[b.parent].pose_global_no_override * pose;
} else { } else {
b.pose_global = pose; b.pose_global = pose;
b.pose_global_no_override = b.pose_global; b.pose_global_no_override = pose;
} }
} else { } else {
if (b.parent >= 0) { if (b.parent >= 0) {
b.pose_global = bonesptr[b.parent].pose_global * b.rest; b.pose_global = bonesptr[b.parent].pose_global * b.rest;
b.pose_global_no_override = b.pose_global; b.pose_global_no_override = bonesptr[b.parent].pose_global_no_override * b.rest;
} else { } else {
b.pose_global = b.rest; b.pose_global = b.rest;
b.pose_global_no_override = b.pose_global; b.pose_global_no_override = b.rest;
} }
} }
if (rest_dirty) { if (rest_dirty) {