hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #105920 from TokageItLab/fix-rest-update

Browse source 
Fix rest update process by dirty flag to not take into account pose dirty flag in `Skeleton3D`
This commit is contained in:
Thaddeus Crews 2025-05-19 08:01:34 -05:00
commit 4af69c9d3b
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scene/3d/skeleton_3d.cpp
View file

@ -1116,6 +1116,12 @@ void Skeleton3D::_force_update_bone_children_transforms(int p_bone_idx) const {
// Loop through nested set.
for (int offset = 0; offset < bone_size; offset++) {
if (rest_dirty) {
int current_bone_idx = nested_set_offset_to_bone_index[offset];
Bone &b = bonesptr[current_bone_idx];
b.global_rest = b.parent >= 0 ? bonesptr[b.parent].global_rest * b.rest : b.rest; // Rest needs update apert from pose.
}
if (!bone_global_pose_dirty[offset]) {
continue;
}
@ -1140,9 +1146,6 @@ void Skeleton3D::_force_update_bone_children_transforms(int p_bone_idx) const {
b.global_pose = b.rest;
}
}
if (rest_dirty) {
b.global_rest = b.parent >= 0 ? bonesptr[b.parent].global_rest * b.rest : b.rest;
}
#ifndef DISABLE_DEPRECATED
if (bone_enabled) {