[Bf-blender-cvs] [421ce2a] soc-2014-cycles: Cleanup: Don't check ls.pdf here, we already check for it in direct_emission().

[Thomas Dinges]

Commit: 421ce2a57e4f0c6422619ba2f89b93b1ade2ccf4
Author: Thomas Dinges
Date:   Sat Aug 2 14:38:45 2014 +0200
Branches: soc-2014-cycles
https://developer.blender.org/rB421ce2a57e4f0c6422619ba2f89b93b1ade2ccf4

Cleanup: Don't check ls.pdf here, we already check for it in direct_emission().

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

M       intern/cycles/kernel/kernel_path_volume.h

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

diff --git a/intern/cycles/kernel/kernel_path_volume.h 
b/intern/cycles/kernel/kernel_path_volume.h
index 731937d..fd22daf 100644
--- a/intern/cycles/kernel/kernel_path_volume.h
+++ b/intern/cycles/kernel/kernel_path_volume.h
@@ -42,8 +42,6 @@ ccl_device void 
kernel_path_volume_connect_light(KernelGlobals *kg, RNG *rng,
 #endif
 
        light_sample(kg, light_t, light_u, light_v, sd->time, sd->P, &ls);
-       if(ls.pdf == 0.0f)
-               return;
        
        if(direct_emission(kg, sd, &ls, &light_ray, &L_light, &is_lamp, 
state->bounce, state->transparent_bounce)) {
                /* trace shadow ray */
@@ -156,9 +154,6 @@ ccl_device void 
kernel_branched_path_volume_connect_light(KernelGlobals *kg, RNG
                                        lamp_light_sample(kg, i, light_u, 
light_v, ray->P, &ls);
                                }
 
-                               if(ls.pdf == 0.0f)
-                                       continue;
-
                                if(direct_emission(kg, sd, &ls, &light_ray, 
&L_light, &is_lamp, state->bounce, state->transparent_bounce)) {
                                        /* trace shadow ray */
                                        float3 shadow;
@@ -212,9 +207,6 @@ ccl_device void 
kernel_branched_path_volume_connect_light(KernelGlobals *kg, RNG
                                        light_sample(kg, light_t, light_u, 
light_v, sd->time, ray->P, &ls);
                                }
 
-                               if(ls.pdf == 0.0f)
-                                       continue;
-
                                if(direct_emission(kg, sd, &ls, &light_ray, 
&L_light, &is_lamp, state->bounce, state->transparent_bounce)) {
                                        /* trace shadow ray */
                                        float3 shadow;
@@ -257,9 +249,6 @@ ccl_device void 
kernel_branched_path_volume_connect_light(KernelGlobals *kg, RNG
                        light_sample(kg, light_t, light_u, light_v, sd->time, 
ray->P, &ls);
                }
 
-               if(ls.pdf == 0.0f)
-                       return;
-
                /* sample random light */
                if(direct_emission(kg, sd, &ls, &light_ray, &L_light, &is_lamp, 
state->bounce, state->transparent_bounce)) {
                        /* trace shadow ray */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs