summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-03-08 23:54:46 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-03-08 23:54:46 +0100
commit1dad6eca812e5c2e313b54265114de8a1d73d999 (patch)
tree24584eec4a708679c0fd66f4e52e637c92f12cbe /scene
parenta3d6768199c2100391343083900177c129a683d6 (diff)
parent2fa200ff5380d03bf3f581c00ef202729983423f (diff)
Merge pull request #3991 from JoshuaGrams/issue-3711
Issue 3711
Diffstat (limited to 'scene')
-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;