summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Grams <josh@qualdan.com>2016-03-31 12:12:05 -0400
committerJosh Grams <josh@qualdan.com>2016-03-31 12:12:05 -0400
commit0a9c8a9f36dbcba2e416b7ab29c949b70bd72c0e (patch)
tree0d53d441385d04220f65e9d32f84e169bc7ae5c4
parent7fe28d4168aa52a79cbc41c42112c1d1ec2680f4 (diff)
AnimationTreePlayer (_process_node:TIMESEEK): allow auto-advance with 0 xfade.
-rw-r--r--scene/animation/animation_tree_player.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp
index 1a3fbe3ef1..d36960c963 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -674,7 +674,7 @@ float AnimationTreePlayer::_process_node(const StringName& p_node,AnimationNode
else
tn->time+=p_time;
- if (tn->input_data[tn->current].auto_advance && rem < tn->xfade) {
+ if (tn->input_data[tn->current].auto_advance && rem <= tn->xfade) {
tn->prev=tn->current;
tn->current++;