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, 104 insertions, 37 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 4dbc93bc20b..5cc58ff5843 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5935,6 +5935,16 @@ static void lib_link_scene(FileData *fd, Main *main)
 			for (SceneLayer *scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) {
 				/* tag scene layer to update for collection tree evaluation */
 				scene_layer->flag |= SCENE_LAYER_ENGINE_DIRTY;
+
+				for (FreestyleModuleConfig *fmc = scene_layer->freestyle_config.modules.first; fmc; fmc = fmc->next) {
+					fmc->script = newlibadr(fd, sce->id.lib, fmc->script);
+				}
+
+				for (FreestyleLineSet *fls = scene_layer->freestyle_config.linesets.first; fls; fls = fls->next) {
+					fls->linestyle = newlibadr_us(fd, sce->id.lib, fls->linestyle);
+					fls->group = newlibadr_us(fd, sce->id.lib, fls->group);
+				}
+
 				for (Base *base = scene_layer->object_bases.first; base; base = base->next) {
 					/* we only bump the use count for the collection objects */
 					base->object = newlibadr(fd, sce->id.lib, base->object);
@@ -6305,11 +6315,7 @@ static void direct_link_scene(FileData *fd, Scene *sce, Main *bmain)
 	for (srl = sce->r.layers.first; srl; srl = srl->next) {
 		srl->prop = newdataadr(fd, srl->prop);
 		IDP_DirectLinkGroup_OrFree(&srl->prop, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
-	}
-	for (srl = sce->r.layers.first; srl; srl = srl->next) {
 		link_list(fd, &(srl->freestyleConfig.modules));
-	}
-	for (srl = sce->r.layers.first; srl; srl = srl->next) {
 		link_list(fd, &(srl->freestyleConfig.linesets));
 	}
 	
@@ -6369,6 +6375,12 @@ static void direct_link_scene(FileData *fd, Scene *sce, Main *bmain)
 			BKE_scene_layer_engine_settings_validate_layer(scene_layer);
 		}
 
+		scene_layer->id_properties = newdataadr(fd, scene_layer->id_properties);
+		IDP_DirectLinkGroup_OrFree(&scene_layer->id_properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
+
+		link_list(fd, &(scene_layer->freestyle_config.modules));
+		link_list(fd, &(scene_layer->freestyle_config.linesets));
+
 		scene_layer->properties_evaluated = NULL;
 
 		BLI_listbase_clear(&scene_layer->drawdata);
@@ -9810,7 +9822,22 @@ static void expand_scene(FileData *fd, Main *mainvar, Scene *sce)
 			expand_doit(fd, mainvar, lineset->linestyle);
 		}
 	}
-	
+
+	for (SceneLayer *scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) {
+		for (module = scene_layer->freestyle_config.modules.first; module; module = module->next) {
+			if (module->script) {
+				expand_doit(fd, mainvar, module->script);
+			}
+		}
+
+		for (lineset = scene_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) {
+			if (lineset->group) {
+				expand_doit(fd, mainvar, lineset->group);
+			}
+			expand_doit(fd, mainvar, lineset->linestyle);
+		}
+	}
+
 	if (sce->r.dometext)
 		expand_doit(fd, mainvar, sce->gm.dome.warptext);
 	
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index fa48abaf61e..b261935c09e 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -51,6 +51,7 @@
 
 #include "BKE_collection.h"
 #include "BKE_customdata.h"
+#include "BKE_freestyle.h"
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
 #include "BKE_main.h"
@@ -324,6 +325,25 @@ void do_versions_after_linking_280(Main *main)
 							            (ID *)srl->mat_override);
 						}
 
+						if (srl->layflag & SCE_LAY_DISABLE) {
+							scene_layer->flag &= ~SCENE_LAYER_RENDER;
+						}
+
+						if ((srl->layflag & SCE_LAY_FRS) == 0) {
+							scene_layer->flag &= ~SCENE_LAYER_FREESTYLE;
+						}
+
+						/* XXX If we are to keep layflag it should be merged with flag (dfelinto). */
+						scene_layer->layflag = srl->layflag;
+						/* XXX Not sure if we should keep the passes (dfelinto). */
+						scene_layer->passflag = srl->passflag;
+						scene_layer->pass_xor = srl->pass_xor;
+						scene_layer->pass_alpha_threshold = srl->pass_alpha_threshold;
+
+						BKE_freestyle_config_free(&scene_layer->freestyle_config);
+						scene_layer->freestyle_config = srl->freestyleConfig;
+						scene_layer->id_properties = srl->prop;
+
 						/* unlink master collection  */
 						BKE_collection_unlink(scene_layer, scene_layer->layer_collections.first);
 
@@ -383,14 +403,22 @@ void do_versions_after_linking_280(Main *main)
 								base->flag |= BASE_SELECTED;
 							}
 						}
-
-						/* TODO: passes, samples, mask_layesr, exclude, ... */
 					}
 
 					if (BLI_findlink(&scene->render_layers, scene->r.actlay)) {
 						scene->active_layer = scene->r.actlay;
 					}
 				}
+				else {
+					for (SceneRenderLayer *srl = scene->r.layers.first; srl; srl = srl->next) {
+						if (srl->prop) {
+							IDP_FreeProperty(srl->prop);
+							MEM_freeN(srl->prop);
+						}
+						BKE_freestyle_config_free(&srl->freestyleConfig);
+					}
+				}
+				BLI_freelistN(&scene->r.layers);
 
 				SceneLayer *scene_layer = BKE_scene_layer_add(scene, "Viewport");
 
