[Bf-blender-cvs] [c7462e957ed] soc-2020-production-ready-light-tree: Tweeks to light tree volume code

[Sam Kottler]

Commit: c7462e957ed3f1f77d202163c7e9495a917147da
Author: Sam Kottler
Date:   Tue Jul 28 10:12:19 2020 -0600
Branches: soc-2020-production-ready-light-tree
https://developer.blender.org/rBc7462e957ed3f1f77d202163c7e9495a917147da

Tweeks to light tree volume code

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

M	intern/cycles/kernel/kernel_light.h
M	intern/cycles/kernel/kernel_path.h
M	intern/cycles/kernel/kernel_path_branched.h
M	intern/cycles/kernel/kernel_path_volume.h

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

diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index 2e2f7349d94..d8c7946831a 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -48,8 +48,8 @@ ccl_device void kernel_update_light_picking(KernelGlobals *kg,
                                             Ray *ray)
 {
   if (ray) {
-    sd->P_pick = sd->P;  // ray->P + ray->D * ray->t;
-    sd->N_pick = -ray->D;
+    sd->P_pick = ray->P;
+    sd->N_pick = ray->D;
     sd->t_pick = ray->t;
     return;
   }
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h
index ae562048c95..ad08a2cb5a0 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -187,7 +187,7 @@ ccl_device_forceinline VolumeIntegrateResult kernel_path_volume(KernelGlobals *k
     shader_setup_from_volume(kg, sd, &volume_ray);
     kernel_volume_decoupled_record(kg, state, &volume_ray, sd, &volume_segment, step_size);
 
-    kernel_update_light_picking(kg, sd, state, NULL);
+    kernel_update_light_picking(kg, sd, state, &volume_ray);
 
     volume_segment.sampling_method = sampling_method;
 
diff --git a/intern/cycles/kernel/kernel_path_branched.h b/intern/cycles/kernel/kernel_path_branched.h
index 6a088c8bc69..906304a08a5 100644
--- a/intern/cycles/kernel/kernel_path_branched.h
+++ b/intern/cycles/kernel/kernel_path_branched.h
@@ -102,7 +102,7 @@ ccl_device_forceinline void kernel_branched_path_volume(KernelGlobals *kg,
     shader_setup_from_volume(kg, sd, &volume_ray);
     kernel_volume_decoupled_record(kg, state, &volume_ray, sd, &volume_segment, step_size);
 
-    kernel_update_light_picking(kg, sd, state, ray);
+    kernel_update_light_picking(kg, sd, state, &volume_ray);
 
     /* direct light sampling */
     if (volume_segment.closure_flag & SD_SCATTER) {
diff --git a/intern/cycles/kernel/kernel_path_volume.h b/intern/cycles/kernel/kernel_path_volume.h
index 668172df42d..83e1019a2f2 100644
--- a/intern/cycles/kernel/kernel_path_volume.h
+++ b/intern/cycles/kernel/kernel_path_volume.h
@@ -216,7 +216,7 @@ ccl_device void kernel_branched_path_volume_connect_light(KernelGlobals *kg,
                      sd->time,
                      sd->P_pick,
                      sd->N_pick,
-                     ray->t,
+                     sd->t_pick,
                      state->bounce,
                      &ls);