diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-26 14:24:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-26 14:24:34 +0200 |
| commit | 1c63fbed4366803f1c63392e8d3f30955bd05736 (patch) | |
| tree | c5b7845eaa473cd066b57a28e3e71f7057b1a0c6 /core/config/project_settings.cpp | |
| parent | 0ffc28e3de3638be8fe0e4fab146dcf1e0716f6d (diff) | |
| parent | 940317399401b8fb51cea702fec875af2b5d4e7e (diff) | |
Merge pull request #62923 from aaronfranke/pck-override
Allow loading override.cfg from PCK files
Diffstat (limited to 'core/config/project_settings.cpp')
| -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; |