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

This is not supported yet.
Referenced by issue #78662, Selected to Active Baking
2020-07-10 20:00:20 +02:00 · 2020-07-10 20:00:20 +02:00 · 3dc0178390 · 2023-02-14 11:00:17 +01:00
parent 6fbacd6048
commit 3dc0178390
2 changed files with 6 additions and 1 deletions
--- 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;

--- 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;