[Bf-blender-cvs] [d0954110024] master: Fix T83544: Cycles crash when rendering with Save Buffers enabled

[Jacques Lucke]

Commit: d0954110024fa6eb0c826bf211a4edf117b69788
Author: Jacques Lucke
Date:   Mon Jan 11 10:21:38 2021 +0100
Branches: master
https://developer.blender.org/rBd0954110024fa6eb0c826bf211a4edf117b69788

Fix T83544: Cycles crash when rendering with Save Buffers enabled

The issue is that the "Noisy Image" pass is added even though it should not.

`use_denoising` has to be enabled on the scene and on the view layer
to actually enable it.

Differential Revision: https://developer.blender.org/D10048

Reviewers: lukasstockner97, brecht

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

M	intern/cycles/blender/addon/engine.py

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

diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index 69ad1321c1a..179eea6461c 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -282,7 +282,7 @@ def list_render_passes(scene, srl):
             yield ("CryptoAsset" + '{:02d}'.format(i), "RGBA", 'COLOR')
 
     # Denoising passes.
-    if crl.use_denoising or crl.denoising_store_passes:
+    if (scene.cycles.use_denoising and crl.use_denoising) or crl.denoising_store_passes:
         yield ("Noisy Image", "RGBA", 'COLOR')
         if crl.denoising_store_passes:
             yield ("Denoising Normal",          "XYZ", 'VECTOR')