godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Merge pull request #107215 from syntaxerror247/fix-warning

Browse Source 
Show shader baker related export warnings only if enabled
This commit is contained in:
Rémi Verschelde
2025-06-07 00:44:06 +02:00
parent 052e7cf155 8bf87a6b2c
commit a663949a7d
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/export/editor_export_platform_apple_embedded.cpp
View File

@@ -190,7 +190,7 @@ String EditorExportPlatformAppleEmbedded::get_export_option_warning(const Editor
if (access == 0) { if (access == 0) {
return TTR("At least one system boot time access reason should be selected."); return TTR("At least one system boot time access reason should be selected.");
} }
} else if (p_name == "shader_baker/enabled") { } else if (p_name == "shader_baker/enabled" && bool(p_preset->get("shader_baker/enabled"))) {
String export_renderer = GLOBAL_GET("rendering/renderer/rendering_method.mobile"); String export_renderer = GLOBAL_GET("rendering/renderer/rendering_method.mobile");
if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") { if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
return TTR("\"Shader Baker\" doesn't work with the Compatibility renderer."); return TTR("\"Shader Baker\" doesn't work with the Compatibility renderer.");

2
editor/export/editor_export_platform_pc.cpp
View File

@@ -66,7 +66,7 @@ void EditorExportPlatformPC::get_export_options(List<ExportOption> *r_options) c
} }
String EditorExportPlatformPC::get_export_option_warning(const EditorExportPreset *p_preset, const StringName &p_name) const { String EditorExportPlatformPC::get_export_option_warning(const EditorExportPreset *p_preset, const StringName &p_name) const {
if (p_name == "shader_baker/enabled") { if (p_name == "shader_baker/enabled" && bool(p_preset->get("shader_baker/enabled"))) {
String export_renderer = GLOBAL_GET("rendering/renderer/rendering_method"); String export_renderer = GLOBAL_GET("rendering/renderer/rendering_method");
if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") { if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
return TTR("\"Shader Baker\" is not supported when using the Compatibility renderer."); return TTR("\"Shader Baker\" is not supported when using the Compatibility renderer.");

2
platform/android/export/export_plugin.cpp
View File

@@ -2067,7 +2067,7 @@ String EditorExportPlatformAndroid::get_export_option_warning(const EditorExport
if (!bool(p_preset->get("package/show_in_app_library")) && !gradle_build_enabled) { if (!bool(p_preset->get("package/show_in_app_library")) && !gradle_build_enabled) {
return TTR("\"Use Gradle Build\" must be enabled to disable \"Show In App Library\"."); return TTR("\"Use Gradle Build\" must be enabled to disable \"Show In App Library\".");
} }
} else if (p_name == "shader_baker/enabled") { } else if (p_name == "shader_baker/enabled" && bool(p_preset->get("shader_baker/enabled"))) {
String export_renderer = GLOBAL_GET("rendering/renderer/rendering_method.mobile"); String export_renderer = GLOBAL_GET("rendering/renderer/rendering_method.mobile");
if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") { if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
return TTR("\"Shader Baker\" is not supported when using the Compatibility renderer."); return TTR("\"Shader Baker\" is not supported when using the Compatibility renderer.");

2
platform/macos/export/export_plugin.cpp
View File

@@ -103,7 +103,7 @@ String EditorExportPlatformMacOS::get_export_option_warning(const EditorExportPr
} }
} }
if (p_name == "shader_baker/enabled") { if (p_name == "shader_baker/enabled" && bool(p_preset->get("shader_baker/enabled"))) {
String export_renderer = GLOBAL_GET("rendering/renderer/rendering_method"); String export_renderer = GLOBAL_GET("rendering/renderer/rendering_method");
if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") { if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
return TTR("\"Shader Baker\" is not supported when using the Compatibility renderer."); return TTR("\"Shader Baker\" is not supported when using the Compatibility renderer.");