From 29ae98f501fc5bd1bcabba735bb42009b7e3013c Mon Sep 17 00:00:00 2001 From: Robert Holcomb Date: Sun, 14 Jan 2007 00:05:06 +0000 Subject: [PATCH] fixed typo in node name (I need to learn to spell). Also added check in matte nodes to see if ouput is connected for the generated matte before creating it. --- source/blender/blenkernel/intern/node_composite.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/source/blender/blenkernel/intern/node_composite.c b/source/blender/blenkernel/intern/node_composite.c index 2463a3b34d1..80cc63a0f0a 100644 --- a/source/blender/blenkernel/intern/node_composite.c +++ b/source/blender/blenkernel/intern/node_composite.c @@ -4547,7 +4547,8 @@ static void node_composit_exec_diff_matte(void *data, bNode *node, bNodeStack ** free_compbuf(colorbuf); out[0]->data=outbuf; - out[1]->data=valbuf_from_rgbabuf(outbuf, CHAN_A); + if(out[1]->hasoutput) + out[1]->data=valbuf_from_rgbabuf(outbuf, CHAN_A); generate_preview(node, outbuf); } @@ -4904,7 +4905,8 @@ static void node_composit_exec_channel_matte(void *data, bNode *node, bNodeStack generate_preview(node, outbuf); out[0]->data=outbuf; - out[1]->data=valbuf_from_rgbabuf(outbuf, CHAN_A); + if(out[1]->hasoutput) + out[1]->data=valbuf_from_rgbabuf(outbuf, CHAN_A); } else { @@ -4984,7 +4986,8 @@ static void node_composit_exec_luma_matte(void *data, bNode *node, bNodeStack ** generate_preview(node, outbuf); out[0]->data=outbuf; - out[1]->data=valbuf_from_rgbabuf(outbuf, CHAN_A); + if (out[1]->hasoutput) + out[1]->data=valbuf_from_rgbabuf(outbuf, CHAN_A); } else { @@ -4994,7 +4997,7 @@ static void node_composit_exec_luma_matte(void *data, bNode *node, bNodeStack ** static bNodeType cmp_node_luma_matte={ /* type code */ CMP_NODE_LUMA_MATTE, - /* name */ "Luminence Key", + /* name */ "Luminance Key", /* width+range */ 200, 80, 250, /* class+opts */ NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS, /* input sock */ cmp_node_luma_matte_in,