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/texture/nodes/node_texture_bricks.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/texture/nodes/node_texture_bricks.c')
| -rw-r--r-- | source/blender/nodes/texture/nodes/node_texture_bricks.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/nodes/texture/nodes/node_texture_bricks.c b/source/blender/nodes/texture/nodes/node_texture_bricks.c index 9e76309bce9..ac8799762bd 100644 --- a/source/blender/nodes/texture/nodes/node_texture_bricks.c +++ b/source/blender/nodes/texture/nodes/node_texture_bricks.c @@ -91,7 +91,7 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor rownum = (int)floor(y / row_height); - if( node->custom1 && node->custom2 ) { + if ( node->custom1 && node->custom2 ) { brick_width *= ((int)(rownum) % node->custom2 ) ? 1.0f : node->custom4; /* squash */ offset = ((int)(rownum) % node->custom1 ) ? 0 : (brick_width*node->custom3); /* offset */ } @@ -104,11 +104,12 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor tint = noise((rownum << 16) + (bricknum & 0xFFFF)) + bias; CLAMP(tint,0.0f,1.0f); - if( ins_x < mortar_thickness || ins_y < mortar_thickness || + if ( ins_x < mortar_thickness || ins_y < mortar_thickness || ins_x > (brick_width - mortar_thickness) || ins_y > (row_height - mortar_thickness) ) { copy_v4_v4( out, mortar ); - } else { + } + else { copy_v4_v4( out, bricks1 ); ramp_blend( MA_RAMP_BLEND, out, tint, bricks2 ); } |