diff options
| author | Rémi Verschelde | 2016-05-01 11:37:58 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2016-05-01 12:28:07 +0200 |
| commit | a86cfc258e624e35459bf4e2880d9588a547f7ad (patch) | |
| tree | 75bd59d4938553c73c4aeceaeb0a659b0ae4d820 /tools/editor/plugins/animation_player_editor_plugin.cpp | |
| parent | 26c2e0d09dc9c61d6d49b6d43f47a484e7eff49f (diff) | |
| download | godot-a86cfc258e624e35459bf4e2880d9588a547f7ad.tar.gz godot-a86cfc258e624e35459bf4e2880d9588a547f7ad.tar.zst godot-a86cfc258e624e35459bf4e2880d9588a547f7ad.zip | |
AnimationPlayer: Prevent resetting timeline when pinned (#4497)
Fixes #1019
(cherry picked from commit 0b4f27718420c0b27218ecb79616b4f11f59773d)
Diffstat (limited to 'tools/editor/plugins/animation_player_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/animation_player_editor_plugin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp index 67f730f30..da7c083c5 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(); } |