[Bf-blender-cvs] [75f518c] master: Cycles: Remove dead branch for Distant lamps, ls->t is always FLT_MAX here.

Thomas Dinges noreply at git.blender.org
Sat Nov 8 16:48:14 CET 2014


Commit: 75f518ccb935012dc4e12a701208426662091be8
Author: Thomas Dinges
Date:   Sat Nov 8 16:47:56 2014 +0100
Branches: master
https://developer.blender.org/rB75f518ccb935012dc4e12a701208426662091be8

Cycles: Remove dead branch for Distant lamps, ls->t is always FLT_MAX here.

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

M	intern/cycles/kernel/kernel_light.h

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

diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index 7615dc6..f8d6d41 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -488,9 +488,6 @@ ccl_device bool lamp_light_eval(KernelGlobals *kg, int lamp, float3 P, float3 D,
 		/* compute pdf */
 		float invarea = data1.w;
 		ls->pdf = invarea/(costheta*costheta*costheta);
-		if(ls->t != FLT_MAX)
-			ls->pdf *= lamp_light_pdf(kg, ls->Ng, -ls->D, ls->t);
-
 		ls->eval_fac = ls->pdf;
 	}
 	else if(type == LIGHT_POINT || type == LIGHT_SPOT) {




More information about the Bf-blender-cvs mailing list