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

9 files changed, 77 insertions, 77 deletions

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index ea2c688daa3..016c0e75331 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -428,7 +428,7 @@ Object *ED_object_add_type(
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	Object *ob;
 
 	/* for as long scene has editmode... */
@@ -1426,7 +1426,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
                                        const bool use_hierarchy)
 {
 	Main *bmain = CTX_data_main(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	ListBase *lb_duplis;
 	DupliObject *dob;
 	GHash *dupli_gh, *parent_gh = NULL;
@@ -1460,7 +1460,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
 		}
 
 		BKE_collection_object_add_from(scene, base->object, ob_dst);
-		base_dst = BKE_scene_layer_base_find(sl, ob_dst);
+		base_dst = BKE_view_layer_base_find(sl, ob_dst);
 		BLI_assert(base_dst != NULL);
 
 		BKE_scene_object_base_flag_sync_from_base(base_dst);
@@ -1674,7 +1674,7 @@ static int convert_poll(bContext *C)
 }
 
 /* Helper for convert_exec */
-static Base *duplibase_for_convert(Main *bmain, Scene *scene, SceneLayer *sl, Base *base, Object *ob)
+static Base *duplibase_for_convert(Main *bmain, Scene *scene, ViewLayer *sl, Base *base, Object *ob)
 {
 	Object *obn;
 	Base *basen;
@@ -1687,7 +1687,7 @@ static Base *duplibase_for_convert(Main *bmain, Scene *scene, SceneLayer *sl, Ba
 	DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 	BKE_collection_object_add_from(scene, ob, obn);
 
-	basen = BKE_scene_layer_base_find(sl, obn);
+	basen = BKE_view_layer_base_find(sl, obn);
 	ED_object_base_select(basen, BA_SELECT);
 	ED_object_base_select(basen, BA_DESELECT);
 	return basen;
@@ -1697,7 +1697,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	EvaluationContext eval_ctx;
 	Base *basen = NULL, *basact = NULL;
 	Object *ob1, *newob, *obact = CTX_data_active_object(C);
@@ -1762,10 +1762,10 @@ static int convert_exec(bContext *C, wmOperator *op)
 			DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
 		}
 
-		Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, sl, true);
+		Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true);
 		uint64_t customdata_mask_prev = scene->customdata_mask;
 		scene->customdata_mask |= CD_MASK_MESH;
-		BKE_scene_graph_update_tagged(bmain->eval_ctx, depsgraph, bmain, scene, sl);
+		BKE_scene_graph_update_tagged(bmain->eval_ctx, depsgraph, bmain, scene, view_layer);
 		scene->customdata_mask = customdata_mask_prev;
 	}
 
