[Bf-blender-cvs] [c8e93da0a75] blender-v3.0-release: Fix Cycles assert in denoising fallback to OIDN

[Brecht Van Lommel]

Commit: c8e93da0a754a4f936a0849d5eba753695b7a153
Author: Brecht Van Lommel
Date:   Tue Nov 9 19:07:10 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rBc8e93da0a754a4f936a0849d5eba753695b7a153

Fix Cycles assert in denoising fallback to OIDN

===================================================================

M	intern/cycles/integrator/denoiser.cpp

===================================================================

diff --git a/intern/cycles/integrator/denoiser.cpp b/intern/cycles/integrator/denoiser.cpp
index b89024e0c85..2a5f99f358b 100644
--- a/intern/cycles/integrator/denoiser.cpp
+++ b/intern/cycles/integrator/denoiser.cpp
@@ -33,7 +33,10 @@ unique_ptr<Denoiser> Denoiser::create(Device *path_trace_device, const DenoisePa
     return make_unique<OptiXDenoiser>(path_trace_device, params);
   }
 
-  return make_unique<OIDNDenoiser>(path_trace_device, params);
+  /* Always fallback to OIDN. */
+  DenoiseParams oidn_params = params;
+  oidn_params.type = DENOISER_OPENIMAGEDENOISE;
+  return make_unique<OIDNDenoiser>(path_trace_device, oidn_params);
 }
 
 Denoiser::Denoiser(Device *path_trace_device, const DenoiseParams &params)