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

13 files changed, 57 insertions, 57 deletions

diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt
index 1ae4211aa23..6106dfa58b2 100644
--- a/source/blender/freestyle/CMakeLists.txt
+++ b/source/blender/freestyle/CMakeLists.txt
@@ -392,8 +392,8 @@ set(SRC
 	intern/scene_graph/NodeGroup.h
 	intern/scene_graph/NodeLight.cpp
 	intern/scene_graph/NodeLight.h
-	intern/scene_graph/NodeSceneRenderLayer.cpp
-	intern/scene_graph/NodeSceneRenderLayer.h
+	intern/scene_graph/NodeSceneLayer.cpp
+	intern/scene_graph/NodeSceneLayer.h
 	intern/scene_graph/NodeShape.cpp
 	intern/scene_graph/NodeShape.h
 	intern/scene_graph/NodeTransform.cpp
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h
index a6382010ca7..4b9e09a9fb7 100644
--- a/source/blender/freestyle/FRS_freestyle.h
+++ b/source/blender/freestyle/FRS_freestyle.h
@@ -30,6 +30,7 @@ extern "C" {
 #endif
 
 struct Render;
+struct RenderLayer;
 struct Material;
 struct FreestyleConfig;
 struct FreestyleLineStyle;
@@ -50,13 +51,13 @@ extern struct FreestyleGlobals g_freestyle;
 void FRS_initialize(void);
 void FRS_set_context(struct bContext *C);
 void FRS_read_file(struct bContext *C);
-int FRS_is_freestyle_enabled(struct SceneRenderLayer *srl);
+int FRS_is_freestyle_enabled(struct SceneLayer *scene_layer);
 void FRS_init_stroke_renderer(struct Render *re);
 void FRS_begin_stroke_rendering(struct Render *re);
-struct Render *FRS_do_stroke_rendering(struct Render *re, struct SceneRenderLayer *srl, int render);
+struct Render *FRS_do_stroke_rendering(struct Render *re, struct SceneLayer *scene_layer, int render);
 void FRS_end_stroke_rendering(struct Render *re);
 void FRS_free_view_map_cache(void);
-void FRS_composite_result(struct Render *re, struct SceneRenderLayer *srl, struct Render *freestyle_render);
+void FRS_composite_result(struct Render *re, struct SceneLayer *scene_layer, struct Render *freestyle_render);
 void FRS_exit(void);
 
 /* FreestyleConfig.linesets */
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index beb85798223..9754cf1de9f 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -40,7 +40,7 @@ extern "C" {
 #include "../scene_graph/NodeDrawingStyle.h"
 #include "../scene_graph/NodeShape.h"
 #include "../scene_graph/NodeTransform.h"
-#include "../scene_graph/NodeSceneRenderLayer.h"
+#include "../scene_graph/NodeSceneLayer.h"
 #include "../scene_graph/ScenePrettyPrinter.h"
 #include "../scene_graph/VertexRep.h"
 
@@ -232,9 +232,9 @@ bool Controller::hitViewMapCache()
 	return false;
 }
 
-int Controller::LoadMesh(Render *re, SceneRenderLayer *srl)
+int Controller::LoadMesh(Render *re, SceneLayer *scene_layer)
 {
-	BlenderFileLoader loader(re, srl);
+	BlenderFileLoader loader(re, scene_layer);
 
 	loader.setRenderMonitor(_pRenderMonitor);
 
@@ -301,7 +301,7 @@ int Controller::LoadMesh(Render *re, SceneRenderLayer *srl)
 		}
 		cam->setProjectionMatrix(proj);
 		_RootNode->AddChild(cam);
-		_RootNode->AddChild(new NodeSceneRenderLayer(*re->scene, *srl));
+		_RootNode->AddChild(new NodeSceneLayer(*re->scene, *scene_layer));
 
 		sceneHashFunc.reset();
 		//blenderScene->accept(sceneHashFunc);
diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h
index 154edaf1e53..606c80ada3f 100644
--- a/source/blender/freestyle/intern/application/Controller.h
+++ b/source/blender/freestyle/intern/application/Controller.h
@@ -68,7 +68,7 @@ public:
 	//soc
 	void init_options();
 
-	int  LoadMesh(Render *re, SceneRenderLayer *srl);
+	int  LoadMesh(Render *re, SceneLayer *scene_layer);
 	int  Load3DSFile(const char *iFileName);
 	void CloseFile();
 	void ComputeViewMap();
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index 35ac3171987..b20349acfd1 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -32,16 +32,16 @@
 
 namespace Freestyle {
 
-BlenderFileLoader::BlenderFileLoader(Render *re, SceneRenderLayer *srl)
+BlenderFileLoader::BlenderFileLoader(Render *re, SceneLayer *scene_layer)
 {
 	_re = re;
-	_srl = srl;
+	_scene_layer = scene_layer;
 	_Scene = NULL;
 	_numFacesRead = 0;
 #if 0
 	_minEdgeSize = DBL_MAX;
 #endif
-	_smooth = (srl->freestyleConfig.flags & FREESTYLE_FACE_SMOOTHNESS_FLAG) != 0;
+	_smooth = (scene_layer->freestyle_config.flags & FREESTYLE_FACE_SMOOTHNESS_FLAG) != 0;
 	_pRenderMonitor = NULL;
 }
 
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
index 894f8eeeb4e..b5530e3af09 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
@@ -78,7 +78,7 @@ class BlenderFileLoader
 {
 public:
 	/*! Builds a MaxFileLoader */
-	BlenderFileLoader(Render *re, SceneRenderLayer *srl);
+	BlenderFileLoader(Render *re, SceneLayer *scene_layer);
 	virtual ~BlenderFileLoader();
 
 	/*! Loads the 3D scene and returns a pointer to the scene root node */
@@ -114,7 +114,7 @@ protected:
 		unsigned n;
 	};
 	Render *_re;
-	SceneRenderLayer *_srl;
+	SceneLayer *_scene_layer;
 	NodeGroup *_Scene;
 	unsigned _numFacesRead;
 #if 0
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 0424ed4bb16..847da8067d5 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -127,12 +127,9 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
 	BKE_scene_set_background(freestyle_bmain, freestyle_scene);
 	DEG_graph_id_tag_update(freestyle_bmain, freestyle_depsgraph, &freestyle_scene->id, 0);
 
-	// Render layer
-	SceneRenderLayer *srl = (SceneRenderLayer *)freestyle_scene->r.layers.first;
-	srl->layflag = SCE_LAY_SOLID | SCE_LAY_ZTRA;
-
 	// Scene layer.
 	SceneLayer *scene_layer = (SceneLayer *)freestyle_scene->render_layers.first;
+	scene_layer->layflag = SCE_LAY_SOLID | SCE_LAY_ZTRA;
 
 	// Camera
 	Object *object_camera = BKE_object_add(freestyle_bmain, freestyle_scene, scene_layer, OB_CAMERA, NULL);
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index ea22633c50e..0baad3f5165 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -283,19 +283,19 @@ static bool test_edge_type_conditions(struct edge_type_condition *conditions,
 	return true;
 }
 
-static void prepare(Render *re, SceneRenderLayer *srl)
+static void prepare(Render *re, SceneLayer *scene_layer)
 {
 	// load mesh
 	re->i.infostr = IFACE_("Freestyle: Mesh loading");
 	re->stats_draw(re->sdh, &re->i);
 	re->i.infostr = NULL;
-	if (controller->LoadMesh(re, srl)) // returns if scene cannot be loaded or if empty
+	if (controller->LoadMesh(re, scene_layer)) // returns if scene cannot be loaded or if empty
 		return;
 	if (re->test_break(re->tbh))
 		return;
 
 	// add style modules
-	FreestyleConfig *config = &srl->freestyleConfig;
+	FreestyleConfig *config = &scene_layer->freestyle_config;
 
 	if (G.debug & G_DEBUG_FREESTYLE) {
 		cout << "\n===  Rendering options  ===" << endl;
@@ -359,7 +359,7 @@ static void prepare(Render *re, SceneRenderLayer *srl)
 					cout << "  " << layer_count+1 << ": " << lineset->name << " - " <<
 					        (lineset->linestyle ? (lineset->linestyle->id.name + 2) : "<NULL>") << endl;
 				}
-				char *buffer = create_lineset_handler(srl->name, lineset->name);
+				char *buffer = create_lineset_handler(scene_layer->name, lineset->name);
 				controller->InsertStyleModule(layer_count, lineset->name, buffer);
 				controller->toggleLayer(layer_count, true);
 				MEM_freeN(buffer);
@@ -445,7 +445,7 @@ static void prepare(Render *re, SceneRenderLayer *srl)
 	}
 
 	// set diffuse and z depth passes
-	RenderLayer *rl = RE_GetRenderLayer(re->result, srl->name);
+	RenderLayer *rl = RE_GetRenderLayer(re->result, scene_layer->name);
 	bool diffuse = false, z = false;
 	for (RenderPass *rpass = (RenderPass *)rl->passes.first; rpass; rpass = rpass->next) {
 		if (STREQ(rpass->name, RE_PASSNAME_DIFFUSE)) {
@@ -473,7 +473,7 @@ static void prepare(Render *re, SceneRenderLayer *srl)
 	controller->ComputeViewMap();
 }
 
-void FRS_composite_result(Render *re, SceneRenderLayer *srl, Render *freestyle_render)
+void FRS_composite_result(Render *re, SceneLayer *scene_layer, Render *freestyle_render)
 {
 	RenderLayer *rl;
 	float *src, *dest, *pixSrc, *pixDest;
@@ -503,7 +503,7 @@ void FRS_composite_result(Render *re, SceneRenderLayer *srl, Render *freestyle_r
 	}
 #endif
 
-	rl = RE_GetRenderLayer(re->result, srl->name);
+	rl = RE_GetRenderLayer(re->result, scene_layer->name);
 	if (!rl) {
 		if (G.debug & G_DEBUG_FREESTYLE) {
 			cout << "No destination render layer to composite to" << endl;
@@ -536,13 +536,13 @@ void FRS_composite_result(Render *re, SceneRenderLayer *srl, Render *freestyle_r
 	}
 }
 
-static int displayed_layer_count(SceneRenderLayer *srl)
+static int displayed_layer_count(SceneLayer *scene_layer)
 {
 	int count = 0;
 
-	switch (srl->freestyleConfig.mode) {
+	switch (scene_layer->freestyle_config.mode) {
 	case FREESTYLE_CONTROL_SCRIPT_MODE:
-		for (FreestyleModuleConfig *module = (FreestyleModuleConfig *)srl->freestyleConfig.modules.first;
+		for (FreestyleModuleConfig *module = (FreestyleModuleConfig *)scene_layer->freestyle_config.modules.first;
 		     module;
 		     module = module->next)
 		{
@@ -551,7 +551,7 @@ static int displayed_layer_count(SceneRenderLayer *srl)
 		}
 		break;
 	case FREESTYLE_CONTROL_EDITOR_MODE:
-		for (FreestyleLineSet *lineset = (FreestyleLineSet *)srl->freestyleConfig.linesets.first;
+		for (FreestyleLineSet *lineset = (FreestyleLineSet *)scene_layer->freestyle_config.linesets.first;
 		     lineset;
 		     lineset = lineset->next)
 		{
@@ -563,9 +563,11 @@ static int displayed_layer_count(SceneRenderLayer *srl)
 	return count;
 }
 
-int FRS_is_freestyle_enabled(SceneRenderLayer *srl)
+int FRS_is_freestyle_enabled(SceneLayer *scene_layer)
 {
-	return (!(srl->layflag & SCE_LAY_DISABLE) && srl->layflag & SCE_LAY_FRS && displayed_layer_count(srl) > 0);
+	return ((scene_layer->flag & SCENE_LAYER_RENDER) &&
+	        (scene_layer->flag & SCENE_LAYER_FREESTYLE) &&
+	        displayed_layer_count(scene_layer) > 0);
 }
 
 void FRS_init_stroke_renderer(Render *re)
@@ -587,7 +589,7 @@ void FRS_begin_stroke_rendering(Render *re)
 	init_camera(re);
 }
 
-Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl, int render)
+Render *FRS_do_stroke_rendering(Render *re, SceneLayer *scene_layer, int render)
 {
 	Render *freestyle_render = NULL;
 
@@ -596,12 +598,12 @@ Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl, int render)
 
 	RenderMonitor monitor(re);
 	controller->setRenderMonitor(&monitor);
-	controller->setViewMapCache((srl->freestyleConfig.flags & FREESTYLE_VIEW_MAP_CACHE) ? true : false);
+	controller->setViewMapCache((scene_layer->freestyle_config.flags & FREESTYLE_VIEW_MAP_CACHE) ? true : false);
 
 	if (G.debug & G_DEBUG_FREESTYLE) {
 		cout << endl;
 		cout << "----------------------------------------------------------" << endl;
-		cout << "|  " << (re->scene->id.name + 2) << "|" << srl->name << endl;
+		cout << "|  " << (re->scene->id.name + 2) << "|" << scene_layer->name << endl;
 		cout << "----------------------------------------------------------" << endl;
 	}
 
@@ -610,7 +612,7 @@ Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl, int render)
 	//   - add style modules
 	//   - set parameters
 	//   - compute view map
-	prepare(re, srl);
+	prepare(re, scene_layer);
 
 	if (re->test_break(re->tbh)) {
 		controller->CloseFile();
@@ -635,7 +637,7 @@ Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl, int render)
 
 			// composite result
 			if (freestyle_render) {
-				FRS_composite_result(re, srl, freestyle_render);
+				FRS_composite_result(re, scene_layer, freestyle_render);
 				RE_FreeRenderResult(freestyle_render->result);
 				freestyle_render->result = NULL;
 			}
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)