diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2023-02-23 20:34:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-23 20:34:30 +0100 |
| commit | e930c8d3838280e40baabc4426bd8236f7ac50a3 (patch) | |
| tree | 790945efd2628824be068afb304302450c96d960 /editor/export | |
| parent | e0de3573f3fc86062763152f5a1ac62f5a986da3 (diff) | |
| parent | e10a15fc19456bbb5240faca456bde18cf5dbace (diff) | |
Merge pull request #73829 from akien-mga/export-pc-s3tc+bptc
Export: Default to exporting S3TC + BPTC for PC platforms
Diffstat (limited to 'editor/export')
| -rw-r--r-- | editor/export/editor_export_platform_pc.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/editor/export/editor_export_platform_pc.cpp b/editor/export/editor_export_platform_pc.cpp index 7f934bc45b..f62b22881c 100644 --- a/editor/export/editor_export_platform_pc.cpp +++ b/editor/export/editor_export_platform_pc.cpp @@ -59,11 +59,10 @@ void EditorExportPlatformPC::get_export_options(List<ExportOption> *r_options) { r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "binary_format/embed_pck"), false)); - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/bptc"), false)); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/bptc"), true)); 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)); - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/no_bptc_fallbacks"), true)); } String EditorExportPlatformPC::get_name() const { @@ -242,11 +241,6 @@ void EditorExportPlatformPC::get_platform_features(List<String> *r_features) con } void EditorExportPlatformPC::resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, HashSet<String> &p_features) { - if (p_features.has("bptc")) { - if (p_preset->has("texture_format/no_bptc_fallbacks")) { - p_features.erase("s3tc"); - } - } } int EditorExportPlatformPC::get_chmod_flags() const { |