Merge branch 'denoise-typo' into 'master'

Fix: Blender changed the error string

See merge request sheepitrenderfarm/client!309
This commit is contained in:
Laurent Clouet
2024-06-06 00:23:53 +00:00

View File

@@ -992,7 +992,10 @@ import java.util.regex.Pattern;
else if (line.contains("Warning: Cycles is not enabled!")) { else if (line.contains("Warning: Cycles is not enabled!")) {
return Error.Type.ENGINE_NOT_AVAILABLE; return Error.Type.ENGINE_NOT_AVAILABLE;
} }
else if (line.contains("OpenImageDenoise error: SSE4.1 support is required at minimum") || line.contains("OpenImageDenoiser is not supported on this CPU:") || line.contains("No device available to denoise on")) { else if (line.contains("OpenImageDenoise error: SSE4.1 support is required at minimum") || line.contains("OpenImageDenoiser is not supported on this CPU:") || line.contains("OpenImageDenoise is not supported on this CPU:") || line.contains("No device available to denoise on")) {
//OpenImageDenoiser is Blender pre 4.2
//OpenImageDenoise after Blender 4.2
// denoising capability detection // denoising capability detection
// Fra:201 Mem:8.89M (Peak 10.09M) | Time:00:00.04 | Mem:0.27M, Peak:0.27M | Scene, View Layer | Updating Device | Writing constant memory // Fra:201 Mem:8.89M (Peak 10.09M) | Time:00:00.04 | Mem:0.27M, Peak:0.27M | Scene, View Layer | Updating Device | Writing constant memory
// Fra:201 Mem:8.89M (Peak 10.09M) | Time:00:00.04 | Mem:0.27M, Peak:0.27M | Scene, View Layer | Loading denoising kernels (may take a few minutes the first time) // Fra:201 Mem:8.89M (Peak 10.09M) | Time:00:00.04 | Mem:0.27M, Peak:0.27M | Scene, View Layer | Loading denoising kernels (may take a few minutes the first time)