style cleanup: function calls & whitespace.

5 files changed, 13 insertions, 12 deletions

diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c
index 362ed59a38e..13882d631d8 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -130,7 +130,7 @@ bNode *node_group_make_from_selected(bNodeTree *ntree)
 			/* no groups in groups */
 			if (node->type==NODE_GROUP)
 				return NULL;
-			DO_MINMAX2( (&node->locx), min, max);
+			DO_MINMAX2((&node->locx), min, max);
 			totnode++;
 		}
 		node->done= 0;
diff --git a/source/blender/nodes/shader/nodes/node_shader_vectMath.c b/source/blender/nodes/shader/nodes/node_shader_vectMath.c
index a0fe67d591d..73b0582490d 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vectMath.c
+++ b/source/blender/nodes/shader/nodes/node_shader_vectMath.c
@@ -73,7 +73,7 @@ static void node_shader_exec_vect_math(void *UNUSED(data), bNode *node, bNodeSta
 		out[0]->vec[1]= vec1[1] + vec2[1];
 		out[0]->vec[2]= vec1[2] + vec2[2];
 		
-		out[1]->vec[0] = normalize_v3( out[0]->vec );
+		out[1]->vec[0] = normalize_v3(out[0]->vec );
 	}
 	else if (node->custom1 == 3) {	/* Dot product */
 		out[1]->vec[0]= (vec1[0] * vec2[0]) + (vec1[1] * vec2[1]) + (vec1[2] * vec2[2]);
@@ -83,7 +83,7 @@ static void node_shader_exec_vect_math(void *UNUSED(data), bNode *node, bNodeSta
 		out[0]->vec[1]= (vec1[2] * vec2[0]) - (vec1[0] * vec2[2]);
 		out[0]->vec[2]= (vec1[0] * vec2[1]) - (vec1[1] * vec2[0]);
 		
-		out[1]->vec[0] = normalize_v3( out[0]->vec );
+		out[1]->vec[0] = normalize_v3(out[0]->vec );
 	}
 	else if (node->custom1 == 5) {	/* Normalize */
 		if (in[0]->hasinput || !in[1]->hasinput) {	/* This one only takes one input, so we've got to choose. */
@@ -97,7 +97,7 @@ static void node_shader_exec_vect_math(void *UNUSED(data), bNode *node, bNodeSta
 			out[0]->vec[2]= vec2[2];
 		}
 		
-		out[1]->vec[0] = normalize_v3( out[0]->vec );
+		out[1]->vec[0] = normalize_v3(out[0]->vec );
 	}
 	
 }
diff --git a/source/blender/nodes/texture/nodes/node_texture_bricks.c b/source/blender/nodes/texture/nodes/node_texture_bricks.c
index 8ef531c6316..fbf04715020 100644
--- a/source/blender/nodes/texture/nodes/node_texture_bricks.c
+++ b/source/blender/nodes/texture/nodes/node_texture_bricks.c
@@ -104,14 +104,15 @@ 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 ||
-		ins_x > (brick_width - mortar_thickness) ||
-		ins_y > (row_height - mortar_thickness) ) {
-		copy_v4_v4( out, mortar );
+	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 {
-		copy_v4_v4( out, bricks1 );
-		ramp_blend( MA_RAMP_BLEND, out, tint, bricks2 );
+		copy_v4_v4(out, bricks1);
+		ramp_blend(MA_RAMP_BLEND, out, tint, bricks2);
 	}
 }
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_image.c b/source/blender/nodes/texture/nodes/node_texture_image.c
index d0bc30089e2..38d6db1fd08 100644
--- a/source/blender/nodes/texture/nodes/node_texture_image.c
+++ b/source/blender/nodes/texture/nodes/node_texture_image.c
@@ -76,7 +76,7 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **UNUSED(i
 			while ( py >= ibuf->y ) py -= ibuf->y;
 			
 			result = ibuf->rect_float + py*ibuf->x*4 + px*4;
-			copy_v4_v4( out, result );
+			copy_v4_v4(out, result);
 		}
 	}
 }
diff --git a/source/blender/nodes/texture/nodes/node_texture_texture.c b/source/blender/nodes/texture/nodes/node_texture_texture.c
index 201d75c0cad..ecf47a900f9 100644
--- a/source/blender/nodes/texture/nodes/node_texture_texture.c
+++ b/source/blender/nodes/texture/nodes/node_texture_texture.c
@@ -65,7 +65,7 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor
 	
 	if (node->custom2 || node->need_exec==0) {
 		/* this node refers to its own texture tree! */
-		copy_v4_v4(out, (fabs(co[0] - co[1]) < .01) ? white : red );
+		copy_v4_v4(out, (fabs(co[0] - co[1]) < .01) ? white : red);
 	}
 	else if (nodetex) {
 		TexResult texres;