summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Marques <george@gmarqu.es>2017-11-20 01:33:03 -0200
committerGitHub <noreply@github.com>2017-11-20 01:33:03 -0200
commit8e6c281a0489ee908eb1666d30b65fb22edba670 (patch)
tree9bf72f889434c2359a87e8e097edb35c112e690d
parent98cb49283ddcd1ab01db0e92d691dbffbacd9d6b (diff)
parentfcbec6331c834db7b4118e038278e1f02e9a8f06 (diff)
Merge pull request #13072 from sersoong/master-test2
[3.0] - Change editor_settings.tres to editor_settings-3.tres
-rw-r--r--editor/editor_settings.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index 6af37ab87f..4726e2deb6 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -789,7 +789,7 @@ void EditorSettings::create() {
// Validate editor config file
- String config_file_name = "editor_settings.tres";
+ String config_file_name = "editor_settings-3.tres";
config_file_path = config_dir.plus_file(config_file_name);
if (!dir->file_exists(config_file_name)) {
goto fail;