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

8 files changed, 111 insertions, 111 deletions

diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c
index 2f03935c999..24f42d58ac0 100644
--- a/source/blender/editors/space_outliner/outliner_collections.c
+++ b/source/blender/editors/space_outliner/outliner_collections.c
@@ -109,7 +109,7 @@ static SceneCollection *scene_collection_from_index(ListBase *lb, const int numb
 static int collection_link_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	SceneCollection *sc_master = BKE_collection_master(scene);
 	SceneCollection *sc;
 
@@ -202,7 +202,7 @@ void OUTLINER_OT_collection_link(wmOperatorType *ot)
 
 /**
  * Returns true if selected element is a collection directly
- * linked to the active SceneLayer (not a nested collection)
+ * linked to the active ViewLayer (not a nested collection)
  */
 static int collection_unlink_poll(bContext *C)
 {
@@ -212,7 +212,7 @@ static int collection_unlink_poll(bContext *C)
 		return 0;
 	}
 
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	return BLI_findindex(&sl->layer_collections, lc) != -1 ? 1 : 0;
 }
 
@@ -226,7 +226,7 @@ static int collection_unlink_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	BKE_collection_unlink(sl, lc);
 
 	if (soops) {
@@ -260,7 +260,7 @@ void OUTLINER_OT_collection_unlink(wmOperatorType *ot)
 static int collection_new_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 
 	SceneCollection *sc = BKE_collection_add(scene, NULL, NULL);
 	BKE_collection_link(sl, sc);
@@ -382,7 +382,7 @@ void OUTLINER_OT_collections_delete(wmOperatorType *ot)
 
 static int collection_select_exec(bContext *C, wmOperator *op)
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	const int collection_index = RNA_int_get(op->ptr, "collection_index");
 	sl->active_collection = collection_index;
 	WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
@@ -414,13 +414,13 @@ static int collection_toggle_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	int action = RNA_enum_get(op->ptr, "action");
 	LayerCollection *layer_collection = CTX_data_layer_collection(C);
 
 	if (layer_collection->flag & COLLECTION_DISABLED) {
 		if (ELEM(action, ACTION_TOGGLE, ACTION_ENABLE)) {
-			BKE_collection_enable(scene_layer, layer_collection);
+			BKE_collection_enable(view_layer, layer_collection);
 		}
 		else { /* ACTION_DISABLE */
 			BKE_reportf(op->reports, RPT_ERROR, "Layer collection %s already disabled",
@@ -430,7 +430,7 @@ static int collection_toggle_exec(bContext *C, wmOperator *op)
 	}
 	else {
 		if (ELEM(action, ACTION_TOGGLE, ACTION_DISABLE)) {
-			BKE_collection_disable(scene_layer, layer_collection);
+			BKE_collection_disable(view_layer, layer_collection);
 		}
 		else { /* ACTION_ENABLE */
 			BKE_reportf(op->reports, RPT_ERROR, "Layer collection %s already enabled",
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index c9e2a040af4..f849de0d127 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -252,16 +252,16 @@ static void enablebutton_collection_flag_cb(bContext *C, void *poin, void *poin2
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = poin;
 	LayerCollection *layer_collection = poin2;
-	SceneLayer *scene_layer = BKE_scene_layer_find_from_collection(scene, layer_collection);
+	ViewLayer *view_layer = BKE_view_layer_find_from_collection(scene, layer_collection);
 
 	/* We need to toggle the flag since this is called after the flag is already set. */
 	layer_collection->flag ^= COLLECTION_DISABLED;
 
 	if (layer_collection->flag & COLLECTION_DISABLED) {
-		BKE_collection_enable(scene_layer, layer_collection);
+		BKE_collection_enable(view_layer, layer_collection);
 	}
 	else {
-		BKE_collection_disable(scene_layer, layer_collection);
+		BKE_collection_disable(view_layer, layer_collection);
 	}
 
 	DEG_relations_tag_update(bmain);
@@ -300,7 +300,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
 {
 	SpaceOops *soops = CTX_wm_space_outliner(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	Object *obedit = CTX_data_edit_object(C);
 	BLI_mempool *ts = soops->treestore;
 	TreeStoreElem *tselem = tsep;
@@ -464,7 +464,7 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 			if (tselem->type == TSE_R_LAYER) {
 				UI_block_emboss_set(block, UI_EMBOSS_NONE);
 				
-				bt = uiDefIconButBitI(block, UI_BTYPE_ICON_TOGGLE, SCENE_LAYER_RENDER, 0, ICON_CHECKBOX_HLT - 1,
+				bt = uiDefIconButBitI(block, UI_BTYPE_ICON_TOGGLE, VIEW_LAYER_RENDER, 0, ICON_CHECKBOX_HLT - 1,
 				                      (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX), te->ys, UI_UNIT_X,
 				                      UI_UNIT_Y, te->directdata, 0, 0, 0, 0, TIP_("Render this RenderLayer"));
 				UI_but_func_set(bt, restrictbutton_r_lay_cb, tselem->id, NULL);
@@ -1239,7 +1239,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
 #undef ICON_DRAW
 }
 
-static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, SceneLayer *sl, SpaceOops *soops,
+static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, ViewLayer *sl, SpaceOops *soops,
                                   ListBase *lb, int level, int xmax, int *offsx, int ys, float alpha_fac)
 {
 	TreeElement *te;
@@ -1325,7 +1325,7 @@ static void outliner_set_coord_tree_element(TreeElement *te, int startx, int sta
 
 
 static void outliner_draw_tree_element(
-        bContext *C, uiBlock *block, const uiFontStyle *fstyle, Scene *scene, SceneLayer *sl,
+        bContext *C, uiBlock *block, const uiFontStyle *fstyle, Scene *scene, ViewLayer *sl,
         ARegion *ar, SpaceOops *soops, TreeElement *te, bool draw_grayed_out,
         int startx, int *starty, TreeElement **te_edit, TreeElement **te_floating)
 {
@@ -1766,7 +1766,7 @@ static void outliner_draw_highlights(ARegion *ar, SpaceOops *soops, int startx,
 }
 
 static void outliner_draw_tree(
-        bContext *C, uiBlock *block, Scene *scene, SceneLayer *sl, ARegion *ar,
+        bContext *C, uiBlock *block, Scene *scene, ViewLayer *sl, ARegion *ar,
         SpaceOops *soops, const bool has_restrict_icons,
         TreeElement **te_edit)
 {
@@ -1888,7 +1888,7 @@ void draw_outliner(const bContext *C)
 {
 	Main *mainvar = CTX_data_main(C); 
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	ARegion *ar = CTX_wm_region(C);
 	View2D *v2d = &ar->v2d;
 	SpaceOops *soops = CTX_wm_space_outliner(C);
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c
index 5d0befece0d..3d89ee8e371 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -978,7 +978,7 @@ static int outliner_open_back(TreeElement *te)
 static int outliner_show_active_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	SpaceOops *so = CTX_wm_space_outliner(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	ARegion *ar = CTX_wm_region(C);
 	View2D *v2d = &ar->v2d;
 	
@@ -2174,8 +2174,8 @@ static int scene_drop_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 
 		BKE_collection_object_add(scene, sc, ob);
 
-		for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) {
-			Base *base = BKE_scene_layer_base_find(sl, ob);
+		for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) {
+			Base *base = BKE_view_layer_base_find(sl, ob);
 			if (base) {
 				ED_object_base_select(base, BA_SELECT);
 			}
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 1edb3c88396..db3c136892f 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -42,7 +42,7 @@ struct TreeStoreElem;
 struct Main;
 struct bContext;
 struct Scene;
-struct SceneLayer;
+struct ViewLayer;
 struct ID;
 struct Object;
 struct bPoseChannel;
@@ -183,7 +183,7 @@ void outliner_free_tree(ListBase *lb);
 void outliner_cleanup_tree(struct SpaceOops *soops);
 void outliner_remove_treestore_element(struct SpaceOops *soops, TreeStoreElem *tselem);
 
-void outliner_build_tree(struct Main *mainvar, struct Scene *scene, struct SceneLayer *sl, struct SpaceOops *soops);
+void outliner_build_tree(struct Main *mainvar, struct Scene *scene, struct ViewLayer *sl, struct SpaceOops *soops);
 
 /* outliner_draw.c ---------------------------------------------- */
 
@@ -192,9 +192,9 @@ void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag);
 
 /* outliner_select.c -------------------------------------------- */
 eOLDrawState tree_element_type_active(
-        struct bContext *C, struct Scene *scene, struct SceneLayer *sl, struct SpaceOops *soops,
+        struct bContext *C, struct Scene *scene, struct ViewLayer *sl, struct SpaceOops *soops,
         TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive);
-eOLDrawState tree_element_active(struct bContext *C, struct Scene *scene, struct SceneLayer *sl, SpaceOops *soops,
+eOLDrawState tree_element_active(struct bContext *C, struct Scene *scene, struct ViewLayer *sl, SpaceOops *soops,
                                  TreeElement *te, const eOLSetState set, const bool handle_all_types);
 
 void outliner_item_do_activate_from_tree_element(
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index f2aec1cfa52..8267aeabe30 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -75,7 +75,7 @@
 /* Outliner Element Selection/Activation on Click */
 
 static eOLDrawState tree_element_active_renderlayer(
-        bContext *C, Scene *UNUSED(scene), SceneLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *tselem, const eOLSetState set)
+        bContext *C, Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *tselem, const eOLSetState set)
 {
 	Scene *sce;
 	
@@ -85,11 +85,11 @@ static eOLDrawState tree_element_active_renderlayer(
 	sce = (Scene *)tselem->id;
 	
 	if (set != OL_SETSEL_NONE) {
-		sce->active_layer = tselem->nr;
+		sce->active_view_layer = tselem->nr;
 		WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, sce);
 	}
 	else {
-		return sce->active_layer == tselem->nr;
+		return sce->active_view_layer == tselem->nr;
 	}
 	return OL_DRAWSEL_NONE;
 }
@@ -99,7 +99,7 @@ static eOLDrawState tree_element_active_renderlayer(
  * CTRL+LMB: Select/Deselect object and all cildren
  * CTRL+SHIFT+LMB: Add/Remove object and all children
  */
-static void do_outliner_object_select_recursive(SceneLayer *sl, Object *ob_parent, bool select)
+static void do_outliner_object_select_recursive(ViewLayer *sl, Object *ob_parent, bool select)
 {
 	Base *base;
 
@@ -137,7 +137,7 @@ static void do_outliner_ebone_select_recursive(bArmature *arm, EditBone *ebone_p
 }
 
 static eOLDrawState tree_element_set_active_object(
-        bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *soops,
+        bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *soops,
         TreeElement *te, const eOLSetState set, bool recursive)
 {
 	TreeStoreElem *tselem = TREESTORE(te);
@@ -166,7 +166,7 @@ static eOLDrawState tree_element_set_active_object(
 	}
 	
 	/* find associated base in current scene */
-	base = BKE_scene_layer_base_find(sl, ob);
+	base = BKE_view_layer_base_find(sl, ob);
 
 	if (base) {
 		if (set == OL_SETSEL_EXTEND) {
@@ -178,7 +178,7 @@ static eOLDrawState tree_element_set_active_object(
 		}
 		else {
 			/* deleselect all */
-			BKE_scene_layer_base_deselect_all(sl);
+			BKE_view_layer_base_deselect_all(sl);
 			ED_object_base_select(base, BA_SELECT);
 		}
 
@@ -200,7 +200,7 @@ static eOLDrawState tree_element_set_active_object(
 }
 
 static eOLDrawState tree_element_active_material(
-        bContext *C, Scene *UNUSED(scene), SceneLayer *sl, SpaceOops *soops,
+        bContext *C, Scene *UNUSED(scene), ViewLayer *sl, SpaceOops *soops,
         TreeElement *te, const eOLSetState set)
 {
 	TreeElement *tes;
@@ -253,7 +253,7 @@ static eOLDrawState tree_element_active_material(
 }
 
 static eOLDrawState tree_element_active_texture(
-        bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *UNUSED(soops),
+        bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *UNUSED(soops),
         TreeElement *te, const eOLSetState set)
 {
 	TreeElement *tep;
@@ -340,7 +340,7 @@ static eOLDrawState tree_element_active_texture(
 
 
 static eOLDrawState tree_element_active_lamp(
-        bContext *UNUSED(C), Scene *UNUSED(scene), SceneLayer *sl, SpaceOops *soops,
+        bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *sl, SpaceOops *soops,
         TreeElement *te, const eOLSetState set)
 {
 	Object *ob;
@@ -363,7 +363,7 @@ static eOLDrawState tree_element_active_lamp(
 }
 
 static eOLDrawState tree_element_active_camera(
-        bContext *UNUSED(C), Scene *scene, SceneLayer *UNUSED(sl), SpaceOops *soops,
+        bContext *UNUSED(C), Scene *scene, ViewLayer *UNUSED(sl), SpaceOops *soops,
         TreeElement *te, const eOLSetState set)
 {
 	Object *ob = (Object *)outliner_search_back(soops, te, ID_OB);
@@ -376,7 +376,7 @@ static eOLDrawState tree_element_active_camera(
 }
 
 static eOLDrawState tree_element_active_world(
-        bContext *C, Scene *scene, SceneLayer *UNUSED(sl), SpaceOops *UNUSED(soops),
+        bContext *C, Scene *scene, ViewLayer *UNUSED(sl), SpaceOops *UNUSED(soops),
         TreeElement *te, const eOLSetState set)
 {
 	TreeElement *tep;
@@ -409,7 +409,7 @@ static eOLDrawState tree_element_active_world(
 }
 
 static eOLDrawState tree_element_active_defgroup(
-        bContext *C, SceneLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set)
+        bContext *C, ViewLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set)
 {
 	Object *ob;
 	
@@ -432,7 +432,7 @@ static eOLDrawState tree_element_active_defgroup(
 }
 
 static eOLDrawState tree_element_active_posegroup(
-        bContext *C, Scene *UNUSED(scene), SceneLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set)
+        bContext *C, Scene *UNUSED(scene), ViewLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set)
 {
 	Object *ob = (Object *)tselem->id;
 	
@@ -453,7 +453,7 @@ static eOLDrawState tree_element_active_posegroup(
 }
 
 static eOLDrawState tree_element_active_posechannel(
-        bContext *C, Scene *UNUSED(scene), SceneLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive)
+        bContext *C, Scene *UNUSED(scene), ViewLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive)
 {
 	Object *ob = (Object *)tselem->id;
 	bArmature *arm = ob->data;
@@ -497,7 +497,7 @@ static eOLDrawState tree_element_active_posechannel(
 }
 
 static eOLDrawState tree_element_active_bone(
-        bContext *C, SceneLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive)
+        bContext *C, ViewLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive)
 {
 	bArmature *arm = (bArmature *)tselem->id;
 	Bone *bone = te->directdata;
@@ -606,7 +606,7 @@ static eOLDrawState tree_element_active_ebone(
 }
 
 static eOLDrawState tree_element_active_modifier(
-        bContext *C, Scene *UNUSED(scene), SceneLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set)
+        bContext *C, Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set)
 {
 	if (set != OL_SETSEL_NONE) {
 		Object *ob = (Object *)tselem->id;
@@ -634,7 +634,7 @@ static eOLDrawState tree_element_active_psys(
 }
 
 static int tree_element_active_constraint(
-        bContext *C, Scene *UNUSED(scene), SceneLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set)
+        bContext *C, Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set)
 {
 	if (set != OL_SETSEL_NONE) {
 		Object *ob = (Object *)tselem->id;
@@ -647,7 +647,7 @@ static int tree_element_active_constraint(
 }
 
 static eOLDrawState tree_element_active_text(
-        bContext *UNUSED(C), Scene *UNUSED(scene), SceneLayer *UNUSED(sl), SpaceOops *UNUSED(soops),
+        bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *UNUSED(sl), SpaceOops *UNUSED(soops),
         TreeElement *UNUSED(te), int UNUSED(set))
 {
 	// XXX removed
@@ -655,10 +655,10 @@ static eOLDrawState tree_element_active_text(
 }
 
 static eOLDrawState tree_element_active_pose(
-        bContext *C, Scene *scene, SceneLayer *sl, TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set)
+        bContext *C, Scene *scene, ViewLayer *sl, TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set)
 {
 	Object *ob = (Object *)tselem->id;
-	Base *base = BKE_scene_layer_base_find(sl, ob);
+	Base *base = BKE_view_layer_base_find(sl, ob);
 
 	if (base == NULL) {
 		/* Armature not instantiated in current scene (e.g. inside an appended group...). */
@@ -744,7 +744,7 @@ static eOLDrawState tree_element_active_sequence_dup(
 }
 
 static eOLDrawState tree_element_active_keymap_item(
-        bContext *UNUSED(C), Scene *UNUSED(scene), SceneLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set)
+        bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set)
 {
 	wmKeyMapItem *kmi = te->directdata;
 	
@@ -780,7 +780,7 @@ static eOLDrawState tree_element_active_collection(
 	/* don't allow selecting a scene collection, it can have multiple layer collection
 	 * instances (which one would the user want to be selected then?) */
 	else if (tselem->type == TSE_LAYER_COLLECTION) {
-		SceneLayer *sl = CTX_data_scene_layer(C);
+		ViewLayer *sl = CTX_data_view_layer(C);
 		LayerCollection *lc = te->directdata;
 		const int collection_index = BKE_layer_collection_findindex(sl, lc);
 
@@ -795,7 +795,7 @@ static eOLDrawState tree_element_active_collection(
 /* ---------------------------------------------- */
 
 /* generic call for ID data check or make/check active in UI */
-eOLDrawState tree_element_active(bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *soops, TreeElement *te,
+eOLDrawState tree_element_active(bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *soops, TreeElement *te,
                                  const eOLSetState set, const bool handle_all_types)
 {
 	switch (te->idcode) {
@@ -826,7 +826,7 @@ eOLDrawState tree_element_active(bContext *C, Scene *scene, SceneLayer *sl, Spac
  * Generic call for non-id data to make/check active in UI
  */
 eOLDrawState tree_element_type_active(
-        bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *soops,
+        bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *soops,
         TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive)
 {
 	switch (tselem->type) {
@@ -883,7 +883,7 @@ eOLDrawState tree_element_type_active(
  * Needed to run from operators accessed from a menu.
  */
 static void do_outliner_item_activate_tree_element(
-        bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *soops,
+        bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *soops,
         TreeElement *te, TreeStoreElem *tselem,
         const bool extend, const bool recursive)
 {
@@ -918,14 +918,14 @@ static void do_outliner_item_activate_tree_element(
 				}
 
 				for (gob = gr->gobject.first; gob; gob = gob->next) {
-					ED_object_base_select(BKE_scene_layer_base_find(sl, gob->ob), sel);
+					ED_object_base_select(BKE_view_layer_base_find(sl, gob->ob), sel);
 				}
 			}
 			else {
-				BKE_scene_layer_base_deselect_all(sl);
+				BKE_view_layer_base_deselect_all(sl);
 
 				for (gob = gr->gobject.first; gob; gob = gob->next) {
-					Base *base = BKE_scene_layer_base_find(sl, gob->ob);
+					Base *base = BKE_view_layer_base_find(sl, gob->ob);
 					/* Object may not be in this scene */
 					if (base != NULL) {
 						if ((base->flag & BASE_SELECTED) == 0) {
@@ -1004,7 +1004,7 @@ void outliner_item_do_activate_from_tree_element(
         bool extend, bool recursive)
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	SpaceOops *soops = CTX_wm_space_outliner(C);
 
 	do_outliner_item_activate_tree_element(
@@ -1044,7 +1044,7 @@ int outliner_item_do_activate_from_cursor(
 	}
 	else {
 		Scene *scene = CTX_data_scene(C);
-		SceneLayer *sl = CTX_data_scene_layer(C);
+		ViewLayer *sl = CTX_data_view_layer(C);
 		/* the row may also contain children, if one is hovered we want this instead of current te */
 		TreeElement *activate_te = outliner_find_item_at_x_in_row(soops, te, view_mval[0]);
 		TreeStoreElem *activate_tselem = TREESTORE(activate_te);
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 79122de70dd..93cb1c62d01 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -366,9 +366,9 @@ static void object_select_cb(
         bContext *C, ReportList *UNUSED(reports), Scene *UNUSED(scene), TreeElement *UNUSED(te),
         TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	Object *ob = (Object *)tselem->id;
-	Base *base = BKE_scene_layer_base_find(sl, ob);
+	Base *base = BKE_view_layer_base_find(sl, ob);
 
 	if (base && ((base->flag & BASE_VISIBLED) != 0)) {
 		base->flag |= BASE_SELECTED;
@@ -388,9 +388,9 @@ static void object_deselect_cb(
         bContext *C, ReportList *UNUSED(reports), Scene *UNUSED(scene), TreeElement *UNUSED(te),
         TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	Object *ob = (Object *)tselem->id;
-	Base *base = BKE_scene_layer_base_find(sl, ob);
+	Base *base = BKE_view_layer_base_find(sl, ob);
 
 	if (base) {
 		base->flag &= ~BASE_SELECTED;
@@ -522,18 +522,18 @@ static void group_linkobs2scene_cb(
         bContext *C, ReportList *UNUSED(reports), Scene *scene, TreeElement *UNUSED(te),
         TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	SceneCollection *sc = CTX_data_scene_collection(C);
 	Group *group = (Group *)tselem->id;
 	GroupObject *gob;
 	Base *base;
 
 	for (gob = group->gobject.first; gob; gob = gob->next) {
-		base = BKE_scene_layer_base_find(sl, gob->ob);
+		base = BKE_view_layer_base_find(sl, gob->ob);
 		if (!base) {
 			/* link to scene */
 			BKE_collection_object_add(scene, sc, gob->ob);
-			base = BKE_scene_layer_base_find(sl, gob->ob);
+			base = BKE_view_layer_base_find(sl, gob->ob);
 			id_us_plus(&gob->ob->id);
 		}
 
@@ -848,14 +848,14 @@ static void collection_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tsel
 		WM_event_add_notifier(C, NC_SCENE | ND_LAYER, scene);
 	}
 	else if (event == OL_COLLECTION_OP_COLLECTION_UNLINK) {
-		SceneLayer *sl = CTX_data_scene_layer(C);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
 
-		if (BLI_findindex(&sl->layer_collections, lc) == -1) {
+		if (BLI_findindex(&view_layer->layer_collections, lc) == -1) {
 			/* we can't unlink if the layer collection wasn't directly linked */
 			TODO_LAYER_OPERATORS; /* this shouldn't be in the menu in those cases */
 		}
 		else {
-			BKE_collection_unlink(sl, lc);
+			BKE_collection_unlink(view_layer, lc);
 			DEG_relations_tag_update(CTX_data_main(C));
 			WM_event_add_notifier(C, NC_SCENE | ND_LAYER, scene);
 		}
@@ -896,13 +896,13 @@ static Base *outline_delete_hierarchy(bContext *C, ReportList *reports, Scene *s
 {
 	Base *child_base, *base_next;
 	Object *parent;
-	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
 	if (!base) {
 		return NULL;
 	}
 
-	for (child_base = scene_layer->object_bases.first; child_base; child_base = base_next) {
+	for (child_base = view_layer->object_bases.first; child_base; child_base = base_next) {
 		base_next = child_base->next;
 		for (parent = child_base->object->parent; parent && (parent != base->object); parent = parent->parent);
 		if (parent) {
@@ -933,12 +933,12 @@ static void object_delete_hierarchy_cb(
         bContext *C, ReportList *reports, Scene *scene,
         TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data))
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	Base *base = (Base *)te->directdata;
 	Object *obedit = scene->obedit;
 
 	if (!base) {
-		base = BKE_scene_layer_base_find(sl, (Object *)tselem->id);
+		base = BKE_view_layer_base_find(sl, (Object *)tselem->id);
 	}
 	if (base) {
 		/* Check also library later. */
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index eda4faab93f..1ab715d0246 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -234,7 +234,7 @@ static void outliner_add_bone(SpaceOops *soops, ListBase *lb, ID *id, Bone *curB
 
 #define LOG2I(x) (int)(log(x) / M_LN2)
 
-static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, SceneLayer *scene_layer)
+static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, ViewLayer *view_layer)
 {
 	TreeStoreElem *tselem = NULL;
 	TreeElement *te = NULL;
@@ -244,7 +244,7 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc
 	
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_COMBINED));
 	te->name = IFACE_("Combined");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 	
 	/* save cpu cycles, but we add the first to invoke an open/close triangle */
 	tselem = TREESTORE(tenla);
@@ -253,71 +253,71 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc
 	
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_Z));
 	te->name = IFACE_("Z");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_VECTOR));
 	te->name = IFACE_("Vector");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_NORMAL));
 	te->name = IFACE_("Normal");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_UV));
 	te->name = IFACE_("UV");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_MIST));
 	te->name = IFACE_("Mist");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_INDEXOB));
 	te->name = IFACE_("Index Object");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_INDEXMA));
 	te->name = IFACE_("Index Material");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_RGBA));
 	te->name = IFACE_("Color");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_DIFFUSE));
 	te->name = IFACE_("Diffuse");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_SPEC));
 	te->name = IFACE_("Specular");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_SHADOW));
 	te->name = IFACE_("Shadow");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_AO));
 	te->name = IFACE_("AO");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_REFLECT));
 	te->name = IFACE_("Reflection");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_REFRACT));
 	te->name = IFACE_("Refraction");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_INDIRECT));
 	te->name = IFACE_("Indirect");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_ENVIRONMENT));
 	te->name = IFACE_("Environment");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 
 	te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_EMIT));
 	te->name = IFACE_("Emit");
-	te->directdata = &scene_layer->passflag;
+	te->directdata = &view_layer->passflag;
 }
 
 #undef LOG2I
@@ -332,19 +332,19 @@ static bool outliner_animdata_test(AnimData *adt)
 #ifdef WITH_FREESTYLE
 static void outliner_add_line_styles(SpaceOops *soops, ListBase *lb, Scene *sce, TreeElement *te)
 {
-	SceneLayer *scene_layer;
+	ViewLayer *view_layer;
 	FreestyleLineSet *lineset;
 
-	for (scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) {
-		for (lineset = scene_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) {
+	for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) {
+		for (lineset = view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) {
 			FreestyleLineStyle *linestyle = lineset->linestyle;
 			if (linestyle) {
 				linestyle->id.tag |= LIB_TAG_DOIT;
 			}
 		}
 	}
-	for (scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) {
-		for (lineset = scene_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) {
+	for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) {
+		for (lineset = view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) {
 			FreestyleLineStyle *linestyle = lineset->linestyle;
 			if (linestyle) {
 				if (!(linestyle->id.tag & LIB_TAG_DOIT))
@@ -359,16 +359,16 @@ static void outliner_add_line_styles(SpaceOops *soops, ListBase *lb, Scene *sce,
 
 static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *sce, TreeElement *te)
 {
-	SceneLayer *scene_layer;
+	ViewLayer *view_layer;
 	TreeElement *tenla = outliner_add_element(soops, lb, sce, te, TSE_R_LAYER_BASE, 0);
 	int a;
 	
 	tenla->name = IFACE_("RenderLayers");
-	for (a = 0, scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next, a++) {
+	for (a = 0, view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next, a++) {
 		TreeElement *tenlay = outliner_add_element(soops, &tenla->subtree, sce, te, TSE_R_LAYER, a);
-		tenlay->name = scene_layer->name;
-		tenlay->directdata = &scene_layer->flag;
-		outliner_add_passes(soops, tenlay, &sce->id, scene_layer);
+		tenlay->name = view_layer->name;
+		tenlay->directdata = &view_layer->flag;
+		outliner_add_passes(soops, tenlay, &sce->id, view_layer);
 	}
 	
 	// TODO: move this to the front?
@@ -1398,7 +1398,7 @@ static void outliner_add_layer_collections_recursive(
 		outliner_make_hierarchy(&ten->subtree);
 	}
 }
-static void outliner_add_collections_act_layer(SpaceOops *soops, SceneLayer *layer)
+static void outliner_add_collections_act_layer(SpaceOops *soops, ViewLayer *layer)
 {
 	outliner_add_layer_collections_recursive(soops, &soops->tree, &layer->layer_collections, NULL);
 }
@@ -1729,7 +1729,7 @@ static int outliner_filter_tree(SpaceOops *soops, ListBase *lb)
 
 /* Main entry point for building the tree data-structure that the outliner represents */
 // TODO: split each mode into its own function?
-void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops *soops)
+void outliner_build_tree(Main *mainvar, Scene *scene, ViewLayer *view_layer, SpaceOops *soops)
 {
 	TreeElement *te = NULL, *ten;
 	TreeStoreElem *tselem;
@@ -1840,7 +1840,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops
 		outliner_make_hierarchy(&soops->tree);
 	}
 	else if (soops->outlinevis == SO_VISIBLE) {
-		FOREACH_VISIBLE_BASE(sl, base)
+		FOREACH_VISIBLE_BASE(view_layer, base)
 		{
 			ten = outliner_add_element(soops, &soops->tree, base->object, NULL, 0, 0);
 			ten->directdata = base;
@@ -1867,7 +1867,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops
 		}
 	}
 	else if (soops->outlinevis == SO_SAME_TYPE) {
-		Object *ob_active = OBACT(sl);
+		Object *ob_active = OBACT(view_layer);
 		if (ob_active) {
 			FOREACH_SCENE_OBJECT(scene, ob)
 			{
@@ -1880,7 +1880,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops
 		}
 	}
 	else if (soops->outlinevis == SO_SELECTED) {
-		FOREACH_SELECTED_BASE(sl, base)
+		FOREACH_SELECTED_BASE(view_layer, base)
 		{
 			ten = outliner_add_element(soops, &soops->tree, base->object, NULL, 0, 0);
 			ten->directdata = base;
@@ -1940,14 +1940,14 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops
 		outliner_add_orphaned_datablocks(mainvar, soops);
 	}
 	else if (soops->outlinevis == SO_ACT_LAYER) {
-		outliner_add_collections_act_layer(soops, sl);
+		outliner_add_collections_act_layer(soops, view_layer);
 	}
 	else if (soops->outlinevis == SO_COLLECTIONS) {
 		outliner_add_collections_master(soops, scene);
 	}
 	else {
-		ten = outliner_add_element(soops, &soops->tree, OBACT(sl), NULL, 0, 0);
-		ten->directdata = BASACT(sl);
+		ten = outliner_add_element(soops, &soops->tree, OBACT(view_layer), NULL, 0, 0);
+		ten->directdata = BASACT(view_layer);
 	}
 
 	if ((soops->flag & SO_SKIP_SORT_ALPHA) == 0) {
diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c
index 229d999eb9e..ffaa259ab6f 100644
--- a/source/blender/editors/space_outliner/space_outliner.c
+++ b/source/blender/editors/space_outliner/space_outliner.c
@@ -126,11 +126,11 @@ static int outliner_parent_drop_poll(bContext *C, wmDrag *drag, const wmEvent *e
 				if (!scene) {
 					return 1;
 				} else {
-					for (SceneLayer *scene_layer = scene->render_layers.first;
-					     scene_layer;
-					     scene_layer = scene_layer->next)
+					for (ViewLayer *view_layer = scene->view_layers.first;
+					     view_layer;
+					     view_layer = view_layer->next)
 					{
-						if (BKE_scene_layer_base_find(scene_layer, (Object *)id)) {
+						if (BKE_view_layer_base_find(view_layer, (Object *)id)) {
 							return 1;
 						}
 					}