Browse Source

Merge pull request #62923 from aaronfranke/pck-override

Allow loading override.cfg from PCK files
Rémi Verschelde 3 years ago
parent
commit
1c63fbed43
1 changed files with 3 additions and 2 deletions
  1. 3 2
      core/config/project_settings.cpp

+ 3 - 2
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;