Cleanup: mark missing Cycles view layer override features with TODO.

5 files changed, 23 insertions, 58 deletions

diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 08206dd5521..8a6480a9a42 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -1080,27 +1080,18 @@ Mesh *BlenderSync::sync_mesh(BL::Depsgraph& b_depsgraph,
 	/* test if we can instance or if the object is modified */
 	BL::ID b_ob_data = b_ob.data();
 	BL::ID key = (BKE_object_is_modified(b_ob))? b_ob_instance: b_ob_data;
-	BL::Material material_override = view_layer.material_override;
 
 	/* find shader indices */
 	vector<Shader*> used_shaders;
 
 	BL::Object::material_slots_iterator slot;
 	for(b_ob.material_slots.begin(slot); slot != b_ob.material_slots.end(); ++slot) {
-		if(material_override) {
-			find_shader(material_override, used_shaders, scene->default_surface);
-		}
-		else {
-			BL::ID b_material(slot->material());
-			find_shader(b_material, used_shaders, scene->default_surface);
-		}
+		BL::ID b_material(slot->material());
+		find_shader(b_material, used_shaders, scene->default_surface);
 	}
 
 	if(used_shaders.size() == 0) {
-		if(material_override)
-			find_shader(material_override, used_shaders, scene->default_surface);
-		else
-			used_shaders.push_back(scene->default_surface);
+		used_shaders.push_back(scene->default_surface);
 	}
 
 	/* test if we need to sync */
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index ed01d728931..56365d12bab 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -292,7 +292,6 @@ void BlenderSync::sync_background_light(bool use_portal)
 
 Object *BlenderSync::sync_object(BL::Depsgraph& b_depsgraph,
                                  BL::DepsgraphObjectInstance& b_instance,
-                                 uint layer_flag,
                                  float motion_time,
                                  bool hide_tris,
                                  BlenderObjectCulling& culling,
@@ -314,10 +313,13 @@ Object *BlenderSync::sync_object(BL::Depsgraph& b_depsgraph,
 	}
 
 	/* light is handled separately */
-	if(object_is_light(b_ob)) {
-		/* don't use lights for excluded layers used as mask layer */
-		if(!motion && !((layer_flag & view_layer.holdout_layer) &&
-		                (layer_flag & view_layer.exclude_layer)))
+	if(!motion && object_is_light(b_ob)) {
+		/* TODO: don't use lights for excluded layers used as mask layer,
+		 * when dynamic overrides are back. */
+#if 0
+		if(!((layer_flag & view_layer.holdout_layer) &&
+		     (layer_flag & view_layer.exclude_layer)))
+#endif
 		{
 			sync_light(b_parent,
 			           persistent_id,
@@ -343,23 +345,26 @@ Object *BlenderSync::sync_object(BL::Depsgraph& b_depsgraph,
 
 	/* Visibility flags for both parent and child. */
 	PointerRNA cobject = RNA_pointer_get(&b_ob.ptr, "cycles");
-	bool use_holdout = (layer_flag & view_layer.holdout_layer) != 0 ||
-	                   get_boolean(cobject, "is_holdout");
+	bool use_holdout = get_boolean(cobject, "is_holdout");
 	uint visibility = object_ray_visibility(b_ob) & PATH_RAY_ALL_VISIBILITY;
 
 	if(b_parent.ptr.data != b_ob.ptr.data) {
 		visibility &= object_ray_visibility(b_parent);
 	}
 
-	/* Make holdout objects on excluded layer invisible for non-camera rays. */
+	/* TODO: make holdout objects on excluded layer invisible for non-camera rays. */
+#if 0
 	if(use_holdout && (layer_flag & view_layer.exclude_layer)) {
 		visibility &= ~(PATH_RAY_ALL_VISIBILITY - PATH_RAY_CAMERA);
 	}
+#endif
 
-	/* Hide objects not on render layer from camera rays. */
+	/* TODO: hide objects not on render layer from camera rays. */
+#if 0
 	if(!(layer_flag & view_layer.layer)) {
 		visibility &= ~PATH_RAY_CAMERA;
 	}
+#endif
 
 	/* Don't export completely invisible objects. */
 	if(visibility == 0) {
@@ -605,7 +610,6 @@ void BlenderSync::sync_objects(BL::Depsgraph& b_depsgraph, float motion_time)
 			/* object itself */
 			sync_object(b_depsgraph,
 			            b_instance,
-			            ~(0), /* until we get rid of layers */
 			            motion_time,
 			            hide_tris,
 			            culling,
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index cd55155e33b..1a4b26128e3 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -461,15 +461,13 @@ void BlenderSession::render(BL::Depsgraph& b_depsgraph_)
 			scene->integrator->tag_update(scene);
 		}
 
-		/* Update number of samples per layer. */
-		int samples = sync->get_layer_samples();
-		bool bound_samples = sync->get_layer_bound_samples();
-		int effective_layer_samples;
+		int effective_layer_samples = session_params.samples;
 
+		/* TODO: Update number of samples per layer. */
+#if 0
 		if(samples != 0 && (!bound_samples || (samples < session_params.samples)))
 			effective_layer_samples = samples;
-		else
-			effective_layer_samples = session_params.samples;
+#endif
 
 		/* Update tile manager if we're doing resumable render. */
 		update_resumable_tile_manager(effective_layer_samples);
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 3204e0cd3f2..93232fbf98f 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -365,28 +365,11 @@ void BlenderSync::sync_film()
 void BlenderSync::sync_view_layer(BL::SpaceView3D& /*b_v3d*/, BL::ViewLayer& b_view_layer)
 {
 	/* render layer */
-	uint layer_override = get_layer(b_engine.layer_override());
-	uint view_layers = layer_override ? layer_override : get_layer(b_scene.layers());
-
 	view_layer.name = b_view_layer.name();
-
-	view_layer.holdout_layer = 0;
-	view_layer.exclude_layer = 0;
-
-	view_layer.view_layer = view_layers & ~view_layer.exclude_layer;
-	view_layer.view_layer |= view_layer.exclude_layer & view_layer.holdout_layer;
-
-	view_layer.layer = (1 << 20) - 1;
-	view_layer.layer |= view_layer.holdout_layer;
-
-	view_layer.material_override = PointerRNA_NULL;
 	view_layer.use_background_shader = b_view_layer.use_sky();
 	view_layer.use_background_ao = b_view_layer.use_ao();
 	view_layer.use_surfaces = b_view_layer.use_solid();
 	view_layer.use_hair = b_view_layer.use_strand();
-
-	view_layer.bound_samples = false;
-	view_layer.samples = 0;
 }
 
 /* Images */
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index 0465f703c51..ba3f5e6428f 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -127,7 +127,6 @@ private:
 	                 int motion_step = 0);
 	Object *sync_object(BL::Depsgraph& b_depsgraph,
 	                    BL::DepsgraphObjectInstance& b_instance,
-	                    uint layer_flag,
 	                    float motion_time,
 	                    bool hide_tris,
 	                    BlenderObjectCulling& culling,
@@ -191,28 +190,18 @@ private:
 
 	struct RenderLayerInfo {
 		RenderLayerInfo()
-		: view_layer(0), layer(0),
-		  holdout_layer(0), exclude_layer(0),
-		  material_override(PointerRNA_NULL),
-		  use_background_shader(true),
+		: use_background_shader(true),
 		  use_background_ao(true),
 		  use_surfaces(true),
-		  use_hair(true),
-		  samples(0), bound_samples(false)
+		  use_hair(true)
 		{}
 
 		string name;
 		uint view_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. */
 		bool use_background_shader;
 		bool use_background_ao;
 		bool use_surfaces;
 		bool use_hair;
-		int samples; /* This can be safely removed from Cycles. */
-		bool bound_samples; /* This can be safely removed from Cycles. */
 	} view_layer;
 
 	Progress &progress;