[Bf-blender-cvs] [3fa449a448d] soc-2020-production-ready-light-tree: More light tree volume tweaks

[Sam Kottler]

Commit: 3fa449a448d49e2c81a43d90b3880262e144eb2f
Author: Sam Kottler
Date:   Wed Jul 29 12:40:15 2020 -0600
Branches: soc-2020-production-ready-light-tree
https://developer.blender.org/rB3fa449a448d49e2c81a43d90b3880262e144eb2f

More light tree volume tweaks

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

M	intern/cycles/kernel/kernel_path_branched.h
M	intern/cycles/kernel/kernel_volume.h

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

diff --git a/intern/cycles/kernel/kernel_path_branched.h b/intern/cycles/kernel/kernel_path_branched.h
index 906304a08a5..2f7c3d8ae82 100644
--- a/intern/cycles/kernel/kernel_path_branched.h
+++ b/intern/cycles/kernel/kernel_path_branched.h
@@ -178,7 +178,7 @@ ccl_device_forceinline void kernel_branched_path_volume(KernelGlobals *kg,
       VolumeIntegrateResult result = kernel_volume_integrate(
           kg, &ps, sd, &volume_ray, L, &tp, step_size);
 
-      kernel_update_light_picking(kg, sd, &ps, NULL);
+      kernel_update_light_picking(kg, sd, &ps, &volume_ray);
 
 #      ifdef __VOLUME_SCATTER__
       if (result == VOLUME_PATH_SCATTERED) {
diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index 4a46489f894..6613e5d2456 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -1127,6 +1127,9 @@ ccl_device VolumeIntegrateResult kernel_volume_decoupled_scatter(KernelGlobals *
 
   kernel_update_light_picking(kg, sd, state, NULL);
 
+  sd->N_pick = ray->D;
+  sd->t_pick = ray->t;
+
   return VOLUME_PATH_SCATTERED;
 }
 #  endif /* __SPLIT_KERNEL */