godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Dehardcode version major in editor settings 

Follow-up on 7474fc133a.
This commit is contained in:
Rémi Verschelde 2017-01-11 22:38:00 +01:00
parent f698e2be4f
commit a23ffb82bb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ISSUE_TEMPLATE.md
View File

@ -1,6 +1,6 @@
vvv Remove me vvv vvv Remove me vvv
*NOTE:* If you using the current master branch / 3.0-alpha version, do not that *NOTE:* If you using the current master branch / 3.0-alpha version, do note that
breakage is *expected*. Projects from Godot 2.x are expected not to work. Please breakage is *expected*. Projects from Godot 2.x are expected not to work. Please
wait for the upcoming stabilisation period to report bugs regarding recent changes. wait for the upcoming stabilisation period to report bugs regarding recent changes.

6
tools/editor/editor_settings.cpp
View File

@ -328,12 +328,12 @@ void EditorSettings::create() {
// path at least is validated, so validate config file // path at least is validated, so validate config file
String config_file_name = "editor_settings-" + String(_MKSTR(VERSION_MAJOR)) + ".tres";
config_file_path = config_path+"/"+config_dir+"/editor_settings-3.tres"; config_file_path = config_path + "/" + config_dir + "/" + config_file_name;
String open_path = config_file_path; String open_path = config_file_path;
if (!dir->file_exists("editor_settings-3.tres")) { if (!dir->file_exists(config_file_name)) {
goto fail; goto fail;
} }