diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-13 11:11:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 11:11:01 +0200 |
| commit | 42504ef0d4123e7fdeb1a81f59e800c3f0bdfa7b (patch) | |
| tree | 47912390c46b742ad0ae1b7a0dea1c31cfa3c68b /platform/osx/export/export.cpp | |
| parent | e73e00d369abe54009e70498238c286708bf365a (diff) | |
| parent | 099546ac005d2ddbb5fb806c7ed678484ff02442 (diff) | |
| download | redot-engine-42504ef0d4123e7fdeb1a81f59e800c3f0bdfa7b.tar.gz | |
Merge pull request #11062 from BastiaanOlij/osx_datapack
Fixed loading package from resource folder, exporting textures to bun…
Diffstat (limited to 'platform/osx/export/export.cpp')
| -rw-r--r-- | platform/osx/export/export.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp index 7f749030ec..2ec76fe0dd 100644 --- a/platform/osx/export/export.cpp +++ b/platform/osx/export/export.cpp @@ -88,8 +88,15 @@ public: }; void EditorExportPlatformOSX::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) { - - // what does this need to do? + if (p_preset->get("texture_format/s3tc")) { + r_features->push_back("s3tc"); + } + if (p_preset->get("texture_format/etc")) { + r_features->push_back("etc"); + } + if (p_preset->get("texture_format/etc2")) { + r_features->push_back("etc2"); + } } void EditorExportPlatformOSX::get_export_options(List<ExportOption> *r_options) { @@ -112,6 +119,10 @@ void EditorExportPlatformOSX::get_export_options(List<ExportOption> *r_options) r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/identity"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "codesign/entitlements"), "")); #endif + + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/s3tc"), true)); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc"), false)); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc2"), false)); } void EditorExportPlatformOSX::_make_icon(const Ref<Image> &p_icon, Vector<uint8_t> &p_data) { |