[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57432] trunk/blender/intern/cycles/ blender/blender_object.cpp: Fix #35733: lamps on render layers that are both excluded and used for masking

[Brecht Van Lommel]

Revision: 57432
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57432
Author:   blendix
Date:     2013-06-13 13:09:32 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
Fix #35733: lamps on render layers that are both excluded and used for masking
should not be used, same as emissive meshes.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_object.cpp

Modified: trunk/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_object.cpp	2013-06-13 11:59:28 UTC (rev 57431)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp	2013-06-13 13:09:32 UTC (rev 57432)
@@ -209,7 +209,8 @@
 	
 	/* light is handled separately */
 	if(object_is_light(b_ob)) {
-		if(!motion)
+		/* don't use lamps for excluded layers used as mask layer */
+		if(!motion && !((layer_flag & render_layer.holdout_layer) && (layer_flag & render_layer.exclude_layer)))
 			sync_light(b_parent, persistent_id, b_ob, tfm);
 
 		return NULL;