diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-13 17:09:32 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-13 17:09:32 +0400 |
| commit | a17d8a29bbb41e836aa4576136e094bc852390c6 (patch) | |
| tree | 97b22d645c474b7dcee4b940ed988e7f8e22d098 /intern/cycles/blender | |
| parent | cda5770160e11c2d3c7ab7d20e24a7a8f3b28f1f (diff) | |
Fix #35733: lamps on render layers that are both excluded and used for masking
should not be used, same as emissive meshes.
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 75f0c48a8a2..f208bab2fae 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -209,7 +209,8 @@ Object *BlenderSync::sync_object(BL::Object b_parent, int persistent_id[OBJECT_P /* 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; |