summaryrefslogtreecommitdiff
path: root/scene/3d/skeleton_3d.h
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-05-08 23:06:52 +0200
committerGitHub <noreply@github.com>2021-05-08 23:06:52 +0200
commit7050e4d3077c278bda35d21ed60d7068cc4bc9e9 (patch)
tree79489ce821640080d7804010581ac2f744b9bb51 /scene/3d/skeleton_3d.h
parent60ed7d083989e1e2039e187d51962853b606f8d1 (diff)
parent446460eaf99a34f3a6fd082fb290bf437e877aa9 (diff)
Merge pull request #48166 from TwistedTwigleg/skeletonik_changes_and_bug_fixes_regressionfix3
Fixed issue in SkeletonIK leading to some root bones being twisted incorrectly
Diffstat (limited to 'scene/3d/skeleton_3d.h')
-rw-r--r--scene/3d/skeleton_3d.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/3d/skeleton_3d.h b/scene/3d/skeleton_3d.h
index 2941ac2c45..508cd7c329 100644
--- a/scene/3d/skeleton_3d.h
+++ b/scene/3d/skeleton_3d.h
@@ -83,6 +83,7 @@ private:
Transform pose;
Transform pose_global;
+ Transform pose_global_no_override;
bool custom_pose_enable = false;
Transform custom_pose;
@@ -160,6 +161,7 @@ public:
void set_bone_rest(int p_bone, const Transform &p_rest);
Transform get_bone_rest(int p_bone) const;
Transform get_bone_global_pose(int p_bone) const;
+ Transform get_bone_global_pose_no_override(int p_bone) const;
void clear_bones_global_pose_override();
void set_bone_global_pose_override(int p_bone, const Transform &p_pose, float p_amount, bool p_persistent = false);