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

4 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index bc986f11394..8908d0e603f 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -134,7 +134,7 @@ bool DocumentImporter::import()
 	loader.registerExtraDataCallbackHandler(ehandler);
 
 	// deselect all to select new objects
-	BKE_scene_layer_base_deselect_all(CTX_data_scene_layer(mContext));
+	BKE_view_layer_base_deselect_all(CTX_data_view_layer(mContext));
 
 	std::string mFilename = std::string(this->import_settings->filepath);
 	const std::string encodedFilename = bc_url_encode(mFilename);
diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp
index e9285bf24ff..6c5fb0b33f3 100644
--- a/source/blender/collada/collada.cpp
+++ b/source/blender/collada/collada.cpp
@@ -69,7 +69,7 @@ int collada_import(bContext *C,
 
 int collada_export(const EvaluationContext *eval_ctx,
                    Scene *sce,
-                   SceneLayer *scene_layer,
+                   ViewLayer *view_layer,
                    const char *filepath,
 
                    int apply_modifiers,
@@ -124,7 +124,7 @@ int collada_export(const EvaluationContext *eval_ctx,
 	if (export_settings.include_children) includeFilter |= OB_REL_CHILDREN_RECURSIVE;
 
 	eObjectSet objectSet = (export_settings.selected) ? OB_SET_SELECTED : OB_SET_ALL;
-	export_settings.export_set = BKE_object_relational_superset(scene_layer, objectSet, (eObRelationTypes)includeFilter);
+	export_settings.export_set = BKE_object_relational_superset(view_layer, objectSet, (eObRelationTypes)includeFilter);
 	int export_count = BLI_linklist_count(export_settings.export_set);
 
 	if (export_count == 0) {
diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h
index 1cec6a53922..eb3964f9cb7 100644
--- a/source/blender/collada/collada.h
+++ b/source/blender/collada/collada.h
@@ -48,7 +48,7 @@ typedef enum BC_export_transformation_type {
 
 struct bContext;
 struct Scene;
-struct SceneLayer;
+struct ViewLayer;
 struct EvaluationContext;
 
 /*
@@ -66,7 +66,7 @@ int collada_import(struct bContext *C,
 
 int collada_export(const struct EvaluationContext *eval_ctx,
                    struct Scene *sce,
-                   struct SceneLayer *scene_layer,
+                   struct ViewLayer *view_layer,
                    const char *filepath,
                    int apply_modifiers,
                    BC_export_mesh_type export_mesh_type,
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 85976c64b5f..1a6f2675cc7 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -144,13 +144,13 @@ Object *bc_add_object(Scene *scene, int type, const char *name)
 	DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
 	/* XXX Collada should use the context scene layer, not the scene one. (dfelinto/gaia). */
-	SceneLayer *scene_layer = BKE_scene_layer_context_active_PLACEHOLDER(scene);
+	ViewLayer *view_layer = BKE_view_layer_context_active_PLACEHOLDER(scene);
 
-	LayerCollection *layer_collection = BKE_layer_collection_get_active_ensure(scene, scene_layer);
+	LayerCollection *layer_collection = BKE_layer_collection_get_active_ensure(scene, view_layer);
 	BKE_collection_object_add(scene, layer_collection->scene_collection, ob);
 
-	Base *base = BKE_scene_layer_base_find(scene_layer, ob);
-	BKE_scene_layer_base_select(scene_layer, base);
+	Base *base = BKE_view_layer_base_find(view_layer, ob);
+	BKE_view_layer_base_select(view_layer, base);
 
 	return ob;
 }