diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-12 22:32:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 22:32:55 +0100 |
| commit | 399b0cd52901d9e926da798a9ab14a2eb0fc8275 (patch) | |
| tree | fe9b9ae41652cad9c6f8cfcf43b6324953509045 /scene/animation/animation_node_state_machine.cpp | |
| parent | cc76f3c71d6d645ff454d142237985421439f722 (diff) | |
| parent | 67eda1d4dd7373e8ea1a34901135d0b678581c09 (diff) | |
Merge pull request #25830 from guilhermefelipecgs/fix_state_machine_priority
Fix state machine priority for auto advance
Diffstat (limited to 'scene/animation/animation_node_state_machine.cpp')
| -rw-r--r-- | scene/animation/animation_node_state_machine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/animation/animation_node_state_machine.cpp b/scene/animation/animation_node_state_machine.cpp index 08cc655cdd..5df3da93e1 100644 --- a/scene/animation/animation_node_state_machine.cpp +++ b/scene/animation/animation_node_state_machine.cpp @@ -421,7 +421,8 @@ float AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *sm, if (sm->transitions[i].from == current && auto_advance) { - if (sm->transitions[i].transition->get_priority() < priority_best) { + if (sm->transitions[i].transition->get_priority() <= priority_best) { + priority_best = sm->transitions[i].transition->get_priority(); auto_advance_to = i; } } |