From 9bbc3f0c94bfdbaceb507e4ccaf388950d84d8f0 Mon Sep 17 00:00:00 2001
From: Dana Olson
Date: Sun, 11 Jan 2015 00:08:32 -0500
Subject: fix naming of duplicated nodes, closes #1161, adds separator
 character preferences

---
 tools/editor/editor_settings.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tools/editor/editor_settings.cpp')

diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index bc800d7e9..60b8f41da 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -413,6 +413,10 @@ void EditorSettings::_load_defaults() {
 	set("text_editor/auto_brace_complete", false);
 
 
+	set("scenetree_editor/duplicate_node_name_num_separator",0);
+	hints["scenetree_editor/duplicate_node_name_num_separator"]=PropertyInfo(Variant::INT,"scenetree_editor/duplicate_node_name_num_separator",PROPERTY_HINT_ENUM, "None,Space,Underscore,Dash");
+
+
 	set("3d_editor/default_fov",45.0);
 	set("3d_editor/default_z_near",0.1);
 	set("3d_editor/default_z_far",500.0);
-- 
cgit v1.2.3-70-g09d2