diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-28 23:43:33 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-28 23:43:33 +0400 |
| commit | 8a76aa2e479c05946f97aade4a733b0fea45dbf3 (patch) | |
| tree | f1a0c1a56fbd3dc95eb2b516d3cc697eddc66b2d /intern/cycles/blender/blender_sync.cpp | |
| parent | dcfd1dd7e2bf13a68ae02f471f08e15ef400a9e7 (diff) | |
Cycles: fix AO pass not rendering with AO enabled for world, and make mask
layers work more like blender internal.
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 901b1a09f97..45ed7adcfdc 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -204,7 +204,8 @@ void BlenderSync::sync_render_layers(BL::SpaceView3D b_v3d, const char *layer) render_layer.name = b_rlay->name(); render_layer.scene_layer = get_layer(b_scene.layers()); render_layer.layer = get_layer(b_rlay->layers()); - render_layer.holdout_layer = get_layer(b_rlay->layers_zmask()); + render_layer.holdout_layer = (b_rlay->use_zmask())? ~get_layer(b_rlay->layers_zmask()): 0; + render_layer.layer |= render_layer.holdout_layer; render_layer.material_override = b_rlay->material_override(); } |