Merge pull request #6814 from Hinsbart/animplayer

Only show AnimationEditor automatically when an Animplayer is selected.

Merge pull request #6814 from Hinsbart/animplayer
682c20be · George Marques · GitHub · 05a5d3d9 · 86fd40b0 · 682c20be
Commit 682c20be authored Oct 13, 2016 by George Marques Committed by GitHub Oct 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

animation_player_editor_plugin.cpp tools/editor/plugins/animation_player_editor_plugin.cpp +1 -1

No files found.
--- 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();