diff options
| author | George Marques <george@gmarqu.es> | 2016-10-13 13:07:37 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 13:07:37 -0300 |
| commit | 682c20be468472a66c5742a17a3093c75df5938e (patch) | |
| tree | 6f8780e3f8b56df1016bb18f7d81839c7a342b83 /tools/editor | |
| parent | 05a5d3d9d53350d7fd886390928d5d8e5fbd364b (diff) | |
| parent | 86fd40b06c14f32327def8d872312974ecd32436 (diff) | |
Merge pull request #6814 from Hinsbart/animplayer
Only show AnimationEditor automatically when an Animplayer is selected.
Diffstat (limited to 'tools/editor')
| -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(); |