diff options
| author | Guilherme Felipe de C. G. da Silva <guilhermefelipecgs@gmail.com> | 2022-08-09 16:55:07 -0300 |
|---|---|---|
| committer | Guilherme Felipe de C. G. da Silva <guilhermefelipecgs@gmail.com> | 2022-08-10 19:29:53 -0300 |
| commit | 15b5bc88e247d4d7d461b7495af77019387959a0 (patch) | |
| tree | ceb805b84aeb0f97c499ccf4e237e97189f739fb /scene/animation | |
| parent | d8ec27cdc1a77f9516b4ee628437ddda814b5d6f (diff) | |
Re-add AnimationNodeStateMachine::end_node for root state machine
Fix #63660
Diffstat (limited to 'scene/animation')
| -rw-r--r-- | scene/animation/animation_node_state_machine.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/scene/animation/animation_node_state_machine.cpp b/scene/animation/animation_node_state_machine.cpp index 793967d9ad..b27082002a 100644 --- a/scene/animation/animation_node_state_machine.cpp +++ b/scene/animation/animation_node_state_machine.cpp @@ -594,11 +594,13 @@ double AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *p_s if (p_state_machine->end_node != current) { rem = 1; } else { - Ref<AnimationNodeStateMachinePlayback> prev_playback = p_state_machine->prev_state_machine->get_parameter("playback"); + if (p_state_machine->prev_state_machine != nullptr) { + Ref<AnimationNodeStateMachinePlayback> prev_playback = p_state_machine->prev_state_machine->get_parameter(p_state_machine->playback); - if (prev_playback.is_valid()) { - prev_playback->current_transition = current_transition; - prev_playback->force_auto_advance = true; + if (prev_playback.is_valid()) { + prev_playback->current_transition = current_transition; + prev_playback->force_auto_advance = true; + } } } @@ -883,10 +885,6 @@ void AnimationNodeStateMachine::_rename_transitions(const StringName &p_name, co void AnimationNodeStateMachine::get_node_list(List<StringName> *r_nodes) const { List<StringName> nodes; for (const KeyValue<StringName, State> &E : states) { - if (E.key == end_node && prev_state_machine == nullptr) { - continue; - } - nodes.push_back(E.key); } nodes.sort_custom<StringName::AlphCompare>(); |