[Bf-blender-cvs] [3dc0178390e] master: Fix T78662: Cycles baking fails if denoising is enabled, after recent changes

[Brecht Van Lommel]

Commit: 3dc0178390ecdb30aeb7517afd7e3ef2373cc9fa
Author: Brecht Van Lommel
Date:   Fri Jul 10 20:00:20 2020 +0200
Branches: master
https://developer.blender.org/rB3dc0178390ecdb30aeb7517afd7e3ef2373cc9fa

Fix T78662: Cycles baking fails if denoising is enabled, after recent changes

This is not supported yet.

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

M	intern/cycles/device/device_cpu.cpp
M	intern/cycles/render/session.cpp

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

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index c88c7364446..af8db5b75b8 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -181,8 +181,8 @@ class CPUDevice : public Device {
 #ifdef WITH_OPENIMAGEDENOISE
   oidn::DeviceRef oidn_device;
   oidn::FilterRef oidn_filter;
-  thread_spin_lock oidn_task_lock;
 #endif
+  thread_spin_lock oidn_task_lock;
 
   bool use_split_kernel;
 
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 9383750bd28..c5033359c6b 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -1128,6 +1128,11 @@ bool Session::render_need_denoise(bool &delayed)
 {
   delayed = false;
 
+  /* Not supported yet for baking. */
+  if (read_bake_tile_cb) {
+    return false;
+  }
+
   /* Denoising enabled? */
   if (!params.denoising.need_denoising_task()) {
     return false;