diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-20 13:47:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 13:47:25 +0200 |
| commit | 83b21cd3023f13f926f8167c6d6c35573c6570f1 (patch) | |
| tree | 17c9a97ecb8f07aa09973bbe2abf116daaeff859 /core/project_settings.cpp | |
| parent | 088c2a087029901e5657089a6f2531ce6c015fe5 (diff) | |
| parent | 515fe0f29ba1eeecb65a5a6d104bd1702d3a26c4 (diff) | |
Merge pull request #38035 from akien-mga/revert-35261-pck-destination
Revert "Made possible to specify where to dump the contents when load…
Diffstat (limited to 'core/project_settings.cpp')
| -rw-r--r-- | core/project_settings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/project_settings.cpp b/core/project_settings.cpp index 201ab8e90a..63b52661b4 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -268,12 +268,12 @@ void ProjectSettings::_get_property_list(List<PropertyInfo> *p_list) const { } } -bool ProjectSettings::_load_resource_pack(const String &p_pack, bool p_replace_files, const String &p_destination) { +bool ProjectSettings::_load_resource_pack(const String &p_pack, bool p_replace_files) { if (PackedData::get_singleton()->is_disabled()) return false; - bool ok = PackedData::get_singleton()->add_pack(p_pack, p_replace_files, p_destination) == OK; + bool ok = PackedData::get_singleton()->add_pack(p_pack, p_replace_files) == OK; if (!ok) return false; @@ -990,7 +990,7 @@ void ProjectSettings::_bind_methods() { ClassDB::bind_method(D_METHOD("localize_path", "path"), &ProjectSettings::localize_path); ClassDB::bind_method(D_METHOD("globalize_path", "path"), &ProjectSettings::globalize_path); ClassDB::bind_method(D_METHOD("save"), &ProjectSettings::save); - ClassDB::bind_method(D_METHOD("load_resource_pack", "pack", "replace_files", "destination"), &ProjectSettings::_load_resource_pack, DEFVAL(true), DEFVAL("")); + ClassDB::bind_method(D_METHOD("load_resource_pack", "pack", "replace_files"), &ProjectSettings::_load_resource_pack, DEFVAL(true)); ClassDB::bind_method(D_METHOD("property_can_revert", "name"), &ProjectSettings::property_can_revert); ClassDB::bind_method(D_METHOD("property_get_revert", "name"), &ProjectSettings::property_get_revert); |