diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-05-01 11:37:58 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-05-01 11:37:58 +0200 |
| commit | 0b4f27718420c0b27218ecb79616b4f11f59773d (patch) | |
| tree | e925f3ce5d30fc41adcb4c1f29f516394e01647f /tools | |
| parent | 6883325f926af425cf1db7606506f5538b7a205a (diff) | |
AnimationPlayer: Prevent resetting timeline when pinned (#4497)
Fixes #1019
Diffstat (limited to 'tools')
| -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 67f730f300..da7c083c5a 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(); } |