aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Grams2016-03-08 17:23:32 -0500
committerRémi Verschelde2016-04-02 22:00:40 +0200
commit830947feafc5e3af452296ff80a6418e9c56c5d2 (patch)
treea73b6b46f1fdccdfcf45d98e3cb2a7c46d10f672
parentee20365f7c13902663ffb1721ca6b1d084915336 (diff)
downloadgodot-830947feafc5e3af452296ff80a6418e9c56c5d2.tar.gz
godot-830947feafc5e3af452296ff80a6418e9c56c5d2.tar.zst
godot-830947feafc5e3af452296ff80a6418e9c56c5d2.zip
AnimationTreePlayer: distinguish value tracks.
If the node had a 3D Transform, the transform would always get written, even if the tracks on that node were supposed to be value tracks. (cherry picked from commit 2fa200ff5380d03bf3f581c00ef202729983423f)
-rw-r--r--scene/animation/animation_tree_player.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp
index 67c7eae1b..132d9b491 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -863,8 +863,9 @@ void AnimationTreePlayer::_process_animation(float p_delta) {
if (!t.node)
continue;
- //if (E->get()->t.type!=Animation::TYPE_TRANSFORM)
- // continue;
+
+ if(t.property) // value track; was applied in step 2
+ continue;
Transform xform;
xform.basis=t.rot;