From 4c5548e06e6d6d57b7c377198e1a10cb5e444d14 Mon Sep 17 00:00:00 2001 From: Guilherme Felipe Date: Sun, 16 Dec 2018 23:40:41 -0200 Subject: [PATCH] Fix sub-transitions not using end_node correctly Fix #22389 --- scene/animation/animation_node_state_machine.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scene/animation/animation_node_state_machine.cpp b/scene/animation/animation_node_state_machine.cpp index a7af3f687b7..f67ef8164a3 100644 --- a/scene/animation/animation_node_state_machine.cpp +++ b/scene/animation/animation_node_state_machine.cpp @@ -480,10 +480,9 @@ float AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *sm, } //compute time left for transitions by using the end node - if (sm->end_node != StringName() && sm->end_node != current) { - rem = sm->blend_node(current, sm->states[sm->end_node].node, 0, true, 0, AnimationNode::FILTER_IGNORE, false); + rem = sm->blend_node(sm->end_node, sm->states[sm->end_node].node, 0, true, 0, AnimationNode::FILTER_IGNORE, false); } return rem;