Rename any instance of scene layer or render layer in code with view layer

The RenderResult struct still has a listbase of RenderLayer, but that's ok
since this is strictly for rendering.

* Subversion bump (to 2.80.2)
* DNA low level doversion (renames) - only for .blend created since 2.80 started

Note: We can't use DNA_struct_elem_find or get file version in init_structDNA,
so we are manually iterating over the array of the SDNA elements instead.

Note 2: This doversion change with renames can be reverted in a few months. But
so far it's required for 2.8 files created between October 2016 and now.

Reviewers: campbellbarton, sergey

Differential Revision: https://developer.blender.org/D2927

22 files changed, 111 insertions, 111 deletions

diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index 8de24cebcd5..8b1ce5a9926 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -45,13 +45,13 @@ set(SRC
 	intern/builder/deg_builder_nodes.cc
 	intern/builder/deg_builder_nodes_layer_collection.cc
 	intern/builder/deg_builder_nodes_rig.cc
-	intern/builder/deg_builder_nodes_scene_layer.cc
+	intern/builder/deg_builder_nodes_view_layer.cc
 	intern/builder/deg_builder_pchanmap.cc
 	intern/builder/deg_builder_relations.cc
 	intern/builder/deg_builder_relations_keys.cc
 	intern/builder/deg_builder_relations_layer_collection.cc
 	intern/builder/deg_builder_relations_rig.cc
-	intern/builder/deg_builder_relations_scene_layer.cc
+	intern/builder/deg_builder_relations_view_layer.cc
 	intern/builder/deg_builder_transitive.cc
 	intern/debug/deg_debug_graphviz.cc
 	intern/eval/deg_eval.cc
diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h
index 6bd24e7ba2b..b224303fb84 100644
--- a/source/blender/depsgraph/DEG_depsgraph.h
+++ b/source/blender/depsgraph/DEG_depsgraph.h
@@ -67,7 +67,7 @@ struct PointerRNA;
 struct PropertyRNA;
 struct RenderEngineType;
 struct Scene;
-struct SceneLayer;
+struct ViewLayer;
 
 typedef enum eEvaluationMode {
 	DAG_EVAL_VIEWPORT       = 0,    /* evaluate for OpenGL viewport */
@@ -85,7 +85,7 @@ typedef struct EvaluationContext {
 	float ctime;
 
 	struct Depsgraph *depsgraph;
-	struct SceneLayer *scene_layer;
+	struct ViewLayer *view_layer;
 	struct RenderEngineType *engine;
 } EvaluationContext;
 
@@ -211,7 +211,7 @@ void DEG_evaluation_context_init(struct EvaluationContext *eval_ctx,
                                  eEvaluationMode mode);
 void DEG_evaluation_context_init_from_scene(struct EvaluationContext *eval_ctx,
                                             struct Scene *scene,
-                                            struct SceneLayer *scene_layer,
+                                            struct ViewLayer *view_layer,
                                             struct RenderEngineType *engine,
                                             eEvaluationMode mode);
 
diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h
index e328d3d9e8c..c85c15e2aa2 100644
--- a/source/blender/depsgraph/DEG_depsgraph_build.h
+++ b/source/blender/depsgraph/DEG_depsgraph_build.h
@@ -48,7 +48,7 @@ struct Main;
 struct ModifierData;
 struct Object;
 struct Scene;
-struct SceneLayer;
+struct ViewLayer;
 
 #ifdef __cplusplus
 extern "C" {
@@ -59,10 +59,10 @@ extern "C" {
 /* Build depsgraph for the given scene, and dump results in given
  * graph container.
  */
-void DEG_graph_build_from_scene_layer(struct Depsgraph *graph,
+void DEG_graph_build_from_view_layer(struct Depsgraph *graph,
                                       struct Main *bmain,
                                       struct Scene *scene,
-                                      struct SceneLayer *scene_layer);
+                                      struct ViewLayer *view_layer);
 
 /* Tag relations from the given graph for update. */
 void DEG_graph_tag_relations_update(struct Depsgraph *graph);
@@ -71,7 +71,7 @@ void DEG_graph_tag_relations_update(struct Depsgraph *graph);
 void DEG_graph_relations_update(struct Depsgraph *graph,
                                 struct Main *bmain,
                                 struct Scene *scene,
-                                struct SceneLayer *scene_layer);
+                                struct ViewLayer *view_layer);
 
 /* Tag all relations in the database for update.*/
 void DEG_relations_tag_update(struct Main *bmain);
diff --git a/source/blender/depsgraph/DEG_depsgraph_debug.h b/source/blender/depsgraph/DEG_depsgraph_debug.h
index fd6dff4c973..bd03874436b 100644
--- a/source/blender/depsgraph/DEG_depsgraph_debug.h
+++ b/source/blender/depsgraph/DEG_depsgraph_debug.h
@@ -41,7 +41,7 @@ extern "C" {
 
 struct Depsgraph;
 struct Scene;
-struct SceneLayer;
+struct ViewLayer;
 
 /* ------------------------------------------------ */
 
@@ -65,7 +65,7 @@ bool DEG_debug_compare(const struct Depsgraph *graph1,
 bool DEG_debug_graph_relations_validate(struct Depsgraph *graph,
                                         struct Main *bmain,
                                         struct Scene *scene,
-                                        struct SceneLayer *scene_layer);
+                                        struct ViewLayer *view_layer);
 
 /* Perform consistency check on the graph. */
 bool DEG_debug_consistency_check(struct Depsgraph *graph);
diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h
index ddd0f16b3bf..36d44a06eac 100644
--- a/source/blender/depsgraph/DEG_depsgraph_query.h
+++ b/source/blender/depsgraph/DEG_depsgraph_query.h
@@ -43,7 +43,7 @@ struct Depsgraph;
 struct DupliObject;
 struct ListBase;
 struct Scene;
-struct SceneLayer;
+struct ViewLayer;
 
 #ifdef __cplusplus
 extern "C" {
@@ -59,7 +59,7 @@ short DEG_get_eval_flags_for_id(struct Depsgraph *graph, struct ID *id);
 struct Scene *DEG_get_evaluated_scene(struct Depsgraph *graph);
 
 /* Get scene layer the despgraph is created for. */
-struct SceneLayer *DEG_get_evaluated_scene_layer(struct Depsgraph *graph);
+struct ViewLayer *DEG_get_evaluated_view_layer(struct Depsgraph *graph);
 
 /* Get evaluated version of object for given original one. */
 struct Object *DEG_get_evaluated_object(struct Depsgraph *depsgraph, struct Object *object);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index d03aaac0f16..76977aa7e5b 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@ -157,8 +157,8 @@ struct DepsgraphNodeBuilder {
 	                                       const char *name = "",
 	                                       int name_tag = -1);
 
-	void build_scene_layer(Scene *scene,
-	                       SceneLayer *scene_layer,
+	void build_view_layer(Scene *scene,
+	                       ViewLayer *view_layer,
 	                       eDepsNode_LinkedState_Type linked_state);
 	void build_group(Group *group);
 	void build_object(Object *ob,
@@ -205,7 +205,7 @@ struct DepsgraphNodeBuilder {
 	                            LayerCollectionState *state);
 	void build_layer_collections(ListBase *layer_collections,
 	                             LayerCollectionState *state);
-	void build_scene_layer_collections(SceneLayer *scene_layer);
+	void build_view_layer_collections(ViewLayer *view_layer);
 protected:
 	/* State which never changes, same for the whole builder time. */
 	Main *bmain_;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
index 8f67c64f1b3..77985528c89 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
@@ -77,7 +77,7 @@ void DepsgraphNodeBuilder::build_layer_collection(
 	                                 _1,
 	                                 layer_collection,
 	                                 state->parent),
-	                   DEG_OPCODE_SCENE_LAYER_EVAL,
+	                   DEG_OPCODE_VIEW_LAYER_EVAL,
 	                   layer_collection->scene_collection->name,
 	                   state->index);
 	++state->index;
@@ -97,23 +97,23 @@ void DepsgraphNodeBuilder::build_layer_collections(ListBase *layer_collections,
 	}
 }
 
-void DepsgraphNodeBuilder::build_scene_layer_collections(
-        SceneLayer *scene_layer)
+void DepsgraphNodeBuilder::build_view_layer_collections(
+        ViewLayer *view_layer)
 {
 	Scene *scene_cow;
-	SceneLayer *scene_layer_cow;
+	ViewLayer *view_layer_cow;
 	if (DEG_depsgraph_use_copy_on_write()) {
 		/* Make sure we've got ID node, so we can get pointer to CoW datablock.
 		 */
 		scene_cow = expand_cow_datablock(scene_);
-		scene_layer_cow = (SceneLayer *)BLI_findstring(
-		        &scene_cow->render_layers,
-		        scene_layer->name,
-		        offsetof(SceneLayer, name));
+		view_layer_cow = (ViewLayer *)BLI_findstring(
+		        &scene_cow->view_layers,
+		        view_layer->name,
+		        offsetof(ViewLayer, name));
 	}
 	else {
 		scene_cow = scene_;
-		scene_layer_cow = scene_layer;
+		view_layer_cow = view_layer;
 	}
 
 	LayerCollectionState state;
@@ -125,17 +125,17 @@ void DepsgraphNodeBuilder::build_scene_layer_collections(
 	                   function_bind(BKE_layer_eval_layer_collection_pre,
 	                                 _1,
 	                                 scene_cow,
-	                                 scene_layer_cow),
-	                   DEG_OPCODE_SCENE_LAYER_INIT,
-	                   scene_layer->name);
+	                                 view_layer_cow),
+	                   DEG_OPCODE_VIEW_LAYER_INIT,
+	                   view_layer->name);
 	add_operation_node(comp,
 	                   function_bind(BKE_layer_eval_layer_collection_post,
 	                                 _1,
-	                                 scene_layer_cow),
-	                   DEG_OPCODE_SCENE_LAYER_DONE,
-	                   scene_layer->name);
+	                                 view_layer_cow),
+	                   DEG_OPCODE_VIEW_LAYER_DONE,
+	                   view_layer->name);
 	state.parent = NULL;
-	build_layer_collections(&scene_layer_cow->layer_collections, &state);
+	build_layer_collections(&view_layer_cow->layer_collections, &state);
 }
 
 }  // namespace DEG
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index 1a0ce53d0c8..20dc239c6d0 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
@@ -65,9 +65,9 @@ extern "C" {
 
 namespace DEG {
 
-void DepsgraphNodeBuilder::build_scene_layer(Scene *scene,
-                                             SceneLayer *scene_layer,
-                                             eDepsNode_LinkedState_Type linked_state)
+void DepsgraphNodeBuilder::build_view_layer(Scene *scene,
+                                            ViewLayer *view_layer,
+                                            eDepsNode_LinkedState_Type linked_state)
 {
 	/* scene ID block */
 	add_id_node(&scene->id);
@@ -79,8 +79,8 @@ void DepsgraphNodeBuilder::build_scene_layer(Scene *scene,
 	// XXX: depending on how this goes, that scene itself could probably store its
 	//      own little partial depsgraph?
 	if (scene->set != NULL) {
-		SceneLayer *set_scene_layer = BKE_scene_layer_from_scene_get(scene->set);
-		build_scene_layer(scene->set, set_scene_layer, DEG_ID_LINKED_VIA_SET);
+		ViewLayer *set_view_layer = BKE_view_layer_from_scene_get(scene->set);
+		build_view_layer(scene->set, set_view_layer, DEG_ID_LINKED_VIA_SET);
 	}
 
 	/* Setup currently building context. */
@@ -88,7 +88,7 @@ void DepsgraphNodeBuilder::build_scene_layer(Scene *scene,
 
 	/* scene objects */
 	int select_color = 1;
-	LINKLIST_FOREACH(Base *, base, &scene_layer->object_bases) {
+	LINKLIST_FOREACH(Base *, base, &view_layer->object_bases) {
 		/* object itself */
 		build_object(base->object, linked_state);
 		base->object->select_color = select_color++;
@@ -141,7 +141,7 @@ void DepsgraphNodeBuilder::build_scene_layer(Scene *scene,
 	}
 
 	/* Collections. */
-	build_scene_layer_collections(scene_layer);
+	build_view_layer_collections(view_layer);
 
 	/* Parameters evaluation for scene relations mainly. */
 	add_operation_node(&scene->id,
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 48d0cf76a7f..b3e5ed9f7f9 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -65,7 +65,7 @@ struct Object;
 struct bPoseChannel;
 struct bConstraint;
 struct Scene;
-struct SceneLayer;
+struct ViewLayer;
 struct Tex;
 struct World;
 struct EffectorWeights;
@@ -186,7 +186,7 @@ struct DepsgraphRelationBuilder
 	                              const DepsNodeHandle *handle,
 	                              const char *description);
 
-	void build_scene_layer(Scene *scene, SceneLayer *scene_layer);
+	void build_view_layer(Scene *scene, ViewLayer *view_layer);
 	void build_group(Object *object, Group *group);
 	void build_object(Object *ob);
 	void build_object_parent(Object *ob);
@@ -250,7 +250,7 @@ struct DepsgraphRelationBuilder
 	                            LayerCollectionState *state);
 	void build_layer_collections(ListBase *layer_collections,
 	                             LayerCollectionState *state);
-	void build_scene_layer_collections(SceneLayer *scene_layer);
+	void build_view_layer_collections(ViewLayer *view_layer);
 
 	void build_copy_on_write_relations();
 	void build_copy_on_write_relations(IDDepsNode *id_node);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc
index 0deed3ed4ed..2e4ab0f0f84 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc
@@ -74,7 +74,7 @@ void DepsgraphRelationBuilder::build_layer_collection(
 {
 	OperationKey layer_key(&scene_->id,
 	                       DEG_NODE_TYPE_LAYER_COLLECTIONS,
-	                       DEG_OPCODE_SCENE_LAYER_EVAL,
+	                       DEG_OPCODE_VIEW_LAYER_EVAL,
 	                       layer_collection->scene_collection->name,
 	                       state->index);
 	add_relation(state->prev_key, layer_key, "Layer collection order");
@@ -96,26 +96,26 @@ void DepsgraphRelationBuilder::build_layer_collections(
 	}
 }
 
-void DepsgraphRelationBuilder::build_scene_layer_collections(
-        SceneLayer *scene_layer)
+void DepsgraphRelationBuilder::build_view_layer_collections(
+        ViewLayer *view_layer)
 {
 	LayerCollectionState state;
 	state.index = 0;
 
 	OperationKey init_key(&scene_->id,
 	                      DEG_NODE_TYPE_LAYER_COLLECTIONS,
-	                      DEG_OPCODE_SCENE_LAYER_INIT,
-	                      scene_layer->name);
+	                      DEG_OPCODE_VIEW_LAYER_INIT,
+	                      view_layer->name);
 	OperationKey done_key(&scene_->id,
 	                      DEG_NODE_TYPE_LAYER_COLLECTIONS,
-	                      DEG_OPCODE_SCENE_LAYER_DONE,
-	                      scene_layer->name);
+	                      DEG_OPCODE_VIEW_LAYER_DONE,
+	                      view_layer->name);
 
 	state.init_key = init_key;
 	state.done_key = done_key;
 	state.prev_key = init_key;
 
-	build_layer_collections(&scene_layer->layer_collections, &state);
+	build_layer_collections(&view_layer->layer_collections, &state);
 
 	add_relation(state.prev_key, done_key, "Layer collection order");
 }
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index 055c832811b..db75a3d9e5e 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
@@ -68,21 +68,21 @@ extern "C" {
 
 namespace DEG {
 
-void DepsgraphRelationBuilder::build_scene_layer(Scene *scene, SceneLayer *scene_layer)
+void DepsgraphRelationBuilder::build_view_layer(Scene *scene, ViewLayer *view_layer)
 {
 	if (scene->set != NULL) {
-		SceneLayer *set_scene_layer = BKE_scene_layer_from_scene_get(scene->set);
-		build_scene_layer(scene->set, set_scene_layer);
+		ViewLayer *set_view_layer = BKE_view_layer_from_scene_get(scene->set);
+		build_view_layer(scene->set, set_view_layer);
 	}
 
 	graph_->scene = scene;
-	graph_->scene_layer = scene_layer;
+	graph_->view_layer = view_layer;
 
 	/* Setup currently building context. */
 	scene_ = scene;
 
 	/* scene objects */
-	LINKLIST_FOREACH(Base *, base, &scene_layer->object_bases) {
+	LINKLIST_FOREACH(Base *, base, &view_layer->object_bases) {
 		build_object(base->object);
 	}
 	if (scene->camera != NULL) {
@@ -125,7 +125,7 @@ void DepsgraphRelationBuilder::build_scene_layer(Scene *scene, SceneLayer *scene
 	}
 
 	/* Collections. */
-	build_scene_layer_collections(scene_layer);
+	build_view_layer_collections(view_layer);
 
 	/* TODO(sergey): Do this flush on CoW object? */
 	foreach (OperationDepsNode *node, graph_->operations) {
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 4a27dddf949..d9b814f5a77 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -84,7 +84,7 @@ Depsgraph::Depsgraph()
   : time_source(NULL),
     need_update(true),
     scene(NULL),
-    scene_layer(NULL)
+    view_layer(NULL)
 {
 	BLI_spin_init(&lock);
 	id_hash = BLI_ghash_ptr_new("Depsgraph id hash");
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h
index b3ac345cef7..d841ae045f2 100644
--- a/source/blender/depsgraph/intern/depsgraph.h
+++ b/source/blender/depsgraph/intern/depsgraph.h
@@ -47,7 +47,7 @@ struct GSet;
 struct PointerRNA;
 struct PropertyRNA;
 struct Scene;
-struct SceneLayer;
+struct ViewLayer;
 
 namespace DEG {
 
@@ -177,7 +177,7 @@ struct Depsgraph {
 
 	/* Scene and layer this dependency graph is built for. */
 	Scene *scene;
-	SceneLayer *scene_layer;
+	ViewLayer *view_layer;
 };
 
 }  // namespace DEG
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index 80d3df2811c..34ca2244b3a 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -196,13 +196,13 @@ void DEG_add_special_eval_flag(Depsgraph *graph, ID *id, short flag)
 /* Build depsgraph for the given scene layer, and dump results in given
  * graph container.
  */
-void DEG_graph_build_from_scene_layer(Depsgraph *graph,
+void DEG_graph_build_from_view_layer(Depsgraph *graph,
                                       Main *bmain,
                                       Scene *scene,
-                                      SceneLayer *scene_layer)
+                                      ViewLayer *view_layer)
 {
 #ifdef DEBUG_TIME
-	TIMEIT_START(DEG_graph_build_from_scene_layer);
+	TIMEIT_START(DEG_graph_build_from_view_layer);
 #endif
 
 	DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(graph);
@@ -218,8 +218,8 @@ void DEG_graph_build_from_scene_layer(Depsgraph *graph,
 	/* 1) Generate all the nodes in the graph first */
 	DEG::DepsgraphNodeBuilder node_builder(bmain, deg_graph);
 	node_builder.begin_build();
-	node_builder.build_scene_layer(scene,
-	                               scene_layer,
+	node_builder.build_view_layer(scene,
+	                               view_layer,
 	                               DEG::DEG_ID_LINKED_DIRECTLY);
 
 	/* 2) Hook up relationships between operations - to determine evaluation
@@ -227,7 +227,7 @@ void DEG_graph_build_from_scene_layer(Depsgraph *graph,
 	 */
 	DEG::DepsgraphRelationBuilder relation_builder(bmain, deg_graph);
 	relation_builder.begin_build();
-	relation_builder.build_scene_layer(scene, scene_layer);
+	relation_builder.build_view_layer(scene, view_layer);
 	if (DEG_depsgraph_use_copy_on_write()) {
 		relation_builder.build_copy_on_write_relations();
 	}
@@ -255,7 +255,7 @@ void DEG_graph_build_from_scene_layer(Depsgraph *graph,
 #endif
 
 #ifdef DEBUG_TIME
-	TIMEIT_END(DEG_graph_build_from_scene_layer);
+	TIMEIT_END(DEG_graph_build_from_view_layer);
 #endif
 
 	/* Relations are up to date. */
@@ -277,14 +277,14 @@ void DEG_graph_tag_relations_update(Depsgraph *graph)
 void DEG_graph_relations_update(Depsgraph *graph,
                                 Main *bmain,
                                 Scene *scene,
-                                SceneLayer *scene_layer)
+                                ViewLayer *view_layer)
 {
 	DEG::Depsgraph *deg_graph = (DEG::Depsgraph *)graph;
 	if (!deg_graph->need_update) {
 		/* Graph is up to date, nothing to do. */
 		return;
 	}
-	DEG_graph_build_from_scene_layer(graph, bmain, scene, scene_layer);
+	DEG_graph_build_from_view_layer(graph, bmain, scene, view_layer);
 }
 
 /* Tag all relations for update. */
@@ -292,10 +292,10 @@ void DEG_relations_tag_update(Main *bmain)
 {
 	DEG_DEBUG_PRINTF("%s: Tagging relations for update.\n", __func__);
 	LINKLIST_FOREACH(Scene *, scene, &bmain->scene) {
-		LINKLIST_FOREACH(SceneLayer *, scene_layer, &scene->render_layers) {
+		LINKLIST_FOREACH(ViewLayer *, view_layer, &scene->view_layers) {
 			Depsgraph *depsgraph =
 			        (Depsgraph *)BKE_scene_get_depsgraph(scene,
-			                                             scene_layer,
+			                                             view_layer,
 			                                             false);
 			if (depsgraph != NULL) {
 				DEG_graph_tag_relations_update(depsgraph);
diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cc b/source/blender/depsgraph/intern/depsgraph_debug.cc
index 72d074dd505..42c1cf861eb 100644
--- a/source/blender/depsgraph/intern/depsgraph_debug.cc
+++ b/source/blender/depsgraph/intern/depsgraph_debug.cc
@@ -67,11 +67,11 @@ bool DEG_debug_compare(const struct Depsgraph *graph1,
 bool DEG_debug_graph_relations_validate(Depsgraph *graph,
                                         Main *bmain,
                                         Scene *scene,
-                                        SceneLayer *scene_layer)
+                                        ViewLayer *view_layer)
 {
 	Depsgraph *temp_depsgraph = DEG_graph_new();
 	bool valid = true;
-	DEG_graph_build_from_scene_layer(temp_depsgraph, bmain, scene, scene_layer);
+	DEG_graph_build_from_view_layer(temp_depsgraph, bmain, scene, view_layer);
 	if (!DEG_debug_compare(temp_depsgraph, graph)) {
 		fprintf(stderr, "ERROR! Depsgraph wasn't tagged for update when it should have!\n");
 		BLI_assert(!"This should not happen!");
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index 00b07307933..31332b416d5 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -80,13 +80,13 @@ void DEG_evaluation_context_init(EvaluationContext *eval_ctx,
 
 void DEG_evaluation_context_init_from_scene(EvaluationContext *eval_ctx,
                                             Scene *scene,
-                                            SceneLayer *scene_layer,
+                                            ViewLayer *view_layer,
                                             RenderEngineType *engine,
                                             eEvaluationMode mode)
 {
 	DEG_evaluation_context_init(eval_ctx, mode);
-	eval_ctx->depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, false);
-	eval_ctx->scene_layer = scene_layer;
+	eval_ctx->depsgraph = BKE_scene_get_depsgraph(scene, view_layer, false);
+	eval_ctx->view_layer = view_layer;
 	eval_ctx->engine = engine;
 	eval_ctx->ctime = BKE_scene_frame_get(scene);
 	BLI_assert(eval_ctx->depsgraph != NULL);
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc
index ee75b9b348b..9740e93ffec 100644
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@ -91,16 +91,16 @@ Scene *DEG_get_evaluated_scene(Depsgraph *graph)
 	return reinterpret_cast<Scene *>(deg_graph->get_cow_id(&scene_orig->id));
 }
 
-SceneLayer *DEG_get_evaluated_scene_layer(Depsgraph *graph)
+ViewLayer *DEG_get_evaluated_view_layer(Depsgraph *graph)
 {
 	DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(graph);
 	Scene *scene_cow = DEG_get_evaluated_scene(graph);
-	SceneLayer *scene_layer_orig = deg_graph->scene_layer;
-	SceneLayer *scene_layer_cow =
-	        (SceneLayer *)BLI_findstring(&scene_cow->render_layers,
-	                                     scene_layer_orig->name,
-	                                     offsetof(SceneLayer, name));
-	return scene_layer_cow;
+	ViewLayer *view_layer_orig = deg_graph->view_layer;
+	ViewLayer *view_layer_cow =
+	        (ViewLayer *)BLI_findstring(&scene_cow->view_layers,
+	                                     view_layer_orig->name,
+	                                     offsetof(ViewLayer, name));
+	return view_layer_cow;
 }
 
 Object *DEG_get_evaluated_object(Depsgraph *depsgraph, Object *object)
@@ -132,18 +132,18 @@ ID *DEG_get_evaluated_id(struct Depsgraph *depsgraph, ID *id)
  * and instead we should have a tag to the objects that were not directly part of the depsgraph).
  *
  * That means that the object is not in a collection but it's part of depsgraph, or the object is simply
- * not in the current SceneLayer - Depsgraph at the moment includes all the SceneLayer in the Scene.
+ * not in the current ViewLayer - Depsgraph at the moment includes all the ViewLayer in the Scene.
  */
 static bool deg_flush_base_flags_and_settings(
         DEGObjectsIteratorData *data, Object *ob_dst, Object *ob_src, const bool is_dupli)
 {
 	Base *base;
 	Depsgraph *graph = data->graph;
-	SceneLayer *scene_layer = data->eval_ctx.scene_layer;
+	ViewLayer *view_layer = data->eval_ctx.view_layer;
 	int flag = is_dupli ? BASE_FROMDUPLI : 0;
 
-	/* First attempt, see if object is in the current SceneLayer. */
-	base = (Base *)BLI_findptr(&scene_layer->object_bases, ob_src, offsetof(Base, object));
+	/* First attempt, see if object is in the current ViewLayer. */
+	base = (Base *)BLI_findptr(&view_layer->object_bases, ob_src, offsetof(Base, object));
 
 	/* Next attempt, see if object is in one of the sets. */
 	if (base == NULL) {
@@ -151,8 +151,8 @@ static bool deg_flush_base_flags_and_settings(
 		scene_iter = scene;
 
 		while ((scene_iter = (scene_iter)->set)) {
-			SceneLayer *scene_layer_set = BKE_scene_layer_from_scene_get(scene_iter);
-			base = (Base *)BLI_findptr(&scene_layer_set->object_bases, ob_src, offsetof(Base, object));
+			ViewLayer *view_layer_set = BKE_view_layer_from_scene_get(scene_iter);
+			base = (Base *)BLI_findptr(&view_layer_set->object_bases, ob_src, offsetof(Base, object));
 			if (base != NULL) {
 				flag |= BASE_FROM_SET;
 				flag &= ~(BASE_SELECTED | BASE_SELECTABLED);
@@ -272,7 +272,7 @@ void DEG_objects_iterator_begin(BLI_Iterator *iter, DEGObjectsIteratorData *data
 
 	/* TODO(sergey): What evaluation type we want here? */
 	DEG_evaluation_context_init(&data->eval_ctx, DAG_EVAL_RENDER);
-	data->eval_ctx.scene_layer = DEG_get_evaluated_scene_layer(depsgraph);
+	data->eval_ctx.view_layer = DEG_get_evaluated_view_layer(depsgraph);
 
 	iter->data = data;
 	data->dupli_parent = NULL;
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index 607ec675a39..58bae1f5cc6 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -352,10 +352,10 @@ void deg_id_tag_update(Main *bmain, ID *id, int flag)
 {
 	lib_id_recalc_tag_flag(bmain, id, flag);
 	LINKLIST_FOREACH(Scene *, scene, &bmain->scene) {
-		LINKLIST_FOREACH(SceneLayer *, scene_layer, &scene->render_layers) {
+		LINKLIST_FOREACH(ViewLayer *, view_layer, &scene->view_layers) {
 			Depsgraph *depsgraph =
 			        (Depsgraph *)BKE_scene_get_depsgraph(scene,
-			                                             scene_layer,
+			                                             view_layer,
 			                                             false);
 			if (depsgraph != NULL) {
 				deg_graph_id_tag_update(bmain, depsgraph, id, flag);
@@ -461,10 +461,10 @@ void DEG_graph_on_visible_update(Main *bmain, Depsgraph *depsgraph)
 void DEG_on_visible_update(Main *bmain, const bool UNUSED(do_time))
 {
 	LINKLIST_FOREACH(Scene *, scene, &bmain->scene) {
-		LINKLIST_FOREACH(SceneLayer *, scene_layer, &scene->render_layers) {
+		LINKLIST_FOREACH(ViewLayer *, view_layer, &scene->view_layers) {
 			Depsgraph *depsgraph =
 			        (Depsgraph *)BKE_scene_get_depsgraph(scene,
-			                                             scene_layer,
+			                                             view_layer,
 			                                             false);
 			if (depsgraph != NULL) {
 				DEG_graph_on_visible_update(bmain, depsgraph);
diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cc b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
index 6dfe1565bb1..f5f1980557f 100644
--- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc
+++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
@@ -140,9 +140,9 @@ static const char *stringify_opcode(eDepsOperation_Code opcode)
 		STRINGIFY_OPCODE(MASK_ANIMATION);
 		STRINGIFY_OPCODE(MASK_EVAL);
 		/* Collections. */
-		STRINGIFY_OPCODE(SCENE_LAYER_INIT);
-		STRINGIFY_OPCODE(SCENE_LAYER_EVAL);
-		STRINGIFY_OPCODE(SCENE_LAYER_DONE);
+		STRINGIFY_OPCODE(VIEW_LAYER_INIT);
+		STRINGIFY_OPCODE(VIEW_LAYER_EVAL);
+		STRINGIFY_OPCODE(VIEW_LAYER_DONE);
 		/* Copy on write. */
 		STRINGIFY_OPCODE(COPY_ON_WRITE);
 		/* Shading. */
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h
index 7f68220f3fa..d7084a38a94 100644
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@ -233,9 +233,9 @@ typedef enum eDepsOperation_Code {
 	DEG_OPCODE_PARTICLE_SETTINGS_RECALC_CLEAR,
 
 	/* Collections. ------------------------------------- */
-	DEG_OPCODE_SCENE_LAYER_INIT,
-	DEG_OPCODE_SCENE_LAYER_EVAL,
-	DEG_OPCODE_SCENE_LAYER_DONE,
+	DEG_OPCODE_VIEW_LAYER_INIT,
+	DEG_OPCODE_VIEW_LAYER_EVAL,
+	DEG_OPCODE_VIEW_LAYER_DONE,
 
 	/* Copy on Write. ------------------------------------ */
 	DEG_OPCODE_COPY_ON_WRITE,
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index f5b11785441..5aebd6814a0 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -278,7 +278,7 @@ void deg_evaluate_on_refresh(EvaluationContext *eval_ctx,
 	/* Set time for the current graph evaluation context. */
 	TimeSourceDepsNode *time_src = graph->find_time_source();
 	eval_ctx->depsgraph = (::Depsgraph *)graph;
-	eval_ctx->scene_layer = DEG_get_evaluated_scene_layer((::Depsgraph *)graph);
+	eval_ctx->view_layer = DEG_get_evaluated_view_layer((::Depsgraph *)graph);
 	eval_ctx->ctime = time_src->cfra;
 
 	/* XXX could use a separate pool for each eval context */
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 1d3c2d596ee..99efd633524 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -477,31 +477,31 @@ void update_copy_on_write_scene(const Depsgraph *depsgraph,
 	scene_cow->r.cfra = scene_orig->r.cfra;
 	scene_cow->r.subframe = scene_orig->r.subframe;
 	// Update bases.
-	const SceneLayer *scene_layer_orig = (SceneLayer *)scene_orig->render_layers.first;
-	SceneLayer *scene_layer_cow = (SceneLayer *)scene_cow->render_layers.first;
-	while (scene_layer_orig != NULL) {
+	const ViewLayer *view_layer_orig = (ViewLayer *)scene_orig->view_layers.first;
+	ViewLayer *view_layer_cow = (ViewLayer *)scene_cow->view_layers.first;
+	while (view_layer_orig != NULL) {
 		// Update pointers to active base.
-		if (scene_layer_orig->basact == NULL) {
-			scene_layer_cow->basact = NULL;
+		if (view_layer_orig->basact == NULL) {
+			view_layer_cow->basact = NULL;
 		}
 		else {
-			const Object *obact_orig = scene_layer_orig->basact->object;
+			const Object *obact_orig = view_layer_orig->basact->object;
 			Object *obact_cow = (Object *)depsgraph->get_cow_id(&obact_orig->id);
-			scene_layer_cow->basact = BKE_scene_layer_base_find(scene_layer_cow, obact_cow);
+			view_layer_cow->basact = BKE_view_layer_base_find(view_layer_cow, obact_cow);
 		}
 		// Update base flags.
 		//
 		// TODO(sergey): We should probably check visibled/selectabled
 		// flag here?
-		const Base *base_orig = (Base *)scene_layer_orig->object_bases.first;
-		Base *base_cow = (Base *)scene_layer_cow->object_bases.first;;
+		const Base *base_orig = (Base *)view_layer_orig->object_bases.first;
+		Base *base_cow = (Base *)view_layer_cow->object_bases.first;;
 		while (base_orig != NULL) {
 			base_cow->flag = base_orig->flag;
 			base_orig = base_orig->next;
 			base_cow = base_cow->next;
 		}
-		scene_layer_orig = scene_layer_orig->next;
-		scene_layer_cow = scene_layer_cow->next;
+		view_layer_orig = view_layer_orig->next;
+		view_layer_cow = view_layer_cow->next;
 	}
 	// Update edit object pointer.
 	if (scene_orig->obedit != NULL) {