summaryrefslogtreecommitdiff
path: root/scene/animation
diff options
context:
space:
mode:
authorJosh Grams <josh@qualdan.com>2016-03-08 17:23:32 -0500
committerJosh Grams <josh@qualdan.com>2016-03-08 17:23:32 -0500
commit2fa200ff5380d03bf3f581c00ef202729983423f (patch)
tree0cc315cde086add62afbd9ce823a777a6426050d /scene/animation
parentf7fad321886858dd05d06f1e2d57773a2b24f147 (diff)
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.
Diffstat (limited to 'scene/animation')
-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 b07611b318..a66a2849ae 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -861,8 +861,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;