|
@@ -640,7 +640,7 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
|
|
|
|
|
|
Error ProjectSettings::setup(const String &p_path, const String &p_main_pack, bool p_upwards, bool p_ignore_override) {
|
|
Error ProjectSettings::setup(const String &p_path, const String &p_main_pack, bool p_upwards, bool p_ignore_override) {
|
|
Error err = _setup(p_path, p_main_pack, p_upwards, p_ignore_override);
|
|
Error err = _setup(p_path, p_main_pack, p_upwards, p_ignore_override);
|
|
- if (err == OK) {
|
|
|
|
|
|
+ if (err == OK && !p_ignore_override) {
|
|
String custom_settings = GLOBAL_GET("application/config/project_settings_override");
|
|
String custom_settings = GLOBAL_GET("application/config/project_settings_override");
|
|
if (!custom_settings.is_empty()) {
|
|
if (!custom_settings.is_empty()) {
|
|
_load_settings_text(custom_settings);
|
|
_load_settings_text(custom_settings);
|