diff options
| author | Pedro J. Estébanez | 2017-07-26 15:28:54 +0200 |
|---|---|---|
| committer | Pedro J. Estébanez | 2017-07-26 16:13:38 +0200 |
| commit | 1619aabfe1bd1ab04b1e14679698c2765d86c1e8 (patch) | |
| tree | a15dc1edd418468359aee9ba025b5b4bd02f980a /core/project_settings.h | |
| parent | ccb17c2b279ec0dc6160f8d01d381b05e4c81fd3 (diff) | |
| download | godot-1619aabfe1bd1ab04b1e14679698c2765d86c1e8.tar.gz godot-1619aabfe1bd1ab04b1e14679698c2765d86c1e8.tar.zst godot-1619aabfe1bd1ab04b1e14679698c2765d86c1e8.zip | |
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 278d4b813..c58ac3ca4 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -138,7 +138,7 @@ public: Error setup(const String &p_path, const String &p_main_pack); - Error save_custom(const String &p_path = "", const CustomMap &p_custom = CustomMap(), const Vector<String> &p_custom_features = Vector<String>()); + Error save_custom(const String &p_path = "", const CustomMap &p_custom = CustomMap(), const Vector<String> &p_custom_features = Vector<String>(), bool p_merge_with_current = true); Error save(); void set_custom_property_info(const String &p_prop, const PropertyInfo &p_info); |