summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-10-17 18:43:52 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-10-17 18:43:52 -0300
commitfba1842b111420d75cfabc9dc4f240965cb085fe (patch)
treedf08b3d5e1ab92044899563e0091c2cbb9bab65b /tools/editor
parent36c874cc457a03d5bb1aca2b280b9eaea24a03b8 (diff)
-Propertly restrict renaming of nodes in inherited scenes, fixes #2615
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/scene_tree_editor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp
index b746af7f0e..60395d5ff5 100644
--- a/tools/editor/scene_tree_editor.cpp
+++ b/tools/editor/scene_tree_editor.cpp
@@ -239,7 +239,7 @@ void SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
TreeItem *item = tree->create_item(p_parent);
item->set_text(0, p_node->get_name() );
- if (can_rename && (p_node->get_owner() == get_scene_node() || p_node==get_scene_node()))
+ if (can_rename && !part_of_subscene /*(p_node->get_owner() == get_scene_node() || p_node==get_scene_node())*/)
item->set_editable(0, true);
item->set_selectable(0,true);