diff options
author | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-26 21:35:47 +0300 |
---|---|---|
committer | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-26 21:35:47 +0300 |
commit | e0e54ea7d456c0fabd8f3f9b2667a69ff520f852 (patch) | |
tree | 9ce4e0b6db40ac2ab07b8582e57282fe63130165 /tools/editor/editor_settings.cpp | |
parent | f61eb5fd8e13642c82364f8ee66a0f6c791a4511 (diff) | |
parent | a67486a39ee629acac068a6d014015944cf83bb3 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tools/editor/editor_settings.cpp')
-rw-r--r-- | tools/editor/editor_settings.cpp | 2 |
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); |