From f7a071bd609ef37be47ad943fbcf964ee97167b0 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 11 Mar 2024 12:58:46 +0100 Subject: [PATCH] Fix: Build failing when WITH_OPENIMAGEDENOISE is OFF --- intern/cycles/integrator/denoiser.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/intern/cycles/integrator/denoiser.cpp b/intern/cycles/integrator/denoiser.cpp index 1724959d1af..167304c8504 100644 --- a/intern/cycles/integrator/denoiser.cpp +++ b/intern/cycles/integrator/denoiser.cpp @@ -48,20 +48,27 @@ unique_ptr Denoiser::create(Device *path_trace_device, const DenoisePa DenoiserType Denoiser::automatic_viewport_denoiser_type(const DeviceInfo &path_trace_device_info) { +#ifdef WITH_OPENIMAGEDENOISE 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()) { +#endif + +#ifdef WITH_OPTIX + if (!Device::available_devices(DEVICE_MASK_OPTIX).empty()) { return DENOISER_OPTIX; } - else if (openimagedenoise_supported()) { +#endif + +#ifdef WITH_OPENIMAGEDENOISE + if (openimagedenoise_supported()) { return DENOISER_OPENIMAGEDENOISE; } - else { - return DENOISER_NONE; - } +#endif + + return DENOISER_NONE; } Denoiser::Denoiser(Device *path_trace_device, const DenoiseParams ¶ms)