diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
| commit | eacb8f04c4697b8123afeec03088eebb3c4b20bd (patch) | |
| tree | 8070f7807ec5d6a375df7184b151abbee8790608 /tools/editor/editor_settings.cpp | |
| parent | a75f8963380a1f6ae8501f21a1d3f3bef8a89d91 (diff) | |
| parent | 4c4d79e3c98182faf348f41f98d1cc3e5d843e69 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tools/editor/editor_settings.cpp')
| -rw-r--r-- | tools/editor/editor_settings.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 1d79dddac9..91d7e7ebd4 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -263,7 +263,7 @@ void EditorSettings::create() { memdelete(dir); - singleton = ResourceLoader::load(config_file_path,TTR("EditorSettings")); + singleton = ResourceLoader::load(config_file_path,"EditorSettings"); if (singleton.is_null()) { WARN_PRINT("Could not open config file."); goto fail; @@ -464,7 +464,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("2d_editor/bone_color2",Color(0.75,0.75,0.75,0.9)); set("2d_editor/bone_selected_color",Color(0.9,0.45,0.45,0.9)); set("2d_editor/bone_ik_color",Color(0.9,0.9,0.45,0.9)); - + set("2d_editor/keep_margins_when_changing_anchors", false); set("game_window_placement/rect",0); @@ -505,7 +505,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { #else hints["import/pvrtc_texture_tool"]=PropertyInfo(Variant::STRING,"import/pvrtc_texture_tool",PROPERTY_HINT_GLOBAL_FILE,""); #endif - set(TTR("PVRTC/fast_conversion"),false); + // TODO: Rename to "import/pvrtc_fast_conversion" to match other names? + set("PVRTC/fast_conversion",false); set("run/auto_save_before_running",true); |