SceneRenderLayer > SceneLayer: Convert Lay

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.

7 files changed, 9 insertions, 21 deletions

diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index 2e9ab10f1c0..9d2fbcc6d04 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -108,7 +108,6 @@ typedef struct RenderLayer {
 	
 	/* copy of RenderData */
 	char name[RE_MAXNAME];
-	unsigned int lay;
 	int layflag, passflag, pass_xor;
 	
 	/* MULTIVIEW_TODO: acolrect and scolrect are not supported by multiview at the moment.
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 6e0251c60cb..8b91b970845 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -4939,16 +4939,9 @@ static void dupli_render_particle_set(Render *re, Object *ob, int timeoffset, in
 		dupli_render_particle_set(re, go->ob, timeoffset, level+1, enable);
 }
 
-static int get_vector_renderlayers(Scene *sce)
+static int get_vector_renderlayers(Scene *UNUSED(sce))
 {
-	SceneRenderLayer *srl;
-	unsigned int lay= 0;
-
-	for (srl= sce->r.layers.first; srl; srl= srl->next)
-		if (srl->passflag & SCE_PASS_VECTOR)
-			lay |= srl->lay;
-
-	return lay;
+	return 0;
 }
 
 static void add_group_render_dupli_obs(Render *re, Group *group, int nolamps, int onlyselected, Object *actob, int timeoffset, int level)
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 080e68d813e..951a66cadeb 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -4143,7 +4143,6 @@ RenderPass *RE_create_gp_pass(RenderResult *rr, const char *layername, const cha
 		rl = MEM_callocN(sizeof(RenderLayer), layername);
 		BLI_addtail(&rr->layers, rl);
 		BLI_strncpy(rl->name, layername, sizeof(rl->name));
-		rl->lay = 0;
 		rl->layflag = SCE_LAY_SOLID;
 		rl->passflag = SCE_PASS_COMBINED;
 		rl->rectx = rr->rectx;
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index d1a434841e4..f5f36b88c1d 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -313,8 +313,6 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
 		BLI_addtail(&rr->layers, rl);
 		
 		BLI_strncpy(rl->name, srl->name, sizeof(rl->name));
-		rl->lay = srl->lay;
-		rl->layflag = srl->layflag;
 		rl->passflag = srl->passflag; /* for debugging: srl->passflag | SCE_PASS_RAYHITS; */
 		rl->pass_xor = srl->pass_xor;
 		rl->rectx = rectx;
@@ -443,7 +441,6 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
 		}
 
 		/* note, this has to be in sync with scene.c */
-		rl->lay = (1 << 20) - 1;
 		rl->layflag = 0x7FFF;    /* solid ztra halo strand */
 		rl->passflag = SCE_PASS_COMBINED;
 		
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 4e8e1b9a5e8..71d233e7d70 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -246,7 +246,7 @@ static void halo_tile(RenderPart *pa, RenderLayer *rl)
 	intptr_t *rd= NULL;
 	int a, *rz, zz, y, sample, totsample, od;
 	short minx, maxx, miny, maxy, x;
-	unsigned int lay= rl->lay;
+	unsigned int lay= (1 << 20) - 1;
 
 	/* we don't render halos in the cropped area, gives errors in flare counter */
 	if (pa->crop) {
@@ -1651,7 +1651,7 @@ void zbufshade_sss_tile(RenderPart *pa)
 	ssamp.tot= 1;
 	
 	for (rl=rr->layers.first; rl; rl=rl->next) {
-		ssamp.shi[0].lay |= rl->lay;
+		ssamp.shi[0].lay |= (1 << 20) - 1;
 		ssamp.shi[0].layflag |= rl->layflag;
 		ssamp.shi[0].passflag |= rl->passflag;
 		ssamp.shi[0].combinedflag |= ~rl->pass_xor;
@@ -1976,7 +1976,7 @@ void add_halo_flare(Render *re)
 		for (a=0; a<R.tothalo; a++) {
 			har= R.sortedhalos[a];
 			
-			if (har->flarec && (har->lay & rl->lay)) {
+			if (har->flarec && (har->lay & ((1 << 20) - 1))) {
 				do_draw = true;
 				renderflare(rr, rect, har);
 			}
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c
index 067e7861b51..6cad37c3e78 100644
--- a/source/blender/render/intern/source/shadeinput.c
+++ b/source/blender/render/intern/source/shadeinput.c
@@ -1300,7 +1300,7 @@ void shade_input_initialize(ShadeInput *shi, RenderPart *pa, RenderLayer *rl, in
 	shi->do_manage = BKE_scene_check_color_management_enabled(R.scene);
 	shi->use_world_space_shading = BKE_scene_use_world_space_shading(R.scene);
 
-	shi->lay = rl->lay;
+	shi->lay = (1 << 20) - 1;
 	shi->layflag = rl->layflag;
 	shi->passflag = rl->passflag;
 	shi->combinedflag = ~rl->pass_xor;
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index 55f2335f9e8..f39936dc01f 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -2066,7 +2066,7 @@ void zbuffer_solid(RenderPart *pa, RenderLayer *rl, void(*fillfunc)(RenderPart *
 	ObjectRen *obr;
 	float obwinmat[4][4], winmat[4][4], bounds[4];
 	float ho1[4], ho2[4], ho3[4], ho4[4]={0};
-	unsigned int lay= rl->lay, lay_zmask= 0;
+	unsigned int lay= (1 << 20) - 1, lay_zmask= 0;
 	int i, v, zvlnr, zsample, samples, c1, c2, c3, c4=0;
 	short nofill=0, env=0, wire=0, zmaskpass=0;
 	const bool all_z = (rl->layflag & SCE_LAY_ALL_Z) && !(rl->layflag & SCE_LAY_ZMASK);
@@ -3450,9 +3450,9 @@ static int zbuffer_abuf_render(RenderPart *pa, APixstr *APixbuf, APixstrand *APi
 	zbuf_make_winmat(&R, winmat);
 
 	if (rl->layflag & SCE_LAY_ZTRA)
-		doztra+= zbuffer_abuf(&R, pa, APixbuf, apsmbase, rl->lay, negzmask, winmat, R.winx, R.winy, samples, jit, R.clipcrop, 0);
+		doztra+= zbuffer_abuf(&R, pa, APixbuf, apsmbase, (1 << 20) - 1, negzmask, winmat, R.winx, R.winy, samples, jit, R.clipcrop, 0);
 	if ((rl->layflag & SCE_LAY_STRAND) && APixbufstrand)
-		doztra+= zbuffer_strands_abuf(&R, pa, APixbufstrand, apsmbase, rl->lay, negzmask, winmat, R.winx, R.winy, samples, jit, R.clipcrop, 0, sscache);
+		doztra+= zbuffer_strands_abuf(&R, pa, APixbufstrand, apsmbase, (1 << 20) - 1, negzmask, winmat, R.winx, R.winy, samples, jit, R.clipcrop, 0, sscache);
 
 	return doztra;
 }