diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-02-09 16:30:50 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-02-09 16:30:50 -0300 |
commit | 595de75641e0fae1f4e6924530da7a3308371a07 (patch) | |
tree | af3df57be892d51b3ccc8f0199fbe01b45d5a5a2 /tools/editor | |
parent | f51c26c0252c65bec7a14ebf4f10efc07e8a936a (diff) |
-Allow renaming root node of inherited scene
Diffstat (limited to 'tools/editor')
-rw-r--r-- | tools/editor/scene_tree_editor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index ba5cc7568b..45eecacb6b 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -230,7 +230,7 @@ void SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) { return; } } else { - part_of_subscene = get_scene_node()->get_scene_inherited_state().is_valid() && get_scene_node()->get_scene_inherited_state()->find_node_by_path(get_scene_node()->get_path_to(p_node))>=0; + part_of_subscene = p_node!=get_scene_node() && get_scene_node()->get_scene_inherited_state().is_valid() && get_scene_node()->get_scene_inherited_state()->find_node_by_path(get_scene_node()->get_path_to(p_node))>=0; } TreeItem *item = tree->create_item(p_parent); |