Skip to content

Commit 8bf87a6

Browse files
Show shader baker related export warnings only if enabled
1 parent 5dd7696 commit 8bf87a6

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

editor/export/editor_export_platform_apple_embedded.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ String EditorExportPlatformAppleEmbedded::get_export_option_warning(const Editor
190190
if (access == 0) {
191191
return TTR("At least one system boot time access reason should be selected.");
192192
}
193-
} else if (p_name == "shader_baker/enabled") {
193+
} else if (p_name == "shader_baker/enabled" && bool(p_preset->get("shader_baker/enabled"))) {
194194
String export_renderer = GLOBAL_GET("rendering/renderer/rendering_method.mobile");
195195
if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
196196
return TTR("\"Shader Baker\" doesn't work with the Compatibility renderer.");

editor/export/editor_export_platform_pc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void EditorExportPlatformPC::get_export_options(List<ExportOption> *r_options) c
6666
}
6767

6868
String EditorExportPlatformPC::get_export_option_warning(const EditorExportPreset *p_preset, const StringName &p_name) const {
69-
if (p_name == "shader_baker/enabled") {
69+
if (p_name == "shader_baker/enabled" && bool(p_preset->get("shader_baker/enabled"))) {
7070
String export_renderer = GLOBAL_GET("rendering/renderer/rendering_method");
7171
if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
7272
return TTR("\"Shader Baker\" is not supported when using the Compatibility renderer.");

platform/android/export/export_plugin.cpp

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

platform/macos/export/export_plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ String EditorExportPlatformMacOS::get_export_option_warning(const EditorExportPr
103103
}
104104
}
105105

106-
if (p_name == "shader_baker/enabled") {
106+
if (p_name == "shader_baker/enabled" && bool(p_preset->get("shader_baker/enabled"))) {
107107
String export_renderer = GLOBAL_GET("rendering/renderer/rendering_method");
108108
if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
109109
return TTR("\"Shader Baker\" is not supported when using the Compatibility renderer.");

0 commit comments

Comments
 (0)