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/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 3b1bb5175a2..4cc7dc6283f 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -51,38 +51,38 @@ struct Object;
 struct RenderEngine;
 struct Scene;
 struct SceneCollection;
-struct SceneLayer;
+struct ViewLayer;
 struct WorkSpace;
 
 void BKE_layer_exit(void);
 
-struct SceneLayer *BKE_scene_layer_from_scene_get(const struct Scene *scene);
-struct SceneLayer *BKE_scene_layer_from_workspace_get(const struct Scene *scene, const struct WorkSpace *workspace);
-struct SceneLayer *BKE_scene_layer_add(struct Scene *scene, const char *name);
+struct ViewLayer *BKE_view_layer_from_scene_get(const struct Scene *scene);
+struct ViewLayer *BKE_view_layer_from_workspace_get(const struct Scene *scene, const struct WorkSpace *workspace);
+struct ViewLayer *BKE_view_layer_add(struct Scene *scene, const char *name);
 
 /* DEPRECATED */
-struct SceneLayer *BKE_scene_layer_context_active_PLACEHOLDER(const struct Scene *scene);
+struct ViewLayer *BKE_view_layer_context_active_PLACEHOLDER(const struct Scene *scene);
 
-void BKE_scene_layer_free(struct SceneLayer *sl);
+void BKE_view_layer_free(struct ViewLayer *sl);
 
-void BKE_scene_layer_selected_objects_tag(struct SceneLayer *sl, const int tag);
+void BKE_view_layer_selected_objects_tag(struct ViewLayer *sl, const int tag);
 
-struct Object *BKE_scene_layer_camera_find(struct SceneLayer *sl);
-struct SceneLayer *BKE_scene_layer_find_from_collection(const struct Scene *scene, struct LayerCollection *lc);
-struct Base *BKE_scene_layer_base_find(struct SceneLayer *sl, struct Object *ob);
-struct Base *BKE_scene_layer_base_find_by_name(struct SceneLayer *sl, struct Object *ob);
-void BKE_scene_layer_base_deselect_all(struct SceneLayer *sl);
-void BKE_scene_layer_base_select(struct SceneLayer *sl, struct Base *selbase);
+struct Object *BKE_view_layer_camera_find(struct ViewLayer *sl);
+struct ViewLayer *BKE_view_layer_find_from_collection(const struct Scene *scene, struct LayerCollection *lc);
+struct Base *BKE_view_layer_base_find(struct ViewLayer *sl, struct Object *ob);
+struct Base *BKE_view_layer_base_find_by_name(struct ViewLayer *sl, struct Object *ob);
+void BKE_view_layer_base_deselect_all(struct ViewLayer *sl);
+void BKE_view_layer_base_select(struct ViewLayer *sl, struct Base *selbase);
 
-void BKE_layer_collection_free(struct SceneLayer *sl, struct LayerCollection *lc);
+void BKE_layer_collection_free(struct ViewLayer *sl, struct LayerCollection *lc);
 
-struct LayerCollection *BKE_layer_collection_get_active(struct SceneLayer *sl);
-struct LayerCollection *BKE_layer_collection_get_active_ensure(struct Scene *scene, struct SceneLayer *sl);
+struct LayerCollection *BKE_layer_collection_get_active(struct ViewLayer *sl);
+struct LayerCollection *BKE_layer_collection_get_active_ensure(struct Scene *scene, struct ViewLayer *sl);
 
-int BKE_layer_collection_count(struct SceneLayer *sl);
+int BKE_layer_collection_count(struct ViewLayer *sl);
 
-struct LayerCollection *BKE_layer_collection_from_index(struct SceneLayer *sl, const int index);
-int BKE_layer_collection_findindex(struct SceneLayer *sl, const struct LayerCollection *lc);
+struct LayerCollection *BKE_layer_collection_from_index(struct ViewLayer *sl, const int index);
+int BKE_layer_collection_findindex(struct ViewLayer *sl, const struct LayerCollection *lc);
 
 bool BKE_layer_collection_move_above(const struct Scene *scene, struct LayerCollection *lc_dst, struct LayerCollection *lc_src);
 bool BKE_layer_collection_move_below(const struct Scene *scene, struct LayerCollection *lc_dst, struct LayerCollection *lc_src);
