SceneRenderLayer > SceneLayer: Convert Lay

There are parts of the old (Blender Internal) rendering pipeline that is still
using lay, e.g., in shi->lay.

Honestly it will be easier to purge the entire Blender Internal code away instead
of taking things from it bit by bit.

2 files changed, 2 insertions, 2 deletions

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index be2fadcc574..c5d203070db 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -404,7 +404,7 @@ void BlenderSync::sync_render_layers(BL::SpaceView3D& b_v3d, const char *layer)
 			render_layer.scene_layer = scene_layers & ~render_layer.exclude_layer;
 			render_layer.scene_layer |= render_layer.exclude_layer & render_layer.holdout_layer;
 
-			render_layer.layer = get_layer(b_rlay->layers());
+			render_layer.layer = (1 << 20) - 1;
 			render_layer.layer |= render_layer.holdout_layer;
 
 			render_layer.material_override = PointerRNA_NULL;
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index 57405b74ecc..79c0b006f9f 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -199,7 +199,7 @@ private:
 
 		string name;
 		uint scene_layer;
-		uint layer;
+		uint layer; /* This can be safely removed from Cycles. */
 		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. */