diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-07 23:06:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-07 23:06:05 +0100 |
| commit | 201cb8d7ed8134eb21d41189025b8619557b7e1d (patch) | |
| tree | 604a1634c83ad4c209dc33176e0f218b52f3ef2d /core | |
| parent | 6ee30022370202c08a7743d6efb8ca010786cc4f (diff) | |
| parent | c74bf2e6b1ccad9c6cf72c0b142aa924de67eed0 (diff) | |
Merge pull request #26745 from akien-mga/android-modules-def
Define android/modules globally so it appears in Project Settings
Diffstat (limited to 'core')
| -rw-r--r-- | core/project_settings.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/project_settings.cpp b/core/project_settings.cpp index 6b4895d688..02c7c9e029 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -1185,6 +1185,9 @@ ProjectSettings::ProjectSettings() { Compression::gzip_level = GLOBAL_DEF("compression/formats/gzip/compression_level", Z_DEFAULT_COMPRESSION); custom_prop_info["compression/formats/gzip/compression_level"] = PropertyInfo(Variant::INT, "compression/formats/gzip/compression_level", PROPERTY_HINT_RANGE, "-1,9,1"); + // Would ideally be defined in an Android-specific file, but then it doesn't appear in the docs + GLOBAL_DEF("android/modules", ""); + using_datapack = false; } |