Merge branch 'blender-v2.92-release'

2021-01-29 13:35:21 +01:00
parent b8feac9c81 9f89166b52
commit b2e00e8f8e
1 changed files with 3 additions and 1 deletions
--- 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;
  }