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, 8 insertions, 8 deletions

diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 698d67478d8..d1b28bffc7e 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -301,25 +301,25 @@ static Mesh *rna_Main_meshes_new(Main *bmain, const char *name)
 /* copied from Mesh_getFromObject and adapted to RNA interface */
 /* settings: 1 - preview, 2 - render */
 Mesh *rna_Main_meshes_new_from_object(
-        Main *bmain, ReportList *reports, Scene *sce, SceneLayer *scene_layer,
+        Main *bmain, ReportList *reports, Scene *sce, ViewLayer *view_layer,
         Object *ob, int apply_modifiers, int settings, int calc_tessface, int calc_undeformed)
 {
 	EvaluationContext eval_ctx;
 
 	/* XXX: This should never happen, but render pipeline is not ready to give
-	 * proper scene_layer, and will always pass NULL here. For until we port
-	 * pipeline form SceneRenderLayer to SceneLayer we have this stub to prevent
+	 * proper view_layer, and will always pass NULL here. For until we port
+	 * pipeline form SceneRenderLayer to ViewLayer we have this stub to prevent
 	 * some obvious crashes.
 	 *                                                         - sergey -
 	 */
-	if (scene_layer == NULL) {
-		scene_layer = sce->render_layers.first;
+	if (view_layer == NULL) {
+		view_layer = sce->view_layers.first;
 	}
 
 	DEG_evaluation_context_init(&eval_ctx, settings);
 	eval_ctx.ctime = (float)sce->r.cfra + sce->r.subframe;
-	eval_ctx.scene_layer = scene_layer;
-	eval_ctx.depsgraph = BKE_scene_get_depsgraph(sce, scene_layer, false);
+	eval_ctx.view_layer = view_layer;
+	eval_ctx.depsgraph = BKE_scene_get_depsgraph(sce, view_layer, false);
 
 	switch (ob->type) {
 		case OB_FONT:
@@ -918,7 +918,7 @@ void RNA_def_main_meshes(BlenderRNA *brna, PropertyRNA *cprop)
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
 	parm = RNA_def_pointer(func, "scene", "Scene", "", "Scene within which to evaluate modifiers");
 	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
-	parm = RNA_def_pointer(func, "scene_layer", "SceneLayer", "", "Scene layer within which to evaluate modifiers");
+	parm = RNA_def_pointer(func, "view_layer", "ViewLayer", "", "Scene layer within which to evaluate modifiers");
 	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
 	parm = RNA_def_pointer(func, "object", "Object", "", "Object to create mesh from");
 	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);