summaryrefslogtreecommitdiffstats
path: root/tools/editor/editor_settings.cpp
diff options
context:
space:
mode:
authorvolzhs <volzhs@gmail.com>2015-06-28 22:28:02 +0900
committervolzhs <volzhs@gmail.com>2015-06-28 22:28:02 +0900
commit584dd4db878d0a9ebf44dc529dad35bf8dd4796b (patch)
treec601222ba20cacc80fba7ff43b5de425db13519c /tools/editor/editor_settings.cpp
parent81a1f32f0c1e4f64bb102c6aa46bcbb4e18bcd55 (diff)
parent2b64f73b0459190d20b2f6de39275ee7979317c4 (diff)
downloadredot-engine-584dd4db878d0a9ebf44dc529dad35bf8dd4796b.tar.gz
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/editor_settings.cpp')
-rw-r--r--tools/editor/editor_settings.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 361a86b88e..0df9fcadef 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -433,9 +433,11 @@ void EditorSettings::_load_defaults() {
set("text_editor/idle_parse_delay",2);
set("text_editor/create_signal_callbacks",true);
set("text_editor/autosave_interval_secs",0);
+
set("text_editor/font","");
hints["text_editor/font"]=PropertyInfo(Variant::STRING,"text_editor/font",PROPERTY_HINT_GLOBAL_FILE,"*.fnt");
set("text_editor/auto_brace_complete", false);
+ set("text_editor/restore_scripts_on_load",true);
set("scenetree_editor/duplicate_node_name_num_separator",0);