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

diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index d262adb13fe..dd415b1ea9d 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -43,7 +43,7 @@ class Mesh;
 class Object;
 class ParticleSystem;
 class Scene;
-class SceneLayer;
+class ViewLayer;
 class Shader;
 class ShaderGraph;
 class ShaderNode;
@@ -67,9 +67,9 @@ public:
 	               int width, int height,
 	               void **python_thread_state,
 	               const char *layer = 0);
-	void sync_render_layers(BL::SpaceView3D& b_v3d, const char *layer);
+	void sync_view_layers(BL::SpaceView3D& b_v3d, const char *layer);
 	array<Pass> sync_render_passes(BL::RenderLayer& b_rlay,
-	                               BL::SceneLayer& b_slay,
+	                               BL::ViewLayer& b_slay,
 	                               const SessionParams &session_params);
 	void sync_integrator();
 	void sync_camera(BL::RenderSettings& b_render,
@@ -79,8 +79,8 @@ public:
 	void sync_view(BL::SpaceView3D& b_v3d,
 	               BL::RegionView3D& b_rv3d,
 	               int width, int height);
-	inline int get_layer_samples() { return render_layer.samples; }
-	inline int get_layer_bound_samples() { return render_layer.bound_samples; }
+	inline int get_layer_samples() { return view_layer.samples; }
+	inline int get_layer_bound_samples() { return view_layer.bound_samples; }
 
 	/* get parameters */
 	static SceneParams get_scene_params(BL::Scene& b_scene,
@@ -165,7 +165,7 @@ private:
 	BL::BlendData b_data;
 	BL::Depsgraph b_depsgraph;
 	BL::Scene b_scene;
-	BL::SceneLayer b_scene_layer;
+	BL::ViewLayer b_view_layer;
 
 	id_map<void*, Shader> shader_map;
 	id_map<ObjectKey, Object> object_map;
@@ -187,7 +187,7 @@ private:
 
 	struct RenderLayerInfo {
 		RenderLayerInfo()
-		: scene_layer(0), layer(0),
+		: view_layer(0), layer(0),
 		  holdout_layer(0), exclude_layer(0),
 		  material_override(PointerRNA_NULL),
 		  use_background_shader(true),
@@ -198,7 +198,7 @@ private:
 		{}
 
 		string name;
-		uint scene_layer;
+		uint view_layer;
 		uint layer; /* This can be safely removed from Cycles. */
 		uint holdout_layer; /* This can be safely removed from Cycles. */
 		uint exclude_layer; /* This can be safely removed from Cycles. */
@@ -209,7 +209,7 @@ private:
 		bool use_hair;
 		int samples; /* This can be safely removed from Cycles. */
 		bool bound_samples; /* This can be safely removed from Cycles. */
-	} render_layer;
+	} view_layer;
 
 	Progress &progress;
 };