Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-02 00:08:23 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-02 00:08:23 +0400
commit6327c9aae18df2f226bd2b3207d51c920dc9a8af (patch)
treee8ab58bd38fab307ba227ce797c2189434f2d13f /source/blender/nodes
parent657e62c9120c70beff8241c347b6a547402beb5c (diff)
style cleanup: whitespace, braces
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_diffMatte.c24
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_distanceMatte.c34
2 files changed, 29 insertions, 29 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_diffMatte.c b/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
index dd09bc5d0d4..c7fbcb46c23 100644
--- a/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
@@ -34,15 +34,15 @@
/* ******************* channel Difference Matte ********************************* */
static bNodeSocketTemplate cmp_node_diff_matte_in[]={
- {SOCK_RGBA,1,"Image 1", 1.0f, 1.0f, 1.0f, 1.0f},
- {SOCK_RGBA,1,"Image 2", 1.0f, 1.0f, 1.0f, 1.0f},
- {-1,0,""}
+ {SOCK_RGBA, 1, "Image 1", 1.0f, 1.0f, 1.0f, 1.0f},
+ {SOCK_RGBA, 1, "Image 2", 1.0f, 1.0f, 1.0f, 1.0f},
+ {-1, 0, ""}
};
static bNodeSocketTemplate cmp_node_diff_matte_out[]={
- {SOCK_RGBA,0,"Image"},
- {SOCK_FLOAT,0,"Matte"},
- {-1,0,""}
+ {SOCK_RGBA, 0, "Image"},
+ {SOCK_FLOAT, 0, "Matte"},
+ {-1, 0, ""}
};
static void do_diff_matte(bNode *node, float *outColor, float *inColor1, float *inColor2)
@@ -65,10 +65,10 @@ static void do_diff_matte(bNode *node, float *outColor, float *inColor1, float *
copy_v3_v3(outColor, inColor1);
if (difference <= tolerence) {
- if(difference<=falloff) {
- alpha=0.0f;
+ if (difference <= falloff) {
+ alpha = 0.0f;
}
- else{
+ else {
/* alpha as percent (distance / tolerance), each modified by falloff amount (in pixels)*/
alpha=(difference-falloff)/(tolerence-falloff);
}
@@ -77,9 +77,9 @@ static void do_diff_matte(bNode *node, float *outColor, float *inColor1, float *
maxInputAlpha=maxf(inColor1[3], inColor2[3]);
if (alpha < maxInputAlpha) {
/*clamp*/
- if(alpha<0.0f) alpha=0.0f;
- if(alpha>1.0f) alpha=1.0f;
- outColor[3]=alpha;
+ if (alpha < 0.0f) alpha = 0.0f;
+ if (alpha > 1.0f) alpha = 1.0f;
+ outColor[3] = alpha;
}
else { /* leave as before */
outColor[3]=maxInputAlpha;
diff --git a/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c b/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
index a485210e37e..1976aa45eed 100644
--- a/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
@@ -34,15 +34,15 @@
/* ******************* channel Distance Matte ********************************* */
static bNodeSocketTemplate cmp_node_distance_matte_in[]={
- {SOCK_RGBA,1,"Image", 1.0f, 1.0f, 1.0f, 1.0f},
- {SOCK_RGBA,1,"Key Color", 1.0f, 1.0f, 1.0f, 1.0f},
- {-1,0,""}
+ {SOCK_RGBA, 1, "Image", 1.0f, 1.0f, 1.0f, 1.0f},
+ {SOCK_RGBA, 1, "Key Color", 1.0f, 1.0f, 1.0f, 1.0f},
+ {-1, 0, ""}
};
static bNodeSocketTemplate cmp_node_distance_matte_out[]={
- {SOCK_RGBA,0,"Image"},
- {SOCK_FLOAT,0,"Matte"},
- {-1,0,""}
+ {SOCK_RGBA, 0, "Image"},
+ {SOCK_FLOAT, 0, "Matte"},
+ {-1, 0, ""}
};
/* note, keyvals is passed on from caller as stack array */
@@ -64,10 +64,10 @@ static void do_distance_matte(bNode *node, float *out, float *in)
copy_v3_v3(out, in);
if (distance <= tolerence) {
- if(distance<=falloff) {
- alpha=0.0f;
+ if (distance <= falloff) {
+ alpha = 0.0f;
}
- else{
+ else {
/* alpha as percent (distance / tolerance), each modified by falloff amount (in pixels)*/
alpha=(distance-falloff)/(tolerence-falloff);
}
@@ -75,8 +75,8 @@ static void do_distance_matte(bNode *node, float *out, float *in)
/*only change if more transparent than before */
if (alpha < in[3]) {
/*clamp*/
- if(alpha<0.0f) alpha=0.0f;
- if(alpha>1.0f) alpha=1.0f;
+ if (alpha < 0.0f) alpha = 0.0f;
+ if (alpha > 1.0f) alpha = 1.0f;
out[3]=alpha;
}
else { /* leave as before */
@@ -115,10 +115,10 @@ static void do_chroma_distance_matte(bNode *node, float *out, float *in)
copy_v3_v3(out, in);
if (distance <= tolerence) {
- if(distance<=falloff) {
- alpha=0.0f;
+ if (distance <= falloff) {
+ alpha = 0.0f;
}
- else{
+ else {
/* alpha as percent (distance / tolerance), each modified by falloff amount (in pixels)*/
alpha=(distance-falloff)/(tolerence-falloff);
}
@@ -126,8 +126,8 @@ static void do_chroma_distance_matte(bNode *node, float *out, float *in)
/*only change if more transparent than before */
if (alpha < in[3]) {
/*clamp*/
- if(alpha<0.0f) alpha=0.0f;
- if(alpha>1.0f) alpha=1.0f;
+ if (alpha < 0.0f) alpha = 0.0f;
+ if (alpha > 1.0f) alpha = 1.0f;
out[3]=alpha;
}
else { /* leave as before */
@@ -162,7 +162,7 @@ static void node_composit_exec_distance_matte(void *data, bNode *node, bNodeStac
c->key[2]= in[1]->vec[2];
/* work in RGB color space */
- if(c->channel==1) {
+ if (c->channel == 1) {
/* note, processor gets a keyvals array passed on as buffer constant */
composit1_pixel_processor(node, workbuf, workbuf, in[0]->vec, do_distance_matte, CB_RGBA);
}