@@ -1792,7 +1792,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 			ob->flag |= OB_DONE;
 
 			if (keep_original) {
-				basen = duplibase_for_convert(bmain, scene, sl, base, NULL);
+				basen = duplibase_for_convert(bmain, scene, view_layer, base, NULL);
 				newob = basen->object;
 
 				/* decrement original mesh's usage count  */
@@ -1817,7 +1817,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 			ob->flag |= OB_DONE;
 
 			if (keep_original) {
-				basen = duplibase_for_convert(bmain, scene, sl, base, NULL);
+				basen = duplibase_for_convert(bmain, scene, view_layer, base, NULL);
 				newob = basen->object;
 
 				/* decrement original mesh's usage count  */
@@ -1848,7 +1848,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 			ob->flag |= OB_DONE;
 
 			if (keep_original) {
-				basen = duplibase_for_convert(bmain, scene, sl, base, NULL);
+				basen = duplibase_for_convert(bmain, scene, view_layer, base, NULL);
 				newob = basen->object;
 
 				/* decrement original curve's usage count  */
@@ -1919,7 +1919,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 
 			if (target == OB_MESH) {
 				if (keep_original) {
-					basen = duplibase_for_convert(bmain, scene, sl, base, NULL);
+					basen = duplibase_for_convert(bmain, scene, view_layer, base, NULL);
 					newob = basen->object;
 
 					/* decrement original curve's usage count  */
@@ -1954,7 +1954,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 			if (!(baseob->flag & OB_DONE)) {
 				baseob->flag |= OB_DONE;
 
-				basen = duplibase_for_convert(bmain, scene, sl, base, baseob);
+				basen = duplibase_for_convert(bmain, scene, view_layer, base, baseob);
 				newob = basen->object;
 
 				mb = newob->data;
@@ -2031,11 +2031,11 @@ static int convert_exec(bContext *C, wmOperator *op)
 	if (basact) {
 		/* active base was changed */
 		ED_object_base_activate(C, basact);
-		BASACT(sl) = basact;
+		BASACT(view_layer) = basact;
 	}
-	else if (BASACT(sl)->object->flag & OB_DONE) {
-		WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, BASACT(sl)->object);
-		WM_event_add_notifier(C, NC_OBJECT | ND_DATA, BASACT(sl)->object);
+	else if (BASACT(view_layer)->object->flag & OB_DONE) {
+		WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, BASACT(view_layer)->object);
+		WM_event_add_notifier(C, NC_OBJECT | ND_DATA, BASACT(view_layer)->object);
 	}
 
 	DEG_relations_tag_update(bmain);
@@ -2077,7 +2077,7 @@ void OBJECT_OT_convert(wmOperatorType *ot)
 /* used below, assumes id.new is correct */
 /* leaves selection of base/object unaltered */
 /* Does set ID->newid pointers. */
-static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, SceneLayer *sl, Object *ob, int dupflag)
+static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, ViewLayer *sl, Object *ob, int dupflag)
 {
 #define ID_NEW_REMAP_US(a)	if (      (a)->id.newid) { (a) = (void *)(a)->id.newid;       (a)->id.us++; }
 #define ID_NEW_REMAP_US2(a)	if (((ID *)a)->newid)    { (a) = ((ID  *)a)->newid;     ((ID *)a)->us++;    }
@@ -2096,7 +2096,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, SceneLayer
 		DEG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
 		BKE_collection_object_add_from(scene, ob, obn);
-		basen = BKE_scene_layer_base_find(sl, obn);
+		basen = BKE_view_layer_base_find(sl, obn);
 
 		/* 1) duplis should end up in same group as the original
 		 * 2) Rigid Body sim participants MUST always be part of a group...
@@ -2319,7 +2319,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, SceneLayer
  * note: don't call this within a loop since clear_* funcs loop over the entire database.
  * note: caller must do DAG_relations_tag_update(bmain);
  *       this is not done automatic since we may duplicate many objects in a batch */
-Base *ED_object_add_duplicate(Main *bmain, Scene *scene, SceneLayer *sl, Base *base, int dupflag)
+Base *ED_object_add_duplicate(Main *bmain, Scene *scene, ViewLayer *sl, Base *base, int dupflag)
 {
 	Base *basen;
 	Object *ob;
@@ -2353,7 +2353,7 @@ static int duplicate_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	const bool linked = RNA_boolean_get(op->ptr, "linked");
 	int dupflag = (linked) ? 0 : U.dupflag;
 
@@ -2425,7 +2425,7 @@ static int add_named_exec(bContext *C, wmOperator *op)
 	const wmEvent *event = win ? win->eventstate : NULL;
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	Base *basen;
 	Object *ob;
 	const bool linked = RNA_boolean_get(op->ptr, "linked");
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index 0fd1d32c8b8..c8fafd3e521 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -616,7 +616,7 @@ static int test_bake_internal(bContext *C, ReportList *reports)
 static void init_bake_internal(BakeRender *bkr, bContext *C)
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	bScreen *sc = CTX_wm_screen(C);
 
 	/* get editmode results */
@@ -838,7 +838,7 @@ static int bake_image_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	int result = OPERATOR_CANCELLED;
 
 	if (is_multires_bake(scene)) {
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index 80fd44be364..05a5f652382 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -1688,15 +1688,15 @@ static bool get_new_constraint_target(bContext *C, int con_type, Object **tar_ob
 	if ((found == false) && (add)) {
 		Main *bmain = CTX_data_main(C);
 		Scene *scene = CTX_data_scene(C);
-		SceneLayer *sl = CTX_data_scene_layer(C);
-		Base *base = BASACT(sl), *newbase = NULL;
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		Base *base = BASACT(view_layer), *newbase = NULL;
 		Object *obt;
 		
 		/* add new target object */
-		obt = BKE_object_add(bmain, scene, sl, OB_EMPTY, NULL);
+		obt = BKE_object_add(bmain, scene, view_layer, OB_EMPTY, NULL);
 		
 		/* set layers OK */
-		newbase = BASACT(sl);
+		newbase = BASACT(view_layer);
 		newbase->lay = base->lay;
 		obt->lay = newbase->lay;
 		
@@ -1715,7 +1715,7 @@ static bool get_new_constraint_target(bContext *C, int con_type, Object **tar_ob
 		}
 
 		/* restore, BKE_object_add sets active */
-		BASACT(sl) = base;
+		BASACT(view_layer) = base;
 		base->flag |= BASE_SELECTED;
 		
 		/* make our new target the new object */
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index eaf42d4a53c..b5283da490a 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -235,7 +235,7 @@ void ED_object_editmode_exit(bContext *C, int flag)
 	/* Note! only in exceptional cases should 'EM_DO_UNDO' NOT be in the flag */
 	/* Note! if 'EM_FREEDATA' isn't in the flag, use ED_object_editmode_load directly */
 	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);
 	const bool freedata = (flag & EM_FREEDATA) != 0;
 
@@ -290,7 +290,7 @@ void ED_object_editmode_exit(bContext *C, int flag)
 void ED_object_editmode_enter(bContext *C, int flag)
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	Object *ob;
 	bool ok = false;
 
@@ -512,7 +512,7 @@ void OBJECT_OT_posemode_toggle(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
-static void copymenu_properties(SceneLayer *sl, Object *ob)
+static void copymenu_properties(ViewLayer *sl, Object *ob)
 {	
 //XXX no longer used - to be removed - replaced by game_properties_copy_exec
 	bProperty *prop;
@@ -573,7 +573,7 @@ static void copymenu_properties(SceneLayer *sl, Object *ob)
 	
 }
 
-static void copymenu_logicbricks(SceneLayer *sl, Object *ob)
+static void copymenu_logicbricks(ViewLayer *sl, Object *ob)
 {
 //XXX no longer used - to be removed - replaced by logicbricks_copy_exec
 	Base *base;
@@ -659,7 +659,7 @@ static void copy_texture_space(Object *to, Object *ob)
 }
 
 /* UNUSED, keep in case we want to copy functionality for use elsewhere */
-static void copy_attr(Main *bmain, Scene *scene, SceneLayer *sl, short event)
+static void copy_attr(Main *bmain, Scene *scene, ViewLayer *sl, short event)
 {
 	Object *ob;
 	Base *base;
@@ -910,7 +910,7 @@ static void copy_attr(Main *bmain, Scene *scene, SceneLayer *sl, short event)
 		DEG_relations_tag_update(bmain);
 }
 
-static void UNUSED_FUNCTION(copy_attr_menu) (Main *bmain, Scene *scene, SceneLayer *sl)
+static void UNUSED_FUNCTION(copy_attr_menu) (Main *bmain, Scene *scene, ViewLayer *sl)
 {
 	Object *ob;
 	short event;
@@ -1334,7 +1334,7 @@ void OBJECT_OT_shade_smooth(wmOperatorType *ot)
 
 /* ********************** */
 
-static void UNUSED_FUNCTION(image_aspect) (Scene *scene, SceneLayer *sl)
+static void UNUSED_FUNCTION(image_aspect) (Scene *scene, ViewLayer *sl)
 {
 	/* all selected objects with an image map: scale in image aspect */
 	Base *base;
diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c
index 27c1a03190a..da392b9ad99 100644
--- a/source/blender/editors/object/object_group.c
+++ b/source/blender/editors/object/object_group.c
@@ -200,7 +200,7 @@ void GROUP_OT_objects_add_active(wmOperatorType *ot)
 static int objects_remove_active_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	Object *ob = OBACT(sl);
 	int single_group_index = RNA_enum_get(op->ptr, "group");
 	Group *single_group = group_object_active_find_index(ob, single_group_index);
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index 3f6651299be..f806e3757d2 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -448,14 +448,14 @@ static int hook_op_edit_poll(bContext *C)
 	return 0;
 }
 
-static Object *add_hook_object_new(Main *bmain, Scene *scene, SceneLayer *sl, Object *obedit)
+static Object *add_hook_object_new(Main *bmain, Scene *scene, ViewLayer *sl, Object *obedit)
 {
 	Base *base, *basedit;
 	Object *ob;
 
 	ob = BKE_object_add(bmain, scene, sl, OB_EMPTY, NULL);
 	
-	basedit = BKE_scene_layer_base_find(sl, obedit);
+	basedit = BKE_view_layer_base_find(sl, obedit);
 	base = sl->basact;
 	base->lay = ob->lay = obedit->lay;
 	BLI_assert(sl->basact->object == ob);
@@ -467,7 +467,7 @@ static Object *add_hook_object_new(Main *bmain, Scene *scene, SceneLayer *sl, Ob
 	return ob;
 }
 
-static int add_hook_object(const bContext *C, Main *bmain, Scene *scene, SceneLayer *sl, Object *obedit, Object *ob, int mode, ReportList *reports)
+static int add_hook_object(const bContext *C, Main *bmain, Scene *scene, ViewLayer *sl, Object *obedit, Object *ob, int mode, ReportList *reports)
 {
 	ModifierData *md = NULL;
 	HookModifierData *hmd = NULL;
@@ -562,7 +562,7 @@ static int object_add_hook_selob_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(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);
 	Object *obsel = NULL;
 	const bool use_bone = RNA_boolean_get(op->ptr, "use_bone");
@@ -618,7 +618,7 @@ static int object_add_hook_newob_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(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);
 
 	if (add_hook_object(C, bmain, scene, sl, obedit, NULL, OBJECT_ADDHOOK_NEWOB, op->reports)) {
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index a498e8a1564..b0bfe4fb09f 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -413,7 +413,7 @@ int ED_object_modifier_move_down(ReportList *reports, Object *ob, ModifierData *
 	return 1;
 }
 
-int ED_object_modifier_convert(ReportList *UNUSED(reports), Main *bmain, Scene *scene, SceneLayer *sl, Object *ob, ModifierData *md)
+int ED_object_modifier_convert(ReportList *UNUSED(reports), Main *bmain, Scene *scene, ViewLayer *sl, Object *ob, ModifierData *md)
 {
 	Object *obn;
 	ParticleSystem *psys;
@@ -882,7 +882,7 @@ ModifierData *edit_modifier_property_get(wmOperator *op, Object *ob, int type)
 static int modifier_remove_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	Object *ob = ED_object_active_context(C);
 	ModifierData *md = edit_modifier_property_get(op, ob, 0);
 	int mode_orig = ob->mode;
@@ -1058,7 +1058,7 @@ static int modifier_convert_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	Object *ob = ED_object_active_context(C);
 	ModifierData *md = edit_modifier_property_get(op, ob, 0);
 	
@@ -1698,7 +1698,7 @@ static void skin_armature_bone_create(Object *skin_ob,
 	}
 }
 
-static Object *modifier_skin_armature_create(const bContext *C, Scene *scene, SceneLayer *sl, Object *skin_ob)
+static Object *modifier_skin_armature_create(const bContext *C, Scene *scene, ViewLayer *sl, Object *skin_ob)
 {
 	Main *bmain = CTX_data_main(C);
 	EvaluationContext eval_ctx;
@@ -1784,7 +1784,7 @@ static int skin_armature_create_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	Object *ob = CTX_data_active_object(C), *arm_ob;
 	Mesh *me = ob->data;
 	ModifierData *skin_md;
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index eee1ae64505..132d613440c 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -127,7 +127,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(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);
 	EvaluationContext eval_ctx;
 	BMVert *eve;
@@ -342,7 +342,7 @@ static int make_proxy_exec(bContext *C, wmOperator *op)
 	Object *ob, *gob = ED_object_active_context(C);
 	GroupObject *go;
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
 	if (gob->dup_group != NULL) {
 		go = BLI_findlink(&gob->dup_group->gobject, RNA_enum_get(op->ptr, "object"));
@@ -360,7 +360,7 @@ static int make_proxy_exec(bContext *C, wmOperator *op)
 		BLI_snprintf(name, sizeof(name), "%s_proxy", ((ID *)(gob ? gob : ob))->name + 2);
 
 		/* Add new object for the proxy */
-		newob = BKE_object_add_from(bmain, scene, scene_layer, OB_EMPTY, name, gob ? gob : ob);
+		newob = BKE_object_add_from(bmain, scene, view_layer, OB_EMPTY, name, gob ? gob : ob);
 
 		/* set layers OK */
 		BKE_object_make_proxy(newob, ob, gob);
@@ -1697,8 +1697,8 @@ static void single_object_users(Main *bmain, Scene *scene, View3D *v3d, const in
 	SceneCollection *msc = BKE_collection_master(scene);
 	single_object_users_scene_collection(bmain, scene, msc, flag, copy_groups);
 
-	/* loop over SceneLayers and assign the pointers accordingly */
-	for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) {
+	/* loop over ViewLayers and assign the pointers accordingly */
+	for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) {
 		for (Base *base = sl->object_bases.first; base; base = base->next) {
 			ID_NEW_REMAP(base->object);
 		}
@@ -1779,7 +1779,7 @@ static void new_id_matar(Main *bmain, Material **matar, const int totcol)
 	}
 }
 
-static void single_obdata_users(Main *bmain, Scene *scene, SceneLayer *sl, const int flag)
+static void single_obdata_users(Main *bmain, Scene *scene, ViewLayer *sl, const int flag)
 {
 	Lamp *la;
 	Curve *cu;
@@ -1866,7 +1866,7 @@ static void single_obdata_users(Main *bmain, Scene *scene, SceneLayer *sl, const
 	}
 }
 
-static void single_object_action_users(Scene *scene, SceneLayer *sl, const int flag)
+static void single_object_action_users(Scene *scene, ViewLayer *sl, const int flag)
 {
 	FOREACH_OBJECT_FLAG(scene, sl, flag, ob)
 		if (!ID_IS_LINKED(ob)) {
@@ -1876,7 +1876,7 @@ static void single_object_action_users(Scene *scene, SceneLayer *sl, const int f
 	FOREACH_OBJECT_FLAG_END
 }
 
-static void single_mat_users(Main *bmain, Scene *scene, SceneLayer *sl, const int flag, const bool do_textures)
+static void single_mat_users(Main *bmain, Scene *scene, ViewLayer *sl, const int flag, const bool do_textures)
 {
 	Material *ma, *man;
 	Tex *tex;
@@ -2132,7 +2132,7 @@ static void tag_localizable_objects(bContext *C, const int mode)
  * Instance indirectly referenced zero user objects,
  * otherwise they're lost on reload, see T40595.
  */
-static bool make_local_all__instance_indirect_unused(Main *bmain, Scene *scene, SceneLayer *sl, SceneCollection *sc)
+static bool make_local_all__instance_indirect_unused(Main *bmain, Scene *scene, ViewLayer *sl, SceneCollection *sc)
 {
 	Object *ob;
 	bool changed = false;
@@ -2144,7 +2144,7 @@ static bool make_local_all__instance_indirect_unused(Main *bmain, Scene *scene,
 			id_us_plus(&ob->id);
 
 			BKE_collection_object_add(scene, sc, ob);
-			base = BKE_scene_layer_base_find(sl, ob);
+			base = BKE_view_layer_base_find(sl, ob);
 			base->flag |= BASE_SELECTED;
 			BKE_scene_object_base_flag_sync_from_base(base);
 			DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
@@ -2226,15 +2226,15 @@ static int make_local_exec(bContext *C, wmOperator *op)
 
 	/* Note: we (ab)use LIB_TAG_PRE_EXISTING to cherry pick which ID to make local... */
 	if (mode == MAKE_LOCAL_ALL) {
-		SceneLayer *scene_layer = CTX_data_scene_layer(C);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
 		SceneCollection *scene_collection = CTX_data_scene_collection(C);
 
 		BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false);
 
 		/* De-select so the user can differentiate newly instanced from existing objects. */
-		BKE_scene_layer_base_deselect_all(scene_layer);
+		BKE_view_layer_base_deselect_all(view_layer);
 
-		if (make_local_all__instance_indirect_unused(bmain, scene, scene_layer, scene_collection)) {
+		if (make_local_all__instance_indirect_unused(bmain, scene, view_layer, scene_collection)) {
 			BKE_report(op->reports, RPT_INFO, "Orphan library objects added to the current scene to avoid loss");
 		}
 	}
@@ -2334,7 +2334,7 @@ static int make_single_user_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	View3D *v3d = CTX_wm_view3d(C); /* ok if this is NULL */
 	const int flag = (RNA_enum_get(op->ptr, "type") == MAKE_SINGLE_USER_SELECTED) ? SELECT : 0;
 	const bool copy_groups = false;
@@ -2342,7 +2342,7 @@ static int make_single_user_exec(bContext *C, wmOperator *op)
 
 	if (RNA_boolean_get(op->ptr, "object")) {
 		if (flag == SELECT) {
-			BKE_scene_layer_selected_objects_tag(sl, OB_DONE);
+			BKE_view_layer_selected_objects_tag(sl, OB_DONE);
 			single_object_users(bmain, scene, v3d, OB_DONE, copy_groups);
 		}
 		else {
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 1542978041e..225f435016a 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -118,15 +118,15 @@ void ED_object_base_select(Base *base, eObjectSelect_Mode mode)
  */
 void ED_object_base_activate(bContext *C, Base *base)
 {
-	SceneLayer *scene_layer = CTX_data_scene_layer(C);
-	scene_layer->basact = base;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	view_layer->basact = base;
 
 	if (base) {
 #ifdef USE_WORKSPACE_MODE
 		WorkSpace *workspace = CTX_wm_workspace(C);
 		BKE_workspace_object_mode_set(workspace, base->object->mode);
 #endif
-		WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene_layer);
+		WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, view_layer);
 	}
 	else {
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, NULL);
@@ -389,7 +389,7 @@ void ED_object_select_linked_by_id(bContext *C, ID *id)
 static int object_select_linked_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *ob;
 	int nr = RNA_enum_get(op->ptr, "type");
 	bool changed = false, extend;
@@ -404,7 +404,7 @@ static int object_select_linked_exec(bContext *C, wmOperator *op)
 		CTX_DATA_END;
 	}
 	
-	ob = OBACT(sl);
+	ob = OBACT(view_layer);
 	if (ob == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "No active object");
 		return OPERATOR_CANCELLED;
@@ -548,7 +548,7 @@ static bool select_grouped_children(bContext *C, Object *ob, const bool recursiv
 
 static bool select_grouped_parent(bContext *C) /* Makes parent active and de-selected OBACT */
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 	Base *baspar, *basact = CTX_data_active_base(C);
 	bool changed = false;
 
@@ -556,7 +556,7 @@ static bool select_grouped_parent(bContext *C) /* Makes parent active and de-sel
 		return 0;  /* we know OBACT is valid */
 	}
 
-	baspar = BKE_scene_layer_base_find(sl, basact->object->parent);
+	baspar = BKE_view_layer_base_find(sl, basact->object->parent);
 
 	/* can be NULL if parent in other scene */
 	if (baspar && BASE_SELECTABLE(baspar)) {
@@ -616,7 +616,7 @@ static bool select_grouped_group(bContext *C, Object *ob)  /* Select objects in
 
 static bool select_grouped_object_hooks(bContext *C, Object *ob)
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *sl = CTX_data_view_layer(C);
 
 	bool changed = false;
 	Base *base;
@@ -627,7 +627,7 @@ static bool select_grouped_object_hooks(bContext *C, Object *ob)
 		if (md->type == eModifierType_Hook) {
 			hmd = (HookModifierData *) md;
 			if (hmd->object && !(hmd->object->flag & SELECT)) {
-				base = BKE_scene_layer_base_find(sl, hmd->object);
+				base = BKE_view_layer_base_find(sl, hmd->object);
 				if (base && (BASE_SELECTABLE(base))) {
 					ED_object_base_select(base, BA_SELECT);
 					changed = true;
@@ -799,7 +799,7 @@ static bool select_grouped_keyingset(bContext *C, Object *UNUSED(ob), ReportList
 static int object_select_grouped_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Object *ob;
 	const int type = RNA_enum_get(op->ptr, "type");
 	bool changed = false, extend;
@@ -815,7 +815,7 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op)
 		CTX_DATA_END;
 	}
 
-	ob = OBACT(sl);
+	ob = OBACT(view_layer);
 	if (ob == NULL) {
 		BKE_report(op->reports, RPT_ERROR, "No active object");
 		return OPERATOR_CANCELLED;
@@ -1014,7 +1014,7 @@ void OBJECT_OT_select_same_group(wmOperatorType *ot)
 static int object_select_mirror_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);
 	bool extend;
 	
 	extend = RNA_boolean_get(op->ptr, "extend");
@@ -1028,7 +1028,7 @@ static int object_select_mirror_exec(bContext *C, wmOperator *op)
 		if (!STREQ(name_flip, primbase->object->id.name + 2)) {
 			Object *ob = (Object *)BKE_libblock_find_name(ID_OB, name_flip);
 			if (ob) {
-				Base *secbase = BKE_scene_layer_base_find(sl, ob);
+				Base *secbase = BKE_view_layer_base_find(sl, ob);
 
 				if (secbase) {
 					ED_object_base_select(secbase, BA_SELECT);
@@ -1071,9 +1071,9 @@ void OBJECT_OT_select_mirror(wmOperatorType *ot)
 
 static bool object_select_more_less(bContext *C, const bool select)
 {
-	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	for (Base *base = scene_layer->object_bases.first; base; base = base->next) {
+	for (Base *base = view_layer->object_bases.first; base; base = base->next) {
 		Object *ob = base->object;
 		ob->flag &= ~OB_DONE;
 		ob->id.tag &= ~LIB_TAG_DOIT;