From fba1842b111420d75cfabc9dc4f240965cb085fe Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 17 Oct 2015 18:43:52 -0300 Subject: [PATCH] -Propertly restrict renaming of nodes in inherited scenes, fixes #2615 --- tools/editor/scene_tree_editor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index b746af7f0ea..60395d5ff52 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);