[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10825] trunk/blender/source/blender/nodes /intern/CMP_nodes/CMP_invert.c: Fix for invert comp node, was allocating a compbuf unnecessarily.

[Matt Ebb]

Revision: 10825
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10825
Author:   broken
Date:     2007-05-31 09:33:18 +0200 (Thu, 31 May 2007)

Log Message:
-----------
Fix for invert comp node, was allocating a compbuf unnecessarily.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_invert.c

Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_invert.c	2007-05-31 06:55:02 UTC (rev 10824)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_invert.c	2007-05-31 07:33:18 UTC (rev 10825)
@@ -90,19 +90,22 @@
 	else {
 		/* make output size of first available input image, or then size of fac */
 		CompBuf *cbuf= in[1]->data?in[1]->data:in[0]->data;
-		CompBuf *stackbuf= alloc_compbuf(cbuf->x, cbuf->y, CB_RGBA, 1); /* allocs */
-		
+
 		/* if neither RGB or A toggled on, pass through */
-		if (node->custom1 == 0) {
-			out[0]->data = pass_on_compbuf(cbuf);
-			return;
+		if (node->custom1 != 0) {
+			CompBuf *stackbuf= alloc_compbuf(cbuf->x, cbuf->y, CB_RGBA, 1); /* allocs */
+			
+			if (fac[0] < 1.0f || in[0]->data!=NULL)
+				composit2_pixel_processor(node, stackbuf, in[1]->data, in[1]->vec, in[0]->data, fac, do_invert_fac, CB_RGBA, CB_VAL);
+			else
+				composit1_pixel_processor(node, stackbuf, in[1]->data, in[1]->vec, do_invert, CB_RGBA);
+			out[0]->data= stackbuf;
+			return;
+			
+		} else {
+			out[0]->data = pass_on_compbuf(cbuf);
+			return;
 		}
-
-		if (fac[0] < 1.0f || in[0]->data!=NULL)
-			composit2_pixel_processor(node, stackbuf, in[1]->data, in[1]->vec, in[0]->data, fac, do_invert_fac, CB_RGBA, CB_VAL);
-		else
-			composit1_pixel_processor(node, stackbuf, in[1]->data, in[1]->vec, do_invert, CB_RGBA);
-		out[0]->data= stackbuf;
 	}
 }