diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-16 17:13:25 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-16 17:13:25 -0300 |
| commit | 8482611f8163506aba02a4556715cebbd922cf77 (patch) | |
| tree | ee5340541518ed3c654958502c4fd6835c57391a /tools/editor/editor_settings.cpp | |
| parent | 1e382dbb1835d0509630ee9e6a61501e3839239b (diff) | |
| parent | 219dcaaa758af87c06ba8903cc984366da871912 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/editor_settings.cpp')
| -rw-r--r-- | tools/editor/editor_settings.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 9a4505efed..f49d3b496d 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -264,6 +264,7 @@ void EditorSettings::create() { singleton = Ref<EditorSettings>( memnew( EditorSettings ) ); singleton->config_file_path=config_file_path; + singleton->settings_path=config_path+"/"+config_dir; singleton->_load_defaults(); singleton->scan_plugins(); |