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

5 files changed, 21 insertions, 21 deletions

diff --git a/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.cpp
index c4beed1dbef..701c5caa91d 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.cpp
@@ -18,18 +18,18 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp
+/** \file blender/freestyle/intern/scene_graph/NodeViewLayer.cpp
  *  \ingroup freestyle
  *  \brief Class to represent a scene render layer in Blender.
  */
 
-#include "NodeSceneLayer.h"
+#include "NodeViewLayer.h"
 
 namespace Freestyle {
 
-void NodeSceneLayer::accept(SceneVisitor& v)
+void NodeViewLayer::accept(SceneVisitor& v)
 {
-	v.visitNodeSceneLayer(*this);
+	v.visitNodeViewLayer(*this);
 }
 
 } /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.h b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h
index 5b781dff528..cc64fda60b6 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h
@@ -18,38 +18,38 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __FREESTYLE_NODE_SCENE_LAYER_H__
-#define __FREESTYLE_NODE_SCENE_LAYER_H__
+#ifndef __FREESTYLE_NODE_VIEW_LAYER_H__
+#define __FREESTYLE_NODE_VIEW_LAYER_H__
 
-/** \file blender/freestyle/intern/scene_graph/NodeSceneLayer.h
+/** \file blender/freestyle/intern/scene_graph/NodeViewLayer.h
  *  \ingroup freestyle
- *  \brief Class to represent a scene render layer in Blender.
+ *  \brief Class to represent a view layer in Blender.
  */
 
 #include "Node.h"
 
 extern "C" {
-#include "DNA_scene_types.h" /* for Scene and SceneRenderLayer */
+#include "DNA_scene_types.h" /* for Scene and ViewLayer */
 }
 
 using namespace std;
 
 namespace Freestyle {
 
-class NodeSceneLayer : public Node
+class NodeViewLayer : public Node
 {
 public:
-	inline NodeSceneLayer(Scene& scene, SceneLayer& scene_layer) : Node(), _Scene(scene), _SceneLayer(scene_layer) {}
-	virtual ~NodeSceneLayer() {}
+	inline NodeViewLayer(Scene& scene, ViewLayer& view_layer) : Node(), _Scene(scene), _ViewLayer(view_layer) {}
+	virtual ~NodeViewLayer() {}
 
 	inline struct Scene& scene() const
 	{
 		return _Scene;
 	}
 
-	inline struct SceneLayer& sceneLayer() const
+	inline struct ViewLayer& sceneLayer() const
 	{
-		return _SceneLayer;
+		return _ViewLayer;
 	}
 
 	/*! Accept the corresponding visitor */
@@ -58,9 +58,9 @@ public:
 protected:
 
 	Scene& _Scene;
-	SceneLayer& _SceneLayer;
+	ViewLayer& _ViewLayer;
 };
 
 } /* namespace Freestyle */
 
-#endif // __FREESTYLE_NODE_SCENE_LAYER_H__
+#endif // __FREESTYLE_NODE_VIEW_LAYER_H__
diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.cpp b/source/blender/freestyle/intern/scene_graph/SceneHash.cpp
index 5fdf06a5059..16c353678c1 100644
--- a/source/blender/freestyle/intern/scene_graph/SceneHash.cpp
+++ b/source/blender/freestyle/intern/scene_graph/SceneHash.cpp
@@ -35,7 +35,7 @@ string SceneHash::toString()
 	return ss.str();
 }
 
-void SceneHash::visitNodeSceneLayer(NodeSceneLayer& node)
+void SceneHash::visitNodeViewLayer(NodeViewLayer& node)
 {
 	struct RenderData *r = &node.scene().r;
 	adler32((unsigned char *)&r->xsch, sizeof(r->xsch));  // resolution_x
diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.h b/source/blender/freestyle/intern/scene_graph/SceneHash.h
index b21fcf32fe3..662b4bba8f1 100644
--- a/source/blender/freestyle/intern/scene_graph/SceneHash.h
+++ b/source/blender/freestyle/intern/scene_graph/SceneHash.h
@@ -26,7 +26,7 @@
  */
 
 #include "IndexedFaceSet.h"
-#include "NodeSceneLayer.h"
+#include "NodeViewLayer.h"
 #include "NodeCamera.h"
 #include "SceneVisitor.h"
 
@@ -49,7 +49,7 @@ public:
 	virtual ~SceneHash() {}
 
 	VISIT_DECL(NodeCamera)
-	VISIT_DECL(NodeSceneLayer)
+	VISIT_DECL(NodeViewLayer)
 	VISIT_DECL(IndexedFaceSet)
 
 	string toString();
diff --git a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h
index b27abb3625c..d76e48980bf 100644
--- a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h
+++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h
@@ -56,7 +56,7 @@ class NodeLight;
 class NodeCamera;
 class NodeDrawingStyle;
 class NodeTransform;
-class NodeSceneLayer;
+class NodeViewLayer;
 
 class Rep;
 class LineRep;
@@ -88,7 +88,7 @@ public:
 	VISIT_COMPLETE_DEF(NodeCamera)
 	VISIT_COMPLETE_DEF(NodeDrawingStyle)
 	VISIT_COMPLETE_DEF(NodeTransform)
-	VISIT_COMPLETE_DEF(NodeSceneLayer)
+	VISIT_COMPLETE_DEF(NodeViewLayer)
 
 	VISIT_COMPLETE_DEF(Rep)
 	VISIT_COMPLETE_DEF(LineRep)