1 files changed, 3 insertions, 184 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_zcombine.c b/source/blender/nodes/composite/nodes/node_composite_zcombine.c
index 8e639aaa357..6e5f38e1fab 100644
--- a/source/blender/nodes/composite/nodes/node_composite_zcombine.c
+++ b/source/blender/nodes/composite/nodes/node_composite_zcombine.c
@@ -48,193 +48,12 @@ static bNodeSocketTemplate cmp_node_zcombine_out[] = {
 	{	-1, 0, ""	}
 };
 
-#ifdef WITH_COMPOSITOR_LEGACY
-
-static void do_zcombine(bNode *node, float *out, float *src1, float *z1, float *src2, float *z2)
-{
-	float alpha;
-	float malpha;
-	
-	if (*z1 <= *z2) {
-		if (node->custom1) {
-			// use alpha in combine operation
-			alpha= src1[3];
-			malpha= 1.0f - alpha;
-			out[0] = malpha*src2[0] + alpha*src1[0];
-			out[1] = malpha*src2[1] + alpha*src1[1];
-			out[2] = malpha*src2[2] + alpha*src1[2];
-			out[3] = malpha*src2[3] + alpha*src1[3];
-		}
-		else {
-			// do combination based solely on z value
-			copy_v4_v4(out, src1);
-		}
-	}
-	else {
-		if (node->custom1) {
-			// use alpha in combine operation
-			alpha= src2[3];
-			malpha= 1.0f - alpha;
-			out[0] = malpha*src1[0] + alpha*src2[0];
-			out[1] = malpha*src1[1] + alpha*src2[1];
-			out[2] = malpha*src1[2] + alpha*src2[2];
-			out[3] = malpha*src1[3] + alpha*src2[3];
-		}
-		else {
-			// do combination based solely on z value
-			copy_v4_v4(out, src1);
-		}
-		
-		if (node->custom2)
-			*z1= *z2;
-	}
-}
-
-static void do_zcombine_mask(bNode *node, float *out, float *z1, float *z2)
-{
-	if (*z1 > *z2) {
-		*out= 1.0f;
-		if (node->custom2)
-			*z1= *z2;
-	}
-}
-
-static void do_zcombine_add(bNode *node, float *out, float *col1, float *col2, float *acol)
-{
-	float alpha;
-	float malpha;
-
-	if (node->custom1) {
-		// use alpha in combine operation, antialiased mask in used here just as hint for the z value
-		if (*acol>0.0f) {
-			alpha= col2[3];
-			malpha= 1.0f - alpha;
-		
-		
-			out[0] = malpha*col1[0] + alpha*col2[0];
-			out[1] = malpha*col1[1] + alpha*col2[1];
-			out[2] = malpha*col1[2] + alpha*col2[2];
-			out[3] = malpha*col1[3] + alpha*col2[3];
-		}
-		else {
-			alpha= col1[3];
-			malpha= 1.0f - alpha;
-		
-		
-			out[0] = malpha*col2[0] + alpha*col1[0];
-			out[1] = malpha*col2[1] + alpha*col1[1];
-			out[2] = malpha*col2[2] + alpha*col1[2];
-			out[3] = malpha*col2[3] + alpha*col1[3];
-		}
-	}
-	else {
-		// do combination based solely on z value but with antialiased mask
-		alpha = *acol;
-		malpha= 1.0f - alpha;
-		
-		out[0] = malpha*col1[0] + alpha*col2[0];
-		out[1] = malpha*col1[1] + alpha*col2[1];
-		out[2] = malpha*col1[2] + alpha*col2[2];
-		out[3] = malpha*col1[3] + alpha*col2[3];
-	}
-}
-
-static void node_composit_exec_zcombine(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
-{
-	RenderData *rd= data;
-	CompBuf *cbuf= in[0]->data;
-	CompBuf *zbuf;
-
-	/* stack order in: col z col z */
-	/* stack order out: col z */
-	if (out[0]->hasoutput==0 && out[1]->hasoutput==0) 
-		return;
-	
-	/* no input image; do nothing now */
-	if (in[0]->data==NULL) {
-		return;
-	}
-	
-	if (out[1]->hasoutput) {
-		/* copy or make a buffer for for the first z value, here we write result in */
-		if (in[1]->data)
-			zbuf= dupalloc_compbuf(in[1]->data);
-		else {
-			float *zval;
-			int tot= cbuf->x*cbuf->y;
-			
-			zbuf= alloc_compbuf(cbuf->x, cbuf->y, CB_VAL, 1);
-			for (zval= zbuf->rect; tot; tot--, zval++)
-				*zval= in[1]->vec[0];
-		}
-		/* lazy coder hack */
-		node->custom2= 1;
-		out[1]->data= zbuf;
-	}
-	else {
-		node->custom2= 0;
-		zbuf= in[1]->data;
-	}
-	
-	if (rd->scemode & R_FULL_SAMPLE) {
-		/* make output size of first input image */
-		CompBuf *stackbuf= alloc_compbuf(cbuf->x, cbuf->y, CB_RGBA, 1); // allocs
-		
-		composit4_pixel_processor(node, stackbuf, in[0]->data, in[0]->vec, zbuf, in[1]->vec, in[2]->data, in[2]->vec, 
-								  in[3]->data, in[3]->vec, do_zcombine, CB_RGBA, CB_VAL, CB_RGBA, CB_VAL);
-		
-		out[0]->data= stackbuf;
-	}
-	else {
-		/* make output size of first input image */
-		CompBuf *stackbuf= alloc_compbuf(cbuf->x, cbuf->y, CB_RGBA, 1); /* allocs */
-		CompBuf *mbuf;
-		float *fp;
-		int x;
-		char *aabuf;
-		
-		
-		/* make a mask based on comparison, optionally write zvalue */
-		mbuf= alloc_compbuf(cbuf->x, cbuf->y, CB_VAL, 1);
-		composit2_pixel_processor(node, mbuf, zbuf, in[1]->vec, in[3]->data, in[3]->vec, do_zcombine_mask, CB_VAL, CB_VAL);
-		
-		/* convert to char */
-		aabuf= MEM_mallocN(cbuf->x*cbuf->y, "aa buf");
-		fp= mbuf->rect;
-		for (x= cbuf->x*cbuf->y-1; x>=0; x--)
-			if (fp[x]==0.0f) aabuf[x] = 0;
-			else aabuf[x] = 255;
-		
-		antialias_tagbuf(cbuf->x, cbuf->y, aabuf);
-		
-		/* convert to float */
-		fp= mbuf->rect;
-		for (x= cbuf->x*cbuf->y-1; x>=0; x--)
-			if (aabuf[x]>1)
-				fp[x] = (1.0f/255.0f)*(float)aabuf[x];
-		
-		composit3_pixel_processor(node, stackbuf, in[0]->data, in[0]->vec, in[2]->data, in[2]->vec, mbuf, NULL, 
-								  do_zcombine_add, CB_RGBA, CB_RGBA, CB_VAL);
-		/* free */
-		free_compbuf(mbuf);
-		MEM_freeN(aabuf);
-		
-		out[0]->data= stackbuf;
-	}
-}
-
-#endif  /* WITH_COMPOSITOR_LEGACY */
-
-void register_node_type_cmp_zcombine(bNodeTreeType *ttype)
+void register_node_type_cmp_zcombine(void)
 {
 	static bNodeType ntype;
 
-	node_type_base(ttype, &ntype, CMP_NODE_ZCOMBINE, "Z Combine", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_ZCOMBINE, "Z Combine", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_zcombine_in, cmp_node_zcombine_out);
-	node_type_size(&ntype, 80, 40, 120);
-#ifdef WITH_COMPOSITOR_LEGACY
-	node_type_exec(&ntype, node_composit_exec_zcombine);
-#endif
 
-	nodeRegisterType(ttype, &ntype);
+	nodeRegisterType(&ntype);
 }