summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2019-01-27 15:21:03 -0300
committerJuan Linietsky <reduzio@gmail.com>2019-01-27 15:21:54 -0300
commit70d6d0fa69c36cd9a673bc313c711814dc79a4f4 (patch)
tree8b2649c52e8734a3032417fa19d13bfee615e9e6 /scene
parent2ad6212a3f671c0c7f140658a7a55a75af10ae93 (diff)
Fix problem blending from state to state in statemachine node, closes #21944
Diffstat (limited to 'scene')
-rw-r--r--scene/animation/animation_node_state_machine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/animation/animation_node_state_machine.cpp b/scene/animation/animation_node_state_machine.cpp
index 56faba27cf..08cc655cdd 100644
--- a/scene/animation/animation_node_state_machine.cpp
+++ b/scene/animation/animation_node_state_machine.cpp
@@ -373,7 +373,7 @@ float AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *sm,
if (fading_from != StringName()) {
- sm->blend_node(current, sm->states[fading_from].node, p_time, p_seek, 1.0 - fade_blend, AnimationNode::FILTER_IGNORE, false);
+ sm->blend_node(fading_from, sm->states[fading_from].node, p_time, p_seek, 1.0 - fade_blend, AnimationNode::FILTER_IGNORE, false);
}
//guess playback position