diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-25 16:30:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 16:30:01 +0200 |
| commit | 28fcc5e25aa9859361c18c22e48ffd893f7e51cb (patch) | |
| tree | a8da3f2732cbbe9e55d576b045352ca1305cde9a /core/project_settings.h | |
| parent | 351c45a4612749da81ffa26783d44880aa1edd7a (diff) | |
| parent | aae25abf3080283bbff29b8264f24d37f935922a (diff) | |
Merge pull request #32291 from Dragoncraft89/add_load_resource_flag
Add flag to control the replacement of files by ProjectSettings.load_resource_pack
Diffstat (limited to 'core/project_settings.h')
| -rw-r--r-- | core/project_settings.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/project_settings.h b/core/project_settings.h index a8deab028c..b32470361b 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -104,7 +104,7 @@ protected: void _convert_to_last_version(int p_from_version); - bool _load_resource_pack(const String &p_pack); + bool _load_resource_pack(const String &p_pack, bool p_replace_files = true); void _add_property_info_bind(const Dictionary &p_info); |