diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 10:38:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 10:38:07 +0400 |
| commit | ab4a2aaf4a4b2b4e416aa1f113b30362cbe0dec3 (patch) | |
| tree | 81af4c18519181490074508dbe9a8d515eab634f /source/blender/nodes/composite/nodes/node_composite_mixrgb.c | |
| parent | 5a90ea77bc1333efe4e1e54984a080550ed3f707 (diff) | |
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
Diffstat (limited to 'source/blender/nodes/composite/nodes/node_composite_mixrgb.c')
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_mixrgb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_mixrgb.c b/source/blender/nodes/composite/nodes/node_composite_mixrgb.c index 0296fa417d6..6539e81beec 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mixrgb.c +++ b/source/blender/nodes/composite/nodes/node_composite_mixrgb.c @@ -48,7 +48,7 @@ static void do_mix_rgb(bNode *node, float *out, float *in1, float *in2, float *f float col[3]; copy_v3_v3(col, in1); - if(node->custom2) + if (node->custom2) ramp_blend(node->custom1, col, in2[3]*fac[0], in2); else ramp_blend(node->custom1, col, fac[0], in2); @@ -62,10 +62,10 @@ static void node_composit_exec_mix_rgb(void *data, bNode *node, bNodeStack **in, /* stack order out: Image */ float *fac= in[0]->vec; - if(out[0]->hasoutput==0) return; + if (out[0]->hasoutput==0) return; /* input no image? then only color operation */ - if(in[1]->data==NULL && in[2]->data==NULL) { + if (in[1]->data==NULL && in[2]->data==NULL) { do_mix_rgb(node, out[0]->vec, in[1]->vec, in[2]->vec, fac); } else { |