diff options
| author | Juan Linietsky | 2015-05-21 15:02:49 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-05-21 15:02:49 -0300 |
| commit | bb5d46bb113bca3204db7678eb69900f159e8087 (patch) | |
| tree | cd34e10d67a196d217559ab8d4973b8f5bc4ccde /tools/editor/editor_settings.cpp | |
| parent | 4b8745ad63409cf14b02735981ee35d2f794421c (diff) | |
| parent | 6049479a99f66b620d59498a76ed9f2c3891f4c8 (diff) | |
| download | godot-bb5d46bb113bca3204db7678eb69900f159e8087.tar.gz godot-bb5d46bb113bca3204db7678eb69900f159e8087.tar.zst godot-bb5d46bb113bca3204db7678eb69900f159e8087.zip | |
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 9a4505efe..f49d3b496 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(); |