diff --git a/editor/export/editor_export_platform_apple_embedded.cpp b/editor/export/editor_export_platform_apple_embedded.cpp index ec4480082f5..aaf561060bd 100644 --- a/editor/export/editor_export_platform_apple_embedded.cpp +++ b/editor/export/editor_export_platform_apple_embedded.cpp @@ -52,7 +52,8 @@ void EditorExportPlatformAppleEmbedded::get_preset_features(const Refpush_back("etc2"); r_features->push_back("astc"); - if (p_preset->get("shader_baker/enabled")) { + if (!p_preset->is_dedicated_server() && p_preset->get("shader_baker/enabled")) { + // Don't use the shader baker if exporting as a dedicated server, as no rendering is performed. r_features->push_back("shader_baker"); } diff --git a/editor/export/editor_export_platform_pc.cpp b/editor/export/editor_export_platform_pc.cpp index 2a2983d4337..9ad8acce565 100644 --- a/editor/export/editor_export_platform_pc.cpp +++ b/editor/export/editor_export_platform_pc.cpp @@ -42,7 +42,8 @@ void EditorExportPlatformPC::get_preset_features(const Ref & r_features->push_back("etc2"); r_features->push_back("astc"); } - if (p_preset->get("shader_baker/enabled")) { + if (!p_preset->is_dedicated_server() && p_preset->get("shader_baker/enabled")) { + // Don't use the shader baker if exporting as a dedicated server, as no rendering is performed. r_features->push_back("shader_baker"); } // PC platforms only have one architecture per export, since diff --git a/platform/android/doc_classes/EditorExportPlatformAndroid.xml b/platform/android/doc_classes/EditorExportPlatformAndroid.xml index a6b392610bf..5db594d0976 100644 --- a/platform/android/doc_classes/EditorExportPlatformAndroid.xml +++ b/platform/android/doc_classes/EditorExportPlatformAndroid.xml @@ -627,6 +627,7 @@ If [code]true[/code], shaders will be compiled and embedded in the application. This option is only supported when using the Forward+ or Mobile renderers. + [b]Note:[/b] When exporting as a dedicated server, the shader baker is always disabled since no rendering is performed. If [code]true[/code], allows the application to participate in the backup and restore infrastructure. diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index 14f5ef6f0fa..3b624693110 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -1977,7 +1977,8 @@ void EditorExportPlatformAndroid::get_preset_features(const Refpush_back("etc2"); r_features->push_back("astc"); - if (p_preset->get("shader_baker/enabled")) { + if (!p_preset->is_dedicated_server() && p_preset->get("shader_baker/enabled")) { + // Don't use the shader baker if exporting as a dedicated server, as no rendering is performed. r_features->push_back("shader_baker"); } diff --git a/platform/ios/doc_classes/EditorExportPlatformIOS.xml b/platform/ios/doc_classes/EditorExportPlatformIOS.xml index e22850bc9a7..17388d1c9c9 100644 --- a/platform/ios/doc_classes/EditorExportPlatformIOS.xml +++ b/platform/ios/doc_classes/EditorExportPlatformIOS.xml @@ -730,6 +730,7 @@ If [code]true[/code], shaders will be compiled and embedded in the application. This option is only supported when using the Forward+ or Mobile renderers. + [b]Note:[/b] When exporting as a dedicated server, the shader baker is always disabled since no rendering is performed. A custom background color of the storyboard launch screen. diff --git a/platform/linuxbsd/doc_classes/EditorExportPlatformLinuxBSD.xml b/platform/linuxbsd/doc_classes/EditorExportPlatformLinuxBSD.xml index 7425f49b1b6..3a7f086cb16 100644 --- a/platform/linuxbsd/doc_classes/EditorExportPlatformLinuxBSD.xml +++ b/platform/linuxbsd/doc_classes/EditorExportPlatformLinuxBSD.xml @@ -28,6 +28,7 @@ If [code]true[/code], shaders will be compiled and embedded in the application. This option is only supported when using the Forward+ or Mobile renderers. + [b]Note:[/b] When exporting as a dedicated server, the shader baker is always disabled since no rendering is performed. Script code to execute on the remote host when app is finished. diff --git a/platform/macos/doc_classes/EditorExportPlatformMacOS.xml b/platform/macos/doc_classes/EditorExportPlatformMacOS.xml index 50767adac82..6d5fdc266d4 100644 --- a/platform/macos/doc_classes/EditorExportPlatformMacOS.xml +++ b/platform/macos/doc_classes/EditorExportPlatformMacOS.xml @@ -704,6 +704,7 @@ If [code]true[/code], shaders will be compiled and embedded in the application. This option is only supported when using the Forward+ or Mobile renderers. + [b]Note:[/b] When exporting as a dedicated server, the shader baker is always disabled since no rendering is performed. Script code to execute on the remote host when app is finished. diff --git a/platform/macos/export/export_plugin.cpp b/platform/macos/export/export_plugin.cpp index 24d720bc8b0..3af9bf985e2 100644 --- a/platform/macos/export/export_plugin.cpp +++ b/platform/macos/export/export_plugin.cpp @@ -63,7 +63,8 @@ void EditorExportPlatformMacOS::get_preset_features(const Refget("shader_baker/enabled")) { + if (!p_preset->is_dedicated_server() && p_preset->get("shader_baker/enabled")) { + // Don't use the shader baker if exporting as a dedicated server, as no rendering is performed. r_features->push_back("shader_baker"); } diff --git a/platform/visionos/doc_classes/EditorExportPlatformVisionOS.xml b/platform/visionos/doc_classes/EditorExportPlatformVisionOS.xml index 255c46e2858..36de17b94b3 100644 --- a/platform/visionos/doc_classes/EditorExportPlatformVisionOS.xml +++ b/platform/visionos/doc_classes/EditorExportPlatformVisionOS.xml @@ -582,6 +582,7 @@ If [code]true[/code], shaders will be compiled and embedded in the application. This option is only supported when using the Forward+ and Mobile renderers. + [b]Note:[/b] When exporting as a dedicated server, the shader baker is always disabled since no rendering is performed. If [code]true[/code], the app "Documents" folder can be accessed via "Files" app. See [url=https://developer.apple.com/documentation/bundleresources/information_property_list/lssupportsopeningdocumentsinplace]LSSupportsOpeningDocumentsInPlace[/url]. diff --git a/platform/windows/doc_classes/EditorExportPlatformWindows.xml b/platform/windows/doc_classes/EditorExportPlatformWindows.xml index 3faf75bf393..5c263d95a2a 100644 --- a/platform/windows/doc_classes/EditorExportPlatformWindows.xml +++ b/platform/windows/doc_classes/EditorExportPlatformWindows.xml @@ -100,6 +100,7 @@ If [code]true[/code], shaders will be compiled and embedded in the application. This option is only supported when using the Forward+ and Mobile renderers. + [b]Note:[/b] When exporting as a dedicated server, the shader baker is always disabled since no rendering is performed. Script code to execute on the remote host when app is finished.