SceneRenderLayer Removal/Refactor

This patch moves all the functionality previously in SceneRenderLayer to SceneLayer.
If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer.

Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get
rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished.

This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail.

This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion).

Following next is the individual note of the individual parts that were committed.

Note 1: It is up to Cycles to still get rid of exclude_layer internally.
Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and

(1) Remove the override as it is
(2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE

Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED.

Note 3: Cycles still need to implement the per-object holdout
(similar to how we do shadow catcher).

Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still
using lay, e.g., in shi->lay.

Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit.

Reviewers: sergey, campbellbarton, brecht

Differential Revision: https://developer.blender.org/D2919

5 files changed, 20 insertions, 20 deletions

diff --git a/source/blender/freestyle/intern/scene_graph/NodeSceneRenderLayer.cpp b/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp
index 24c56ff4e28..c4beed1dbef 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeSceneRenderLayer.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp
@@ -18,18 +18,18 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/freestyle/intern/scene_graph/NodeSceneRenderLayer.cpp
+/** \file blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp
  *  \ingroup freestyle
  *  \brief Class to represent a scene render layer in Blender.
  */
 
-#include "NodeSceneRenderLayer.h"
+#include "NodeSceneLayer.h"
 
 namespace Freestyle {
 
-void NodeSceneRenderLayer::accept(SceneVisitor& v)
+void NodeSceneLayer::accept(SceneVisitor& v)
 {
-	v.visitNodeSceneRenderLayer(*this);
+	v.visitNodeSceneLayer(*this);
 }
 
 } /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/scene_graph/NodeSceneRenderLayer.h b/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.h
index 8dc93d84201..5b781dff528 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeSceneRenderLayer.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.h
@@ -18,10 +18,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __FREESTYLE_NODE_SCENE_RENDER_LAYER_H__
-#define __FREESTYLE_NODE_SCENE_RENDER_LAYER_H__
+#ifndef __FREESTYLE_NODE_SCENE_LAYER_H__
+#define __FREESTYLE_NODE_SCENE_LAYER_H__
 
-/** \file blender/freestyle/intern/scene_graph/NodeSceneRenderLayer.h
+/** \file blender/freestyle/intern/scene_graph/NodeSceneLayer.h
  *  \ingroup freestyle
  *  \brief Class to represent a scene render layer in Blender.
  */
@@ -36,20 +36,20 @@ using namespace std;
 
 namespace Freestyle {
 
-class NodeSceneRenderLayer : public Node
+class NodeSceneLayer : public Node
 {
 public:
-	inline NodeSceneRenderLayer(Scene& scene, SceneRenderLayer& srl) : Node(), _Scene(scene), _SceneRenderLayer(srl) {}
-	virtual ~NodeSceneRenderLayer() {}
+	inline NodeSceneLayer(Scene& scene, SceneLayer& scene_layer) : Node(), _Scene(scene), _SceneLayer(scene_layer) {}
+	virtual ~NodeSceneLayer() {}
 
 	inline struct Scene& scene() const
 	{
 		return _Scene;
 	}
 
-	inline struct SceneRenderLayer& sceneRenderLayer() const
+	inline struct SceneLayer& sceneLayer() const
 	{
-		return _SceneRenderLayer;
+		return _SceneLayer;
 	}
 
 	/*! Accept the corresponding visitor */
@@ -58,9 +58,9 @@ public:
 protected:
 
 	Scene& _Scene;
-	SceneRenderLayer& _SceneRenderLayer;
+	SceneLayer& _SceneLayer;
 };
 
 } /* namespace Freestyle */
 
-#endif // __FREESTYLE_NODE_SCENE_RENDER_LAYER_H__
+#endif // __FREESTYLE_NODE_SCENE_LAYER_H__
diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.cpp b/source/blender/freestyle/intern/scene_graph/SceneHash.cpp
index 2af02ab5764..5fdf06a5059 100644
--- a/source/blender/freestyle/intern/scene_graph/SceneHash.cpp
+++ b/source/blender/freestyle/intern/scene_graph/SceneHash.cpp
@@ -35,14 +35,14 @@ string SceneHash::toString()
 	return ss.str();
 }
 
-void SceneHash::visitNodeSceneRenderLayer(NodeSceneRenderLayer& node)
+void SceneHash::visitNodeSceneLayer(NodeSceneLayer& node)
 {
 	struct RenderData *r = &node.scene().r;
 	adler32((unsigned char *)&r->xsch, sizeof(r->xsch));  // resolution_x
 	adler32((unsigned char *)&r->ysch, sizeof(r->ysch));  // resolution_y
 	adler32((unsigned char *)&r->size, sizeof(r->size));  // resolution_percentage
 
-	struct FreestyleConfig *config = &node.sceneRenderLayer().freestyleConfig;
+	struct FreestyleConfig *config = &node.sceneLayer().freestyle_config;
 	adler32((unsigned char *)&config->flags, sizeof(config->flags));
 	adler32((unsigned char *)&config->crease_angle, sizeof(config->crease_angle));
 	adler32((unsigned char *)&config->sphere_radius, sizeof(config->sphere_radius));
diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.h b/source/blender/freestyle/intern/scene_graph/SceneHash.h
index 9da711673f0..b21fcf32fe3 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 "NodeSceneRenderLayer.h"
+#include "NodeSceneLayer.h"
 #include "NodeCamera.h"
 #include "SceneVisitor.h"
 
@@ -49,7 +49,7 @@ public:
 	virtual ~SceneHash() {}
 
 	VISIT_DECL(NodeCamera)
-	VISIT_DECL(NodeSceneRenderLayer)
+	VISIT_DECL(NodeSceneLayer)
 	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 712585c4064..b27abb3625c 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 NodeSceneRenderLayer;
+class NodeSceneLayer;
 
 class Rep;
 class LineRep;
@@ -88,7 +88,7 @@ public:
 	VISIT_COMPLETE_DEF(NodeCamera)
 	VISIT_COMPLETE_DEF(NodeDrawingStyle)
 	VISIT_COMPLETE_DEF(NodeTransform)
-	VISIT_COMPLETE_DEF(NodeSceneRenderLayer)
+	VISIT_COMPLETE_DEF(NodeSceneLayer)
 
 	VISIT_COMPLETE_DEF(Rep)
 	VISIT_COMPLETE_DEF(LineRep)