From 5185cd4f8050787c4acbf4ac80f1d6407bce6623 Mon Sep 17 00:00:00 2001 From: Florian Kothmeier Date: Tue, 5 Jan 2021 15:56:06 +0100 Subject: [PATCH] Fix AnimationNodeStateMachinePlayback start() on nonexistent node (cherry picked from commit b6e7df56cbf93a0ecdc3bec05adcbdd08a16701b) --- scene/animation/animation_node_state_machine.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/scene/animation/animation_node_state_machine.cpp b/scene/animation/animation_node_state_machine.cpp index c54b06dac31..f66dcee5379 100644 --- a/scene/animation/animation_node_state_machine.cpp +++ b/scene/animation/animation_node_state_machine.cpp @@ -327,11 +327,17 @@ float AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *p_st } } else { // teleport to start - path.clear(); - current = start_request; - playing = true; - play_start = true; - start_request = StringName(); //clear start request + if (p_state_machine->states.has(start_request)) { + path.clear(); + current = start_request; + playing = true; + play_start = true; + start_request = StringName(); //clear start request + } else { + StringName node = start_request; + start_request = StringName(); //clear start request + ERR_FAIL_V_MSG(0, "No such node: '" + node + "'"); + } } }