archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

converted more mixed tab/space indentations to tabs. only whitespace changes.

Browse Source
This commit is contained in:
Campbell Barton
2011-04-21 15:53:30 +00:00
parent 210ee1ade4
commit f9f771cd01
117 changed files with 1704 additions and 1708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/curve/editcurve.c
View File

@@ -3231,8 +3231,7 @@ static void subdividenurb(Object *obedit, int number_cuts)
MEM_freeN(nu->bp); MEM_freeN(nu->bp);
nu->bp= bpnew; nu->bp= bpnew;
nu->pntsu+= sel; nu->pntsu+= sel;
nurbs_knot_calc_u(nu); /* shift knots nurbs_knot_calc_u(nu); /* shift knots forward */
forward */
} }
} }
} }

2
source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
View File

@@ -124,7 +124,6 @@ static void do_channel_matte(bNode *node, float *out, float *in)
else { else {
out[3]=in[3]; out[3]=in[3];
} }
} }
static void node_composit_exec_channel_matte(void *data, bNode *node, bNodeStack **in, bNodeStack **out) static void node_composit_exec_channel_matte(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
@@ -215,4 +214,3 @@ void register_node_type_cmp_channel_matte(ListBase *lb)
nodeRegisterType(lb, &ntype); nodeRegisterType(lb, &ntype);
} }

2
source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
View File

@@ -78,7 +78,7 @@ static void do_ycca_to_rgba_normalized(bNode *UNUSED(node), float *out, float *i
in[1]=(in[1]*255.0); in[1]=(in[1]*255.0);
in[2]=(in[2]*255.0); in[2]=(in[2]*255.0);
// in[0]=(in[0]*255.0)+16; // in[0]=(in[0]*255.0)+16;
// in[1]=(in[1]*255.0)+128; // in[1]=(in[1]*255.0)+128;
// in[2]=(in[2]*255.0)+128; // in[2]=(in[2]*255.0)+128;
ycc_to_rgb(in[0],in[1],in[2], &out[0], &out[1], &out[2], BLI_YCC_ITU_BT601); ycc_to_rgb(in[0],in[1],in[2], &out[0], &out[1], &out[2], BLI_YCC_ITU_BT601);

5
source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
View File

@@ -189,9 +189,8 @@ static void do_apply_spillmap_blue(bNode *node, float* out, float *in, float *ma
static void node_composit_exec_color_spill(void *UNUSED(data), bNode *node, bNodeStack **in, bNodeStack **out) static void node_composit_exec_color_spill(void *UNUSED(data), bNode *node, bNodeStack **in, bNodeStack **out)
{ {
/* /* Originally based on the information from the book "The Art and Science of Digital Composition" and
Originally based on the information from the book "The Art and Science of Digital Composition" and * discussions from vfxtalk.com .*/
discussions from vfxtalk.com.*/
CompBuf *cbuf; CompBuf *cbuf;
CompBuf *mask; CompBuf *mask;
CompBuf *rgbbuf; CompBuf *rgbbuf;

6
source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
View File

@@ -55,7 +55,7 @@ static void do_diff_matte(bNode *node, float *outColor, float *inColor1, float *
float difference; float difference;
float alpha; float alpha;
difference=fabs(inColor2[0]-inColor1[0])+ difference= fabs(inColor2[0]-inColor1[0])+
fabs(inColor2[1]-inColor1[1])+ fabs(inColor2[1]-inColor1[1])+
fabs(inColor2[2]-inColor1[2]); fabs(inColor2[2]-inColor1[2]);
@@ -65,11 +65,11 @@ static void do_diff_matte(bNode *node, float *outColor, float *inColor1, float *
VECCOPY(outColor, inColor1); VECCOPY(outColor, inColor1);
/*make 100% transparent*/ /*make 100% transparent*/
if(difference < tolerence){ if(difference < tolerence) {
outColor[3]=0.0; outColor[3]=0.0;
} }
/*in the falloff region, make partially transparent */ /*in the falloff region, make partially transparent */
else if(difference < falloff+tolerence){ else if(difference < falloff+tolerence) {
difference=difference-tolerence; difference=difference-tolerence;
alpha=difference/falloff; alpha=difference/falloff;
/*only change if more transparent than before */ /*only change if more transparent than before */