From d900cfafa367e7fbc867739cf6cc69bde0abaadc Mon Sep 17 00:00:00 2001 From: PouleyKetchoupp Date: Sat, 30 Nov 2019 17:47:09 +0100 Subject: Fixed errors in AnimationPlayerEditor when switching current_animation in the inspector Case 1: start and stop an animation in the inspector Case 2: start an animation in the inspector, then stop and start again in the track editor Fixes #34021 --- editor/plugins/animation_player_editor_plugin.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 80353bab01..718156f12a 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -85,6 +85,9 @@ void AnimationPlayerEditor::_notification(int p_what) { track_editor->set_anim_pos(player->get_current_animation_position()); EditorNode::get_singleton()->get_inspector()->refresh(); + } else if (!player->is_valid()) { + // Reset timeline when the player has been stopped externally + frame->set_value(0); } else if (last_active) { // Need the last frame after it stopped. frame->set_value(player->get_current_animation_position()); -- cgit v1.2.3