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

3 files changed, 17 insertions, 17 deletions

diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 80a388408a5..0db465e583b 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -2684,7 +2684,7 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index,
 		{
 			bDopeSheet *ads = (bDopeSheet *)ac->data;
 			Scene *sce = (Scene *)ads->source;
-			SceneLayer *scene_layer = ac->scene_layer;
+			ViewLayer *view_layer = ac->view_layer;
 			Base *base = (Base *)ale->data;
 			Object *ob = base->object;
 			AnimData *adt = ob->adt;
@@ -2703,7 +2703,7 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index,
 
 					/* deselect all */
 					/* TODO: should this deselect all other types of channels too? */
-					for (b = scene_layer->object_bases.first; b; b = b->next) {
+					for (b = view_layer->object_bases.first; b; b = b->next) {
 						ED_object_base_select(b, BA_DESELECT);
 						BKE_scene_object_base_flag_sync_from_base(b);
 						if (b->object->adt) b->object->adt->flag &= ~(ADT_UI_SELECTED | ADT_UI_ACTIVE);
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index f5eadeab92a..e13371b942b 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -132,7 +132,7 @@ static void animedit_get_yscale_factor(bAnimContext *ac)
 /* Note: there's a similar function in key.c (BKE_key_from_object) */
 static Key *actedit_get_shapekeys(bAnimContext *ac)
 {
-	SceneLayer *sl = ac->scene_layer;
+	ViewLayer *sl = ac->view_layer;
 	Object *ob;
 	Key *key;
 	
@@ -381,8 +381,8 @@ bool ANIM_animdata_get_context(const bContext *C, bAnimContext *ac)
 	if (scene) {
 		ac->markers = ED_context_get_markers(C);
 	}
-	ac->scene_layer = CTX_data_scene_layer(C);
-	ac->obact = (ac->scene_layer->basact) ? ac->scene_layer->basact->object : NULL;
+	ac->view_layer = CTX_data_view_layer(C);
+	ac->obact = (ac->view_layer->basact) ? ac->view_layer->basact->object : NULL;
 	ac->sa = sa;
 	ac->ar = ar;
 	ac->sl = sl;
@@ -1686,7 +1686,7 @@ static size_t animdata_filter_gpencil(bAnimContext *ac, ListBase *anim_data, voi
 	
 	if (ads->filterflag & ADS_FILTER_GP_3DONLY) {
 		Scene *scene = (Scene *)ads->source;
-		SceneLayer *sl = (SceneLayer *)ac->scene_layer;
+		ViewLayer *sl = (ViewLayer *)ac->view_layer;
 		Base *base;
 
 		/* Active scene's GPencil block first - No parent item needed... */
@@ -1958,26 +1958,26 @@ static size_t animdata_filter_ds_nodetree(bAnimContext *ac, ListBase *anim_data,
 
 static size_t animdata_filter_ds_linestyle(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, Scene *sce, int filter_mode)
 {
-	SceneLayer *scene_layer;
+	ViewLayer *view_layer;
 	FreestyleLineSet *lineset;
 	size_t items = 0;
 	
-	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) {
 			if (lineset->linestyle) {
 				lineset->linestyle->id.tag |= LIB_TAG_DOIT;
 			}
 		}
 	}
 	
-	for (scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) {
+	for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) {
 		/* skip render layers without Freestyle enabled */
-		if ((scene_layer->flag & SCENE_LAYER_FREESTYLE) == 0) {
+		if ((view_layer->flag & VIEW_LAYER_FREESTYLE) == 0) {
 			continue;
 		}
 
 		/* loop over linesets defined in the render layer */
-		for (lineset = scene_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) {
+		for (lineset = view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) {
 			FreestyleLineStyle *linestyle = lineset->linestyle;
 			ListBase tmp_data = {NULL, NULL};
 			size_t tmp_items = 0;
@@ -2941,7 +2941,7 @@ static int ds_base_sorting_cmp(const void *base1_ptr, const void *base2_ptr)
 }
 
 /* Get a sorted list of all the bases - for inclusion in dopesheet (when drawing channels) */
-static Base **animdata_filter_ds_sorted_bases(bDopeSheet *ads, SceneLayer *sl, int filter_mode, size_t *r_usable_bases)
+static Base **animdata_filter_ds_sorted_bases(bDopeSheet *ads, ViewLayer *sl, int filter_mode, size_t *r_usable_bases)
 {
 	/* Create an array with space for all the bases, but only containing the usable ones */
 	size_t tot_bases = BLI_listbase_count(&sl->object_bases);
@@ -2967,7 +2967,7 @@ static Base **animdata_filter_ds_sorted_bases(bDopeSheet *ads, SceneLayer *sl, i
 static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, int filter_mode)
 {
 	Scene *scene = (Scene *)ads->source;
-	SceneLayer *sl = (SceneLayer *)ac->scene_layer;
+	ViewLayer *sl = (ViewLayer *)ac->view_layer;
 	size_t items = 0;
 
 	/* check that we do indeed have a scene */
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index a5965336e12..107a46999f0 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -1146,13 +1146,13 @@ static int ed_marker_select(bContext *C, const wmEvent *event, bool extend, bool
 
 	if (camera) {
 		Scene *scene = CTX_data_scene(C);
-		SceneLayer *scene_layer = CTX_data_scene_layer(C);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
 		Base *base;
 		TimeMarker *marker;
 		int sel = 0;
 		
 		if (!extend)
-			BKE_scene_layer_base_deselect_all(scene_layer);
+			BKE_view_layer_base_deselect_all(view_layer);
 		
 		for (marker = markers->first; marker; marker = marker->next) {
 			if (marker->frame == cfra) {
@@ -1164,7 +1164,7 @@ static int ed_marker_select(bContext *C, const wmEvent *event, bool extend, bool
 		for (marker = markers->first; marker; marker = marker->next) {
 			if (marker->camera) {
 				if (marker->frame == cfra) {
-					base = BKE_scene_layer_base_find(scene_layer, marker->camera);
+					base = BKE_view_layer_base_find(view_layer, marker->camera);
 					if (base) {
 						ED_object_base_select(base, sel);
 						if (sel)