[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58744] trunk/blender/intern/cycles/kernel /kernel_path.h: Cycles / Non-Progressive integrator:

[Thomas Dinges]

Revision: 58744
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58744
Author:   dingto
Date:     2013-07-30 12:56:39 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
Cycles / Non-Progressive integrator:
* Avoid check for !LABEL_TRANSPARENT in "kernel_path_non_progressive_lighting", transparency is either handled in the outer loop or in the "kernel_path_indirect" function, but not here. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_path.h

Modified: trunk/blender/intern/cycles/kernel/kernel_path.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_path.h	2013-07-30 12:18:24 UTC (rev 58743)
+++ trunk/blender/intern/cycles/kernel/kernel_path.h	2013-07-30 12:56:39 UTC (rev 58744)
@@ -925,11 +925,8 @@
 			path_radiance_bsdf_bounce(L, &tp, &bsdf_eval, bsdf_pdf, state.bounce, label);
 
 			/* set labels */
-			float min_ray_pdf = FLT_MAX;
+			float min_ray_pdf = fminf(bsdf_pdf, FLT_MAX);
 
-			if(!(label & LABEL_TRANSPARENT))
-				min_ray_pdf = fminf(bsdf_pdf, min_ray_pdf);
-
 			/* modify path state */
 			PathState ps = state;
 			path_state_next(kg, &ps, label);