[Bf-blender-cvs] [9f89166b52b] blender-v2.92-release master: Fix T85148: OptiX viewport denoising regression

[Patrick Mours]

Commit: 9f89166b52b1de880c14847a1d0cd830d7c83f5b
Author: Patrick Mours
Date:   Fri Jan 29 13:35:00 2021 +0100
Branches: blender-v2.92-release master
https://developer.blender.org/rB9f89166b52b1de880c14847a1d0cd830d7c83f5b

Fix T85148: OptiX viewport denoising regression

Commit 6e74a8b69f215e63e136cb4c497e738371ac798f changed the denoiser input passes default to
include the normal pass. This does not always produce optimal images though, hence why the
default was previously set to only include the color and albedo passes. This restores that behavior, so
that viewport denoising with OptiX produces the same results as before.

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

M	intern/cycles/device/device_task.h

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

diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h
index f9b47c59e95..a9298a9126c 100644
--- a/intern/cycles/device/device_task.h
+++ b/intern/cycles/device/device_task.h
@@ -100,7 +100,9 @@ class DenoiseParams {
     neighbor_frames = 2;
     clamp_input = true;
 
-    input_passes = DENOISER_INPUT_RGB_ALBEDO_NORMAL;
+    /* Default to color + albedo only, since normal input does not always have the desired effect
+     * when denoising with OptiX. */
+    input_passes = DENOISER_INPUT_RGB_ALBEDO;
 
     start_sample = 0;
   }