diff options
| author | Campbell Barton <campbell@blender.org> | 2022-05-12 10:49:40 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-05-12 10:49:40 +0300 |
| commit | 1242e8b93caaad7be3a920d19add43a31bf442d0 (patch) | |
| tree | 6762d446f28c25f2d76a57b03612ab7766e71126 | |
| parent | 3b0a08b79306a25dd0f5ec7f92942d5c2bcc017c (diff) | |
| parent | 3e782bba7180b7f59cb378898bb677fbf3976996 (diff) | |
Merge branch 'blender-v3.2-release'
| -rw-r--r-- | intern/cycles/integrator/denoiser_oidn.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/integrator/denoiser_oidn.cpp b/intern/cycles/integrator/denoiser_oidn.cpp index 41e5165623c..b074408e229 100644 --- a/intern/cycles/integrator/denoiser_oidn.cpp +++ b/intern/cycles/integrator/denoiser_oidn.cpp @@ -626,6 +626,7 @@ uint OIDNDenoiser::get_device_type_mask() const Device *OIDNDenoiser::ensure_denoiser_device(Progress *progress) { #ifndef WITH_OPENIMAGEDENOISE + (void)progress; path_trace_device_->set_error("Build without OpenImageDenoiser"); return nullptr; #else |