@@ -90,14 +90,14 @@ bool BKE_layer_collection_move_into(const struct Scene *scene, struct LayerColle
 
 void BKE_layer_collection_resync(const struct Scene *scene, const struct SceneCollection *sc);
 
-struct LayerCollection *BKE_collection_link(struct SceneLayer *sl, struct SceneCollection *sc);
+struct LayerCollection *BKE_collection_link(struct ViewLayer *sl, struct SceneCollection *sc);
 
-void BKE_collection_unlink(struct SceneLayer *sl, struct LayerCollection *lc);
+void BKE_collection_unlink(struct ViewLayer *sl, struct LayerCollection *lc);
 
-void BKE_collection_enable(struct SceneLayer *sl, struct LayerCollection *lc);
-void BKE_collection_disable(struct SceneLayer *sl, struct LayerCollection *lc);
+void BKE_collection_enable(struct ViewLayer *sl, struct LayerCollection *lc);
+void BKE_collection_disable(struct ViewLayer *sl, struct LayerCollection *lc);
 
-bool BKE_scene_layer_has_collection(struct SceneLayer *sl, const struct SceneCollection *sc);
+bool BKE_view_layer_has_collection(struct ViewLayer *sl, const struct SceneCollection *sc);
 bool BKE_scene_has_object(struct Scene *scene, struct Object *ob);
 
 /* syncing */
@@ -108,8 +108,8 @@ void BKE_layer_sync_object_unlink(const struct Scene *scene, struct SceneCollect
 
 /* override */
 
-void BKE_override_scene_layer_datablock_add(struct SceneLayer *scene_layer, int id_type, const char *data_path, const struct ID *id);
-void BKE_override_scene_layer_int_add(struct SceneLayer *scene_layer, int id_type, const char *data_path, const int value);
+void BKE_override_view_layer_datablock_add(struct ViewLayer *view_layer, int id_type, const char *data_path, const struct ID *id);
+void BKE_override_view_layer_int_add(struct ViewLayer *view_layer, int id_type, const char *data_path, const int value);
 
 void BKE_override_layer_collection_boolean_add(struct LayerCollection *layer_collection, int id_type, const char *data_path, const bool value);
 
@@ -125,14 +125,14 @@ void BKE_layer_collection_engine_settings_create(struct IDProperty *root);
 void BKE_layer_collection_engine_settings_validate_scene(struct Scene *scene);
 void BKE_layer_collection_engine_settings_validate_collection(struct LayerCollection *lc);
 
-struct IDProperty *BKE_scene_layer_engine_evaluated_get(struct SceneLayer *sl, const int type, const char *engine_name);
-struct IDProperty *BKE_scene_layer_engine_layer_get(struct SceneLayer *sl, const int type, const char *engine_name);
-struct IDProperty *BKE_scene_layer_engine_scene_get(struct Scene *scene, const int type, const char *engine_name);
-void BKE_scene_layer_engine_settings_callback_register(struct Main *bmain, const char *engine_name, EngineSettingsCB func);
-void BKE_scene_layer_engine_settings_callback_free(void);
-void BKE_scene_layer_engine_settings_validate_scene(struct Scene *scene);
-void BKE_scene_layer_engine_settings_validate_layer(struct SceneLayer *sl);
-void BKE_scene_layer_engine_settings_create(struct IDProperty *root);
+struct IDProperty *BKE_view_layer_engine_evaluated_get(struct ViewLayer *sl, const int type, const char *engine_name);
+struct IDProperty *BKE_view_layer_engine_layer_get(struct ViewLayer *sl, const int type, const char *engine_name);
+struct IDProperty *BKE_view_layer_engine_scene_get(struct Scene *scene, const int type, const char *engine_name);
+void BKE_view_layer_engine_settings_callback_register(struct Main *bmain, const char *engine_name, EngineSettingsCB func);
+void BKE_view_layer_engine_settings_callback_free(void);
+void BKE_view_layer_engine_settings_validate_scene(struct Scene *scene);
+void BKE_view_layer_engine_settings_validate_layer(struct ViewLayer *view_layer);
+void BKE_view_layer_engine_settings_create(struct IDProperty *root);
 
 void BKE_collection_engine_property_add_float(struct IDProperty *props, const char *name, float value);
 void BKE_collection_engine_property_add_float_array(
@@ -153,12 +153,12 @@ void BKE_collection_engine_property_value_set_bool(struct IDProperty *props, con
 
 void BKE_layer_eval_layer_collection_pre(const struct EvaluationContext *eval_ctx,
                                          struct Scene *scene,
-                                         struct SceneLayer *scene_layer);
+                                         struct ViewLayer *view_layer);
 void BKE_layer_eval_layer_collection(const struct EvaluationContext *eval_ctx,
                                      struct LayerCollection *layer_collection,
                                      struct LayerCollection *parent_layer_collection);
 void BKE_layer_eval_layer_collection_post(const struct EvaluationContext *eval_ctx,
-                                          struct SceneLayer *scene_layer);
+                                          struct ViewLayer *view_layer);
 
 /* iterators */
 
@@ -259,7 +259,7 @@ typedef struct ObjectsRenderableIteratorData {
 	struct Scene *scene;
 
 	struct {
-		struct SceneLayer *scene_layer;
+		struct ViewLayer *view_layer;
 		struct Base *base;
 		struct Scene *set;
 	} iter;