[Bf-blender-cvs] [bf1fbd73a1f] soc-2022-many-lights-sampling: Fix an incorrect merge with master

[Brecht Van Lommel]

Commit: bf1fbd73a1fa5022736c73df9fb67a2cb9073a3f
Author: Brecht Van Lommel
Date:   Mon Sep 12 15:16:29 2022 +0200
Branches: soc-2022-many-lights-sampling
https://developer.blender.org/rBbf1fbd73a1fa5022736c73df9fb67a2cb9073a3f

Fix an incorrect merge with master

Contributed by Alaska.

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

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

M	intern/cycles/kernel/integrator/shade_background.h
M	intern/cycles/kernel/integrator/shade_surface.h

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

diff --git a/intern/cycles/kernel/integrator/shade_background.h b/intern/cycles/kernel/integrator/shade_background.h
index 2e0bbc4899d..99d2cb6aa2e 100644
--- a/intern/cycles/kernel/integrator/shade_background.h
+++ b/intern/cycles/kernel/integrator/shade_background.h
@@ -191,7 +191,7 @@ ccl_device_inline void integrate_distant_lights(KernelGlobals kg,
           const float3 N = INTEGRATOR_STATE(state, path, mis_origin_n);
           ls.pdf *= distant_lights_pdf(kg, ray_P, N, lamp);
         }
-        const float mis_weight = light_sample_mis_weight_forward(kg, mis_ray_pdf, ls.pdf);
+        mis_weight = light_sample_mis_weight_forward(kg, mis_ray_pdf, ls.pdf);
       }
 
       /* Write to render buffer. */
diff --git a/intern/cycles/kernel/integrator/shade_surface.h b/intern/cycles/kernel/integrator/shade_surface.h
index 0215213e12f..42faaafebdb 100644
--- a/intern/cycles/kernel/integrator/shade_surface.h
+++ b/intern/cycles/kernel/integrator/shade_surface.h
@@ -134,7 +134,7 @@ ccl_device_forceinline void integrate_surface_emission(KernelGlobals kg,
       uint prim_offset = kernel_data_fetch(object_prim_offset, sd->object);
       pdf *= light_tree_pdf(kg, state, ray_P, N, sd->prim - prim_offset + lookup_offset);
     }
-    float mis_weight = light_sample_mis_weight_forward(kg, bsdf_pdf, pdf);
+    mis_weight = light_sample_mis_weight_forward(kg, bsdf_pdf, pdf);
   }
 
   film_write_surface_emission(