From e10a15fc19456bbb5240faca456bde18cf5dbace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 23 Feb 2023 18:42:23 +0100 Subject: Export: Default to exporting S3TC + BPTC for PC platforms This is now required after #72031 when using HDRs. Could have further cleanup as I think these import options may not be needed at all anymore, and etc/etc2 support doesn't seem to make much sense. Likewise, the hardcoded "s3tc" in `get_platform_features` could maybe be removed. But this is material for after 4.1. Fixes #73789. --- editor/export/editor_export_platform_pc.cpp | 8 +------- 1 file changed, 1 insertion(+), 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 *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 *r_features) con } void EditorExportPlatformPC::resolve_platform_feature_priorities(const Ref &p_preset, HashSet &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 { -- cgit v1.2.3