diff options
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 1 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 9eb8f251ebb..faf057e13cc 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -179,7 +179,6 @@ class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): col.prop(scene, "layers", text="Scene") col.label(text="Material:") col.prop(rl, "material_override", text="") - col.prop(rl, "use_zmask"); col = split.column() col.prop(rl, "layers", text="Layer") diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 45ed7adcfdc..defdb7b447d 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -204,7 +204,7 @@ 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 = (b_rlay->use_zmask())? ~get_layer(b_rlay->layers_zmask()): 0; + render_layer.holdout_layer = get_layer(b_rlay->layers_zmask()); render_layer.layer |= render_layer.holdout_layer; render_layer.material_override = b_rlay->material_override(); } |