diff options
author | Andreas Haas <liu.gam3@gmail.com> | 2016-10-13 12:31:45 +0200 |
---|---|---|
committer | Andreas Haas <liu.gam3@gmail.com> | 2016-10-13 12:31:56 +0200 |
commit | 86fd40b06c14f32327def8d872312974ecd32436 (patch) | |
tree | e3663d6b5ed7701e0fdeb1df7c1d5ab38277508a | |
parent | a317617aaec10956c5cb2ef1b271b9bfe8031cc7 (diff) |
Only show AnimationEditor automatically when an Animplayer is selected.
Previous behaviour was to show it when an AnimationPlayer has been detected in the scene, now you actually have to select it.
Fixes #6213
-rw-r--r-- | tools/editor/plugins/animation_player_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp index b4d54c6b1e..d6d452dd72 100644 --- a/tools/editor/plugins/animation_player_editor_plugin.cpp +++ b/tools/editor/plugins/animation_player_editor_plugin.cpp @@ -666,7 +666,7 @@ void AnimationPlayerEditor::set_state(const Dictionary& p_state) { return; Node *n = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["player"]); - if (n && n->cast_to<AnimationPlayer>()) { + if (n && n->cast_to<AnimationPlayer>() && EditorNode::get_singleton()->get_editor_selection()->is_selected(n)) { player=n->cast_to<AnimationPlayer>(); _update_player(); show(); |