summaryrefslogtreecommitdiff
path: root/scene/animation
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-05-23 07:58:27 +0200
committerGitHub <noreply@github.com>2019-05-23 07:58:27 +0200
commitc088386c5b5e7631ce670cb4fa0e6563d29d0973 (patch)
tree1ae4f1cb3c9d1aae5aa406811472a5d6a902fc07 /scene/animation
parent1acc918166e653eb4121868e8000991e9485ac83 (diff)
parent88153fbb6109f897ec3eac2180cdb757502aebb4 (diff)
Merge pull request #29109 from RandomShaper/fix_onion_skinning
Fix onion skinning
Diffstat (limited to 'scene/animation')
-rw-r--r--scene/animation/animation_player.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index a5955d57f7..75088c79fe 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -37,12 +37,20 @@
#ifdef TOOLS_ENABLED
#include "editor/editor_settings.h"
+#include "scene/2d/skeleton_2d.h"
void AnimatedValuesBackup::update_skeletons() {
for (int i = 0; i < entries.size(); i++) {
if (entries[i].bone_idx != -1) {
+ // 3D bone
Object::cast_to<Skeleton>(entries[i].object)->notification(Skeleton::NOTIFICATION_UPDATE_SKELETON);
+ } else {
+ Bone2D *bone = Object::cast_to<Bone2D>(entries[i].object);
+ if (bone && bone->skeleton) {
+ // 2D bone
+ bone->skeleton->_update_transform();
+ }
}
}
}