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

1 files changed, 37 insertions, 37 deletions

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) {