[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47549] trunk/blender/intern/cycles/kernel : Cycles: small code fix for disabled code.

Brecht Van Lommel brechtvanlommel at pandora.be
Thu Jun 7 01:27:39 CEST 2012


Revision: 47549
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47549
Author:   blendix
Date:     2012-06-06 23:27:38 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Cycles: small code fix for disabled code.

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

Modified: trunk/blender/intern/cycles/kernel/kernel_light.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_light.h	2012-06-06 23:21:45 UTC (rev 47548)
+++ trunk/blender/intern/cycles/kernel/kernel_light.h	2012-06-06 23:27:38 UTC (rev 47549)
@@ -391,6 +391,10 @@
 __device void light_select(KernelGlobals *kg, int index, float randu, float randv, float3 P, LightSample *ls, float *pdf)
 {
 	regular_light_sample(kg, index, randu, randv, P, ls, pdf);
+
+	/* compute incoming direction and distance */
+	if(ls->t != FLT_MAX)
+		ls->D = normalize_len(ls->P - P, &ls->t);
 }
 
 __device float light_select_pdf(KernelGlobals *kg, LightSample *ls, float3 I, float t)

Modified: trunk/blender/intern/cycles/kernel/kernel_path.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_path.h	2012-06-06 23:21:45 UTC (rev 47548)
+++ trunk/blender/intern/cycles/kernel/kernel_path.h	2012-06-06 23:27:38 UTC (rev 47549)
@@ -365,7 +365,7 @@
 
 #ifdef __MULTI_LIGHT__
 				/* index -1 means randomly sample from distribution */
-				int i = (kernel_data.integrator.num_distribution)? -1: 0;
+				int i = (kernel_data.integrator.num_all_lights)? 0: -1;
 
 				for(; i < kernel_data.integrator.num_all_lights; i++) {
 #else




More information about the Bf-blender-cvs mailing list