SceneRenderLayer > SceneLayer: Convert Z-Mask

Note: Cycles still need to implement the per-object holdout
(similar to how we do shadow catcher).

2 files changed, 2 insertions, 2 deletions

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 2135d72e877..be2fadcc574 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -398,7 +398,7 @@ void BlenderSync::sync_render_layers(BL::SpaceView3D& b_v3d, const char *layer)
 		if((!layer && first_layer) || (layer && b_rlay->name() == layer)) {
 			render_layer.name = b_rlay->name();
 
-			render_layer.holdout_layer = get_layer(b_rlay->layers_zmask());
+			render_layer.holdout_layer = 0;
 			render_layer.exclude_layer = 0;
 
 			render_layer.scene_layer = scene_layers & ~render_layer.exclude_layer;
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index a68b6a03906..57405b74ecc 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -200,7 +200,7 @@ private:
 		string name;
 		uint scene_layer;
 		uint layer;
-		uint holdout_layer;
+		uint holdout_layer; /* This can be safely removed from Cycles. */
 		uint exclude_layer; /* This can be safely removed from Cycles. */
 		BL::Material material_override; /* This can be safely removed from Cycles. */
 		bool use_background_shader;