diff options
| author | Aaron Franke <arnfranke@yahoo.com> | 2022-07-11 16:58:27 -0500 |
|---|---|---|
| committer | Aaron Franke <arnfranke@yahoo.com> | 2022-07-25 22:34:54 -0500 |
| commit | 940317399401b8fb51cea702fec875af2b5d4e7e (patch) | |
| tree | 071194c2f63f9fb95be34fcc9439b73e99d9580c /core/config | |
| parent | 3e0e84a54c1c5666c32dbc2abd419b61e071ba33 (diff) | |
Allow loading override.cfg from PCK files
Diffstat (limited to 'core/config')
| -rw-r--r-- | core/config/project_settings.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index f9bac58ffa..38db7f9190 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -511,8 +511,9 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b if (found) { Error err = _load_settings_text_or_binary("res://project.godot", "res://project.binary"); if (err == OK && !p_ignore_override) { - // Load override from location of the executable. - // Optional, we don't mind if it fails. + // Load overrides from the PCK and the executable location. + // Optional, we don't mind if either fails. + _load_settings_text("res://override.cfg"); _load_settings_text(exec_path.get_base_dir().plus_file("override.cfg")); } return err; |