From 989e9ef890871e5b6bd136b56606107421aabf2a Mon Sep 17 00:00:00 2001 From: Alaska Date: Mon, 11 Mar 2024 12:54:45 +0100 Subject: [PATCH] Fix: Assert in Cycles multi-device OIDN check Co-authored-by: Brecht Van Lommel Pull Request: https://projects.blender.org/blender/blender/pulls/119267 --- intern/cycles/integrator/denoiser.cpp | 4 +++- intern/cycles/integrator/denoiser_oidn_gpu.cpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/intern/cycles/integrator/denoiser.cpp b/intern/cycles/integrator/denoiser.cpp index f7b2567d154..1724959d1af 100644 --- a/intern/cycles/integrator/denoiser.cpp +++ b/intern/cycles/integrator/denoiser.cpp @@ -48,7 +48,9 @@ unique_ptr Denoiser::create(Device *path_trace_device, const DenoisePa DenoiserType Denoiser::automatic_viewport_denoiser_type(const DeviceInfo &path_trace_device_info) { - if (OIDNDenoiserGPU::is_device_supported(path_trace_device_info)) { + if (path_trace_device_info.type != DEVICE_CPU && + OIDNDenoiserGPU::is_device_supported(path_trace_device_info)) + { return DENOISER_OPENIMAGEDENOISE; } else if (!Device::available_devices(DEVICE_MASK_OPTIX).empty()) { diff --git a/intern/cycles/integrator/denoiser_oidn_gpu.cpp b/intern/cycles/integrator/denoiser_oidn_gpu.cpp index bc54c3d7edc..a452cbe4f62 100644 --- a/intern/cycles/integrator/denoiser_oidn_gpu.cpp +++ b/intern/cycles/integrator/denoiser_oidn_gpu.cpp @@ -36,6 +36,8 @@ bool OIDNDenoiserGPU::is_device_supported(const DeviceInfo &device) return true; } } + + return false; } int device_type = OIDN_DEVICE_TYPE_DEFAULT;