asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #24411 from guilhermefelipecgs/fix_22389

Browse source 
Fix sub-transitions not using end_node correctly
This commit is contained in:
Rémi Verschelde 2018-12-17 08:11:48 +01:00 committed by GitHub
commit 4b6e7b50b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scene/animation/animation_node_state_machine.cpp
View file

@ -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;