[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54254] trunk/blender/intern/cycles/kernel /kernel_light.h: Fix an issue with the new cycles lamp MIS option not working correct with

[Brecht Van Lommel]

Revision: 54254
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54254
Author:   blendix
Date:     2013-02-01 18:54:24 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Fix an issue with the new cycles lamp MIS option not working correct with
multiple lamps.

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-02-01 18:00:41 UTC (rev 54253)
+++ trunk/blender/intern/cycles/kernel/kernel_light.h	2013-02-01 18:54:24 UTC (rev 54254)
@@ -312,6 +312,9 @@
 	ls->prim = ~0;
 	ls->lamp = lamp;
 
+	if(!(ls->shader & SHADER_USE_MIS))
+		return false;
+
 	if(type == LIGHT_DISTANT) {
 		/* distant light */
 		float radius = data1.y;