[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53789] trunk/blender/intern/cycles/kernel /kernel_light.h: Fix #33868: cycles sample as lamp for world background not rendering with the

[Brecht Van Lommel]

Revision: 53789
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53789
Author:   blendix
Date:     2013-01-14 16:24:47 +0000 (Mon, 14 Jan 2013)
Log Message:
-----------
Fix #33868: cycles sample as lamp for world background not rendering with the
correct intensity on the GPU.

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

Modified: trunk/blender/intern/cycles/kernel/kernel_light.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_light.h	2013-01-14 16:05:47 UTC (rev 53788)
+++ trunk/blender/intern/cycles/kernel/kernel_light.h	2013-01-14 16:24:47 UTC (rev 53789)
@@ -233,8 +233,10 @@
 
 		if(radius > 0.0f)
 			D = distant_light_sample(D, radius, randu, randv);
+#ifdef __LAMP_MIS__
 		else
 			ls->use_mis = false;
+#endif
 
 		ls->P = D;
 		ls->Ng = D;
@@ -255,6 +257,9 @@
 		ls->D = -D;
 		ls->t = FLT_MAX;
 		ls->eval_fac = 1.0f;
+#ifndef __LAMP_MIS__
+		ls->use_mis = true;
+#endif
 	}
 #endif
 	else {
@@ -266,8 +271,10 @@
 			if(radius > 0.0f)
 				/* sphere light */
 				ls->P += sphere_light_sample(P, ls->P, radius, randu, randv);
+#ifdef __LAMP_MIS__
 			else
 				ls->use_mis = false;
+#endif
 
 			ls->D = normalize_len(ls->P - P, &ls->t);
 			ls->Ng = -ls->D;
@@ -298,7 +305,9 @@
 			float invarea = data2.x;
 
 			if(invarea == 0.0f) {
+#ifdef __LAMP_MIS__
 				ls->use_mis = false;
+#endif
 				invarea = 1.0f;
 			}