From a86cfc258e624e35459bf4e2880d9588a547f7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 1 May 2016 11:37:58 +0200 Subject: [PATCH] AnimationPlayer: Prevent resetting timeline when pinned (#4497) Fixes #1019 (cherry picked from commit 0b4f27718420c0b27218ecb79616b4f11f59773d) --- tools/editor/plugins/animation_player_editor_plugin.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp index 67f730f3000..da7c083c5a0 100644 --- a/tools/editor/plugins/animation_player_editor_plugin.cpp +++ b/tools/editor/plugins/animation_player_editor_plugin.cpp @@ -616,6 +616,9 @@ void AnimationPlayerEditor::_blend_edited() { void AnimationPlayerEditor::ensure_visibility() { + if (player && pin->is_pressed()) + return; // another player is pinned, don't reset + _animation_edit(); }