[Bf-blender-cvs] [3405926345e] cycles-x: Fix over-exposed float3 passes in Cycles X

[Sergey Sharybin]

Commit: 3405926345e0cf75f640bbcd3d80dac770349b35
Author: Sergey Sharybin
Date:   Mon Jul 5 11:52:08 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB3405926345e0cf75f640bbcd3d80dac770349b35

Fix over-exposed float3 passes in Cycles X

Was affecting configurations when adaptive sampling is used
and passes like Denoising Albedo.

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

M	intern/cycles/kernel/kernel_film.h

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

diff --git a/intern/cycles/kernel/kernel_film.h b/intern/cycles/kernel/kernel_film.h
index c84957d38c1..589af4b852e 100644
--- a/intern/cycles/kernel/kernel_film.h
+++ b/intern/cycles/kernel/kernel_film.h
@@ -53,12 +53,13 @@ ccl_device_inline float film_get_scale_exposure(const KernelFilmConvert *ccl_res
     return kfilm_convert->scale_exposure;
   }
 
+  const float scale = film_get_scale(kfilm_convert, buffer);
+
   if (kfilm_convert->pass_use_exposure) {
-    const float scale = film_get_scale(kfilm_convert, buffer);
     return scale * kfilm_convert->exposure;
   }
 
-  return 1.0f;
+  return scale;
 }
 
 ccl_device_inline void film_get_scale_and_scale_exposure(