kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Format corrections.

Browse Source
This commit is contained in:
Robert Holcomb 2007-01-09 04:32:39 +00:00
parent 3b15461a4a
commit cc359a6fd5
3 changed files with 173 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/node_composite.c
View File

@ -4825,7 +4825,7 @@ static void do_channel_matte(bNode *node, float *out, float *in)
break;
}
//flip because 0.0 is transparent, not 1.0
/*flip because 0.0 is transparent, not 1.0*/
alpha=1-alpha;
//test range

21
source/blender/src/drawnode.c
View File

@ -1345,17 +1345,13 @@ static int node_composit_buts_channel_matte(uiBlock *block, bNodeTree *ntree, bN
/*color space selectors*/
uiBlockBeginAlign(block);
uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"RGB",
butr->xmin,butr->ymin+60,sx,20,
&node->custom1,1,1, 0, 0, "RGB Color Space");
butr->xmin,butr->ymin+60,sx,20,&node->custom1,1,1, 0, 0, "RGB Color Space");
uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"HSV",
butr->xmin+sx,butr->ymin+60,sx,20,
&node->custom1,1,2, 0, 0, "HSV Color Space");
butr->xmin+sx,butr->ymin+60,sx,20,&node->custom1,1,2, 0, 0, "HSV Color Space");
uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"YUV",
butr->xmin+2*sx,butr->ymin+60,sx,20,
&node->custom1,1,3, 0, 0, "YUV Color Space");
butr->xmin+2*sx,butr->ymin+60,sx,20,&node->custom1,1,3, 0, 0, "YUV Color Space");
uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"YCC",
butr->xmin+3*sx,butr->ymin+60,sx,20,
&node->custom1,1,4, 0, 0, "YCbCr Color Space");
butr->xmin+3*sx,butr->ymin+60,sx,20,&node->custom1,1,4, 0, 0, "YCbCr Color Space");
if (node->custom1==1) {
c1="R"; c2="G"; c3="B";
@ -1372,14 +1368,11 @@ static int node_composit_buts_channel_matte(uiBlock *block, bNodeTree *ntree, bN
/*channel selector */
uiDefButS(block, ROW, B_NODE_EXEC+node->nr, c1,
butr->xmin,butr->ymin+40,cx,20,
&node->custom2,1, 1, 0, 0, "Channel 1");
butr->xmin,butr->ymin+40,cx,20,&node->custom2,1, 1, 0, 0, "Channel 1");
uiDefButS(block, ROW, B_NODE_EXEC+node->nr, c2,
butr->xmin+cx,butr->ymin+40,cx,20,
&node->custom2,1, 2, 0, 0, "Channel 2");
butr->xmin+cx,butr->ymin+40,cx,20,&node->custom2,1, 2, 0, 0, "Channel 2");
uiDefButS(block, ROW, B_NODE_EXEC+node->nr, c3,
butr->xmin+cx+cx,butr->ymin+40,cx,20,
&node->custom2, 1, 3, 0, 0, "Channel 3");
butr->xmin+cx+cx,butr->ymin+40,cx,20,&node->custom2, 1, 3, 0, 0, "Channel 3");
/*tolerance sliders */
uiDefButF(block, NUMSLI, B_NODE_EXEC+node->nr, "High ",