noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #119806 from bruvzg/txtx

Browse Source 
[Export] Suppress duplicate texture format errors in UI and add missing in console mode.
This commit is contained in:
Thaddeus Crews
2026-06-22 08:29:44 -05:00
parent bf3016d9cf 2b1959a476
commit b0890caade
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/export/editor_export_platform_apple_embedded.cpp
+3
View File
@@ -2361,6 +2361,9 @@ bool EditorExportPlatformAppleEmbedded::has_valid_project_configuration(const Re
}
if (!ResourceImporterTextureSettings::should_import_etc2_astc()) {
if (EditorNode::is_cmdline_mode()) {
err += vformat(TTR("ETC2/ASTC texture compression is required for %s export. In the Project Settings, search for 'ETC2' in the search field, or enable 'Advanced Settings', and go to Rendering > Textures > VRAM Compression to enable 'Import ETC2 ASTC'."), get_name()) + "\n";
}
valid = false;
}
platform/android/export/export_plugin.cpp
+1 -1
View File
@@ -3148,7 +3148,7 @@ bool EditorExportPlatformAndroid::has_valid_project_configuration(const Ref<Edit
if (!ResourceImporterTextureSettings::should_import_etc2_astc()) {
valid = false;
if (EditorNode::is_cmdline_mode()) {
err += TTR("ETC2/ASTC texture compression is required for Android export. In Project Settings, search for 'ETC2' in the search field, or enable 'Advanced Settings' and go to Rendering > Textures > VRAM Compression to enable 'Import ETC2 ASTC'.") + "\n";
err += TTR("ETC2/ASTC texture compression is required for Android export. In the Project Settings, search for 'ETC2' in the search field, or enable 'Advanced Settings', and go to Rendering > Textures > VRAM Compression to enable 'Import ETC2 ASTC'.") + "\n";
}
}
platform/macos/export/export_plugin.cpp
+6 -2
View File
@@ -2487,13 +2487,17 @@ bool EditorExportPlatformMacOS::has_valid_export_configuration(const Ref<EditorE
String architecture = p_preset->get("binary_format/architecture");
if (architecture == "universal" || architecture == "x86_64") {
if (!ResourceImporterTextureSettings::should_import_s3tc_bptc()) {
err += TTR("Cannot export for universal or x86_64 if S3TC BPTC texture format is disabled. Enable it in the Project Settings (Rendering > Textures > VRAM Compression > Import S3TC BPTC).") + "\n";
if (EditorNode::is_cmdline_mode()) {
err += TTR("Cannot export for universal or x86_64 if S3TC BPTC texture format is disabled. Enable it in the Project Settings (Rendering > Textures > VRAM Compression > Import S3TC BPTC).") + "\n";
}
valid = false;
}
}
if (architecture == "universal" || architecture == "arm64") {
if (!ResourceImporterTextureSettings::should_import_etc2_astc()) {
err += TTR("Cannot export for universal or arm64 if ETC2 ASTC texture format is disabled. Enable it in the Project Settings (Rendering > Textures > VRAM Compression > Import ETC2 ASTC).") + "\n";
if (EditorNode::is_cmdline_mode()) {
err += TTR("Cannot export for universal or arm64 if ETC2 ASTC texture format is disabled. Enable it in the Project Settings (Rendering > Textures > VRAM Compression > Import ETC2 ASTC).") + "\n";
}
valid = false;
}
}
platform/web/export/export_plugin.cpp
+3
View File
@@ -470,6 +470,9 @@ bool EditorExportPlatformWeb::has_valid_project_configuration(const Ref<EditorEx
if (p_preset->get("vram_texture_compression/for_mobile")) {
if (!ResourceImporterTextureSettings::should_import_etc2_astc()) {
if (EditorNode::is_cmdline_mode()) {
err += TTR("ETC2/ASTC texture compression is required for Web export. In the Project Settings, search for 'ETC2' in the search field, or enable 'Advanced Settings', and go to Rendering > Textures > VRAM Compression to enable 'Import ETC2 ASTC'.") + "\n";
}
valid = false;
}
}