summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-04-16 08:45:10 +0200
committerGitHub <noreply@github.com>2021-04-16 08:45:10 +0200
commitba66569512f8b71a256c9a7a2351d810fa49677f (patch)
treea7d727aff67524ae57c46aec3398b89740c43fb1
parent88015f4e72ccdede184da0ce962651dbb85a0818 (diff)
parentd8b4a6167896d331f3e32c197f7e9b59cfd86e0b (diff)
Merge pull request #47923 from smix8/issue_47850_4.x
Fix Skeleton3D.clear_bones_global_pose_override() not resetting global_bone_overrides properly
-rw-r--r--scene/3d/skeleton_3d.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/scene/3d/skeleton_3d.cpp b/scene/3d/skeleton_3d.cpp
index db5fc7593e..ebbb8985c9 100644
--- a/scene/3d/skeleton_3d.cpp
+++ b/scene/3d/skeleton_3d.cpp
@@ -387,6 +387,7 @@ void Skeleton3D::_notification(int p_what) {
void Skeleton3D::clear_bones_global_pose_override() {
for (int i = 0; i < bones.size(); i += 1) {
bones.write[i].global_pose_override_amount = 0;
+ bones.write[i].global_pose_override_reset = true;
}
_make_dirty();
}