[Bf-blender-cvs] [2452031268a] soc-2020-production-ready-light-tree-2: Cycles: never hard code -1 for t_max when calling light_sample
Sam Kottler
noreply at git.blender.org
Wed Aug 19 21:02:29 CEST 2020
Commit: 2452031268a606c4b0e1652f8389c0496cd79a45
Author: Sam Kottler
Date: Tue Aug 18 09:39:11 2020 -0500
Branches: soc-2020-production-ready-light-tree-2
https://developer.blender.org/rB2452031268a606c4b0e1652f8389c0496cd79a45
Cycles: never hard code -1 for t_max when calling light_sample
===================================================================
M intern/cycles/kernel/kernel_path_surface.h
M intern/cycles/kernel/kernel_path_volume.h
M intern/cycles/kernel/split/kernel_direct_lighting.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_path_surface.h b/intern/cycles/kernel/kernel_path_surface.h
index 576b307bec2..1f4ea929c45 100644
--- a/intern/cycles/kernel/kernel_path_surface.h
+++ b/intern/cycles/kernel/kernel_path_surface.h
@@ -396,7 +396,7 @@ ccl_device_noinline_cpu void kernel_branched_path_surface_connect_light(
sd->time,
sd->P_pick,
sd->N_pick,
- -1.0f,
+ sd->t_pick,
state->bounce,
&ls)) {
/* The sampling probability returned by lamp_light_sample assumes that all lights were
@@ -534,7 +534,7 @@ ccl_device_inline void kernel_path_surface_connect_light(KernelGlobals *kg,
sd->time,
sd->P_pick,
sd->N_pick,
- -1.0f,
+ sd->t_pick,
state->bounce,
&ls)) {
float terminate = path_state_rng_light_termination(kg, state);
diff --git a/intern/cycles/kernel/kernel_path_volume.h b/intern/cycles/kernel/kernel_path_volume.h
index e8fb45d19aa..08c439f01df 100644
--- a/intern/cycles/kernel/kernel_path_volume.h
+++ b/intern/cycles/kernel/kernel_path_volume.h
@@ -552,7 +552,7 @@ ccl_device void kernel_branched_path_volume_connect_light(KernelGlobals *kg,
sd->time,
sd->P_pick,
sd->N_pick,
- -1.0,
+ sd->t_pick,
state->bounce,
&ls)) {
if (double_pdf) {
diff --git a/intern/cycles/kernel/split/kernel_direct_lighting.h b/intern/cycles/kernel/split/kernel_direct_lighting.h
index f4eface860b..a136f8e8ae9 100644
--- a/intern/cycles/kernel/split/kernel_direct_lighting.h
+++ b/intern/cycles/kernel/split/kernel_direct_lighting.h
@@ -93,7 +93,7 @@ ccl_device void kernel_direct_lighting(KernelGlobals *kg,
sd->time,
sd->P_pick,
sd->N_pick,
- -1.0f,
+ sd->t_pick,
state->bounce,
&ls)) {
Ray light_ray;
More information about the Bf-blender-cvs
mailing list