summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/property_editor.cpp4
-rw-r--r--tools/editor/scene_tree_editor.cpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index 4b1b93ea6e..3dfc461bfe 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -3701,9 +3701,7 @@ PropertyEditor::PropertyEditor() {
capitalize_paths=true;
autoclear=false;
- tree->set_column_title(0,"Property");
- tree->set_column_title(1,"Value");
- tree->set_column_titles_visible(true);
+ tree->set_column_titles_visible(false);
keying=false;
read_only=false;
diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp
index 0260457c81..ba5cc7568b 100644
--- a/tools/editor/scene_tree_editor.cpp
+++ b/tools/editor/scene_tree_editor.cpp
@@ -658,6 +658,9 @@ void SceneTreeEditor::_renamed() {
new_name=n->get_name();
}
+ if (new_name==n->get_name())
+ return;
+
if (!undo_redo) {
n->set_name( new_name );
which->set_metadata(0,n->get_path());
@@ -844,7 +847,7 @@ SceneTreeEditor::SceneTreeEditor(bool p_label,bool p_can_rename, bool p_can_open
add_child( tree );
tree->connect("cell_selected", this,"_selected_changed");
- tree->connect("item_edited", this,"_renamed");
+ tree->connect("item_edited", this,"_renamed",varray(),CONNECT_DEFERRED);
tree->connect("multi_selected",this,"_cell_multi_selected");
tree->connect("button_pressed",this,"_cell_button_pressed");
// tree->connect("item_edited", this,"_renamed",Vector<Variant>(),true);