@@ -441,8 +469,6 @@ void do_versions_after_linking_280(Main *main)
 					base->lay = base->object->lay;
 				}
 
-				/* TODO: copy scene render data to layer */
-
 				/* Fallback name if only one layer was found in the original file */
 				if (BLI_listbase_count_ex(&sc_master->scene_collections, 2) == 1) {
 					BKE_collection_rename(scene, sc_master->scene_collections.first, "Default Collection");
@@ -697,4 +723,19 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 	}
+
+	{
+		if (!DNA_struct_elem_find(fd->filesdna, "SceneLayer", "FreestyleConfig", "freestyle_config")) {
+			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+				SceneLayer *scene_layer;
+				for (scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) {
+					scene_layer->flag |= SCENE_LAYER_FREESTYLE;
+					scene_layer->layflag = 0x7FFF;   /* solid ztra halo edge strand */
+					scene_layer->passflag = SCE_PASS_COMBINED | SCE_PASS_Z;
+					scene_layer->pass_alpha_threshold = 0.5f;
+					BKE_freestyle_config_init(&scene_layer->freestyle_config);
+				}
+			}
+		}
+	}
 }
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 925a87cb653..910a3c28286 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -127,9 +127,9 @@ void BLO_update_defaults_startup_blend(Main *bmain)
 		scene->r.im_format.planes = R_IMF_PLANES_RGBA;
 		scene->r.im_format.compress = 15;
 
-		for (SceneRenderLayer *srl = scene->r.layers.first; srl; srl = srl->next) {
-			srl->freestyleConfig.sphere_radius = 0.1f;
-			srl->pass_alpha_threshold = 0.5f;
+		for (SceneLayer *scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) {
+			scene_layer->freestyle_config.sphere_radius = 0.1f;
+			scene_layer->pass_alpha_threshold = 0.5f;
 		}
 
 		if (scene->toolsettings) {
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index 44b8ec780e8..79ae203df09 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -2145,18 +2145,16 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
 			if (sce->r.yparts < 2)
 				sce->r.yparts = 4;
 
-			/* adds default layer */
-			if (BLI_listbase_is_empty(&sce->r.layers)) {
-				BKE_scene_add_render_layer(sce, NULL);
-			}
-			else {
-				SceneRenderLayer *srl;
-				/* new layer flag for sky, was default for solid */
-				for (srl = sce->r.layers.first; srl; srl = srl->next) {
-					if (srl->layflag & SCE_LAY_SOLID)
-						srl->layflag |= SCE_LAY_SKY;
-					srl->passflag &= (SCE_PASS_COMBINED|SCE_PASS_Z|SCE_PASS_NORMAL|SCE_PASS_VECTOR);
-				}
+			/* We don't add default layer since blender2.8 because the layers
+			 * are now in Scene->render_layers and a default layer is created in
+			 * the doversion later on.
+			 */
+			SceneRenderLayer *srl;
+			/* new layer flag for sky, was default for solid */
+			for (srl = sce->r.layers.first; srl; srl = srl->next) {
+				if (srl->layflag & SCE_LAY_SOLID)
+					srl->layflag |= SCE_LAY_SKY;
+				srl->passflag &= (SCE_PASS_COMBINED|SCE_PASS_Z|SCE_PASS_NORMAL|SCE_PASS_VECTOR);
 			}
 
 			/* node version changes */
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 8751b580413..172c5384f15 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2748,19 +2748,6 @@ static void write_scene(WriteData *wd, Scene *sce)
 		writestruct(wd, DATA, TimeMarker, 1, marker);
 	}
 
-	for (SceneRenderLayer *srl = sce->r.layers.first; srl; srl = srl->next) {
-		writestruct(wd, DATA, SceneRenderLayer, 1, srl);
-		if (srl->prop) {
-			IDP_WriteProperty(srl->prop, wd);
-		}
-		for (FreestyleModuleConfig *fmc = srl->freestyleConfig.modules.first; fmc; fmc = fmc->next) {
-			writestruct(wd, DATA, FreestyleModuleConfig, 1, fmc);
-		}
-		for (FreestyleLineSet *fls = srl->freestyleConfig.linesets.first; fls; fls = fls->next) {
-			writestruct(wd, DATA, FreestyleLineSet, 1, fls);
-		}
-	}
-
 	/* writing MultiView to the blend file */
 	for (SceneRenderView *srv = sce->r.views.first; srv; srv = srv->next) {
 		writestruct(wd, DATA, SceneRenderView, 1, srv);
@@ -2787,9 +2774,23 @@ static void write_scene(WriteData *wd, Scene *sce)
 	for (SceneLayer *scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) {
 		writestruct(wd, DATA, SceneLayer, 1, scene_layer);
 		writelist(wd, DATA, Base, &scene_layer->object_bases);
+
 		if (scene_layer->properties) {
 			IDP_WriteProperty(scene_layer->properties, wd);
 		}
+
+		if (scene_layer->id_properties) {
+			IDP_WriteProperty(scene_layer->id_properties, wd);
+		}
+
+		for (FreestyleModuleConfig *fmc = scene_layer->freestyle_config.modules.first; fmc; fmc = fmc->next) {
+			writestruct(wd, DATA, FreestyleModuleConfig, 1, fmc);
+		}
+
+		for (FreestyleLineSet *fls = scene_layer->freestyle_config.linesets.first; fls; fls = fls->next) {
+			writestruct(wd, DATA, FreestyleLineSet, 1, fls);
+		}
+
 		write_layer_collections(wd, &scene_layer->layer_collections);
 	}