style cleanup: changes to brace placement / newlines - for/while/if/switch

14 files changed, 43 insertions, 50 deletions

diff --git a/source/blender/nodes/composite/node_composite_util.c b/source/blender/nodes/composite/node_composite_util.c
index ab3a363e703..8012057b393 100644
--- a/source/blender/nodes/composite/node_composite_util.c
+++ b/source/blender/nodes/composite/node_composite_util.c
@@ -884,8 +884,9 @@ static void FHT2D(fREAL *data, unsigned int Mx, unsigned int My,
 			#define PRED(k) (((k & Nym) << Mx) + (k >> My))
 			for (j=PRED(i); j>i; j=PRED(j));
 			if (j < i) continue;
-			for (k=i, j=PRED(i); j!=i; k=j, j=PRED(j), stm--)
-				{ t=data[j], data[j]=data[k], data[k]=t; }
+			for (k=i, j=PRED(i); j!=i; k=j, j=PRED(j), stm--) {
+				t=data[j], data[j]=data[k], data[k]=t;
+			}
 			#undef PRED
 			stm--;
 		}
@@ -1108,7 +1109,7 @@ void qd_getPixel(CompBuf* src, int x, int y, float* col)
 		float bc[4];
 		src->rect_procedural(src, bc, (float)x/(float)src->xrad, (float)y/(float)src->yrad);
 
-		switch(src->type) {
+		switch (src->type) {
 			/* these fallthrough to get all the channels */
 			case CB_RGBA: col[3]=bc[3]; 
 			case CB_VEC3: col[2]=bc[2];
@@ -1118,7 +1119,7 @@ void qd_getPixel(CompBuf* src, int x, int y, float* col)
 	}
 	else if ((x >= 0) && (x < src->x) && (y >= 0) && (y < src->y)) {
 		float* bc = &src->rect[(x + y*src->x)*src->type];
-		switch(src->type) {
+		switch (src->type) {
 			/* these fallthrough to get all the channels */
 			case CB_RGBA: col[3]=bc[3]; 
 			case CB_VEC3: col[2]=bc[2];
@@ -1127,7 +1128,7 @@ void qd_getPixel(CompBuf* src, int x, int y, float* col)
 		}
 	}
 	else {
-		switch(src->type) {
+		switch (src->type) {
 			/* these fallthrough to get all the channels */
 			case CB_RGBA: col[3]=0.0; 
 			case CB_VEC3: col[2]=0.0; 
@@ -1142,7 +1143,7 @@ void qd_setPixel(CompBuf* src, int x, int y, float* col)
 {
 	if ((x >= 0) && (x < src->x) && (y >= 0) && (y < src->y)) {
 		float* bc = &src->rect[(x + y*src->x)*src->type];
-		switch(src->type) {
+		switch (src->type) {
 			/* these fallthrough to get all the channels */
 			case CB_RGBA: bc[3]=col[3]; 
 			case CB_VEC3: bc[2]=col[2];
diff --git a/source/blender/nodes/composite/nodes/node_composite_channelMatte.c b/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
index 132b1659fa5..b3690b5d20f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
@@ -71,7 +71,7 @@ static void do_channel_matte(bNode *node, float *out, float *in)
 	NodeChroma *c=(NodeChroma *)node->storage;
 	float alpha=0.0;	
 
-	switch(c->algorithm) {
+	switch (c->algorithm) {
 	case 0: { /* Alpha=key_channel-limit channel */
 		int key_channel=node->custom2-1;
 		int limit_channel=c->channel-1;
@@ -79,7 +79,7 @@ static void do_channel_matte(bNode *node, float *out, float *in)
 		break;
 	}
 	case 1: { /* Alpha=G-MAX(R, B) */
-		switch(node->custom2) {
+		switch (node->custom2) {
 			case 1: {
 				alpha=in[0]-MAX2(in[1],in[2]);
 				break;
@@ -139,7 +139,7 @@ static void node_composit_exec_channel_matte(void *data, bNode *node, bNodeStack
 	outbuf=dupalloc_compbuf(cbuf);
 	
 	/*convert to colorspace*/
-	switch(node->custom1) {
+	switch (node->custom1) {
 	case CMP_NODE_CHANNEL_MATTE_CS_RGB:
 		break;
 	case CMP_NODE_CHANNEL_MATTE_CS_HSV: /*HSV*/
@@ -159,7 +159,7 @@ static void node_composit_exec_channel_matte(void *data, bNode *node, bNodeStack
 	composit1_pixel_processor(node, outbuf, outbuf, in[1]->vec, do_channel_matte, CB_RGBA);
 
 	/*convert back to RGB colorspace in place*/
-	switch(node->custom1) {
+	switch (node->custom1) {
 	case CMP_NODE_CHANNEL_MATTE_CS_RGB: /*RGB*/
 		break;
 	case CMP_NODE_CHANNEL_MATTE_CS_HSV: /*HSV*/
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorSpill.c b/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
index 46d7c620aa8..0153a2bce34 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
@@ -206,12 +206,10 @@ static void node_composit_exec_color_spill(void *UNUSED(data), bNode *node, bNod
 	spillmap=alloc_compbuf(cbuf->x, cbuf->y, CB_VAL, 1);
 	rgbbuf=dupalloc_compbuf(cbuf);
 
-	switch(node->custom1)
-	{
+	switch (node->custom1) {
 		case 1:  /*red spill*/
 		{
-			switch(node->custom2)
-			{
+			switch (node->custom2) {
 				case 0: /* simple limit */
 				{
 					if ((in[1]->data==NULL) && (in[1]->vec[0] >= 1.f)) {
@@ -243,8 +241,7 @@ static void node_composit_exec_color_spill(void *UNUSED(data), bNode *node, bNod
 		}
 		case 2: /*green spill*/
 		{
-			switch(node->custom2)
-			{
+			switch (node->custom2) {
 				case 0: /* simple limit */
 				{
 					if ((in[1]->data==NULL) && (in[1]->vec[0] >= 1.f)) {
@@ -276,8 +273,7 @@ static void node_composit_exec_color_spill(void *UNUSED(data), bNode *node, bNod
 		}
 		case 3: /*blue spill*/
 		{
-			switch(node->custom2)
-			{
+			switch (node->custom2) {
 				case 0: /* simple limit */
 				{
 					if ((in[1]->data==NULL) && (in[1]->vec[0] >= 1.f)) {
diff --git a/source/blender/nodes/composite/nodes/node_composite_filter.c b/source/blender/nodes/composite/nodes/node_composite_filter.c
index 6d470467cb0..d6cb54eb944 100644
--- a/source/blender/nodes/composite/nodes/node_composite_filter.c
+++ b/source/blender/nodes/composite/nodes/node_composite_filter.c
@@ -189,7 +189,7 @@ static void node_composit_exec_filter(void *data, bNode *node, bNodeStack **in,
 		stackbuf->xof= cbuf->xof;
 		stackbuf->yof= cbuf->yof;
 		
-		switch(node->custom1) {
+		switch (node->custom1) {
 			case CMP_FILT_SOFT:
 				do_filter3(stackbuf, cbuf, soft, in[0]->vec[0]);
 				break;
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index 6a156c390a7..62179cfa471 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -442,11 +442,14 @@ static void node_composit_exec_image(void *data, bNode *node, bNodeStack **UNUSE
 							/* preview policy: take first 'Combined' pass if available,
 							 * otherwise just use the first layer.
 							 */
-							if (!firstbuf)
+							if (!firstbuf) {
 								firstbuf = stackbuf;
+							}
 							if (!combinedbuf &&
-							    (strcmp(sock->name, "Combined")==0 || strcmp(sock->name, "Image")==0))
+							    (strcmp(sock->name, "Combined") == 0 || strcmp(sock->name, "Image") == 0))
+							{
 								combinedbuf = stackbuf;
+							}
 						}
 					}
 				}
diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.c b/source/blender/nodes/composite/nodes/node_composite_levels.c
index ec6d2006296..32b07582140 100644
--- a/source/blender/nodes/composite/nodes/node_composite_levels.c
+++ b/source/blender/nodes/composite/nodes/node_composite_levels.c
@@ -64,7 +64,7 @@ static void fill_bins(bNode* node, CompBuf* in, int* bins)
 			qd_getPixel(in, x, y, value);
 
 			if (value[3] > 0.0f) { /* don't count transparent pixels */
-				switch(node->custom1) {
+				switch (node->custom1) {
 					case 1: { /* all colors */
 						rgb_tobw(value[0],value[1],value[2], &value[0]);
 						value[0]=value[0]*255; /* scale to 0-255 range */
@@ -122,8 +122,7 @@ static float brightness_mean(bNode* node, CompBuf* in)
 
 			if (value[3] > 0.0f) { /* don't count transparent pixels */
 				numPixels++;
-				switch(node->custom1)
-				{
+				switch (node->custom1) {
 				case 1:
 					{
 						rgb_tobw(value[0],value[1],value[2], &value[0]);
@@ -174,8 +173,7 @@ static float brightness_standard_deviation(bNode* node, CompBuf* in, float mean)
 
 			if (value[3] > 0.0f) { /* don't count transparent pixels */
 				numPixels++;
-				switch(node->custom1)
-				{
+				switch (node->custom1) {
 				case 1:
 					{
 						rgb_tobw(value[0],value[1],value[2], &value[0]);
diff --git a/source/blender/nodes/composite/nodes/node_composite_math.c b/source/blender/nodes/composite/nodes/node_composite_math.c
index 8362df1b691..4c9d1a66fb0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_math.c
+++ b/source/blender/nodes/composite/nodes/node_composite_math.c
@@ -46,8 +46,7 @@ static bNodeSocketTemplate cmp_node_math_out[]= {
 
 static void do_math(bNode *node, float *out, float *in, float *in2)
 {
-	switch(node->custom1)
-	{
+	switch (node->custom1) {
 	case 0: /* Add */
 		out[0]= in[0] + in2[0]; 
 		break; 
diff --git a/source/blender/nodes/composite/nodes/node_composite_rotate.c b/source/blender/nodes/composite/nodes/node_composite_rotate.c
index 6952817248d..8268977658d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_rotate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_rotate.c
@@ -87,7 +87,7 @@ static void node_composit_exec_rotate(void *UNUSED(data), bNode *node, bNodeStac
 					v=-s*x + c*y + centy;
 					xo= x+(int)centx;
 
-					switch(node->custom1) {
+					switch (node->custom1) {
 					case 0:
 						neareast_interpolation(ibuf, obuf, u, v, xo, yo);
 						break;
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
index b12f08bb13d..6eff3dcd95b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
@@ -91,8 +91,7 @@ static void node_composit_exec_sepycca(void *UNUSED(data), bNode *node, bNodeSta
 	if (in[0]->data==NULL) {
 		float y, cb, cr;
 	
-		switch(node->custom1)
-		{
+		switch (node->custom1) {
 		case 1:
 			rgb_to_ycc(in[0]->vec[0], in[0]->vec[1], in[0]->vec[2], &y, &cb, &cr, BLI_YCC_ITU_BT709);
 			break;
@@ -117,8 +116,7 @@ static void node_composit_exec_sepycca(void *UNUSED(data), bNode *node, bNodeSta
 		CompBuf *cbuf2=typecheck_compbuf(cbuf, CB_RGBA);
 	
 		/* convert the RGB stackbuf to an HSV representation */
-		switch(node->custom1)
-		{
+		switch (node->custom1) {
 		case 1:
 			composit1_pixel_processor(node, cbuf2, cbuf2, in[0]->vec, do_sepycca_709, CB_RGBA);
 			break;
@@ -240,8 +238,7 @@ static void node_composit_exec_combycca(void *UNUSED(data), bNode *node, bNodeSt
 		float cb = in[1]->vec[0] * 255;
 		float cr = in[2]->vec[0] * 255;
 		
-		switch(node->custom1)
-		{
+		switch (node->custom1) {
 		case 1:
 			ycc_to_rgb(y, cb, cr, &out[0]->vec[0], &out[0]->vec[1], &out[0]->vec[2], BLI_YCC_ITU_BT709);
 			break;
@@ -270,8 +267,7 @@ static void node_composit_exec_combycca(void *UNUSED(data), bNode *node, bNodeSt
 		stackbuf = alloc_compbuf(cbuf->x, cbuf->y, CB_RGBA, 1); /* allocs */
 		
 		
-		switch(node->custom1)
-		{
+		switch (node->custom1) {
 		case 1:
 			composit4_pixel_processor(node, stackbuf, in[0]->data, in[0]->vec, in[1]->data, in[1]->vec, 
 			                          in[2]->data, in[2]->vec, in[3]->data, in[3]->vec, 
diff --git a/source/blender/nodes/composite/nodes/node_composite_transform.c b/source/blender/nodes/composite/nodes/node_composite_transform.c
index a610d8a66c4..a7906cf3e46 100644
--- a/source/blender/nodes/composite/nodes/node_composite_transform.c
+++ b/source/blender/nodes/composite/nodes/node_composite_transform.c
@@ -89,7 +89,7 @@ CompBuf* node_composit_transform(CompBuf *cbuf, float x, float y, float angle, f
 
 				mul_v3_m4v3(vec, mat, vec);
 
-				switch(filter_type) {
+				switch (filter_type) {
 					case 0:
 						neareast_interpolation(ibuf, obuf, vec[0], vec[1], i, j);
 						break;
diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c
index 90c62bc47ac..9a9a27603dc 100644
--- a/source/blender/nodes/shader/node_shader_util.c
+++ b/source/blender/nodes/shader/node_shader_util.c
@@ -101,7 +101,7 @@ void ntreeShaderGetTexcoMode(bNodeTree *ntree, int r_mode, short *texco, int *mo
 			/* note; sockets always exist for the given type! */
 			for (a=0, sock= node->outputs.first; sock; sock= sock->next, a++) {
 				if (sock->flag & SOCK_IN_USE) {
-					switch(a) {
+					switch (a) {
 						case GEOM_OUT_GLOB: 
 							*texco |= TEXCO_GLOB|NEED_UV; break;
 						case GEOM_OUT_VIEW: 
@@ -137,7 +137,7 @@ void nodeShaderSynchronizeID(bNode *node, int copyto)
 		for (a=0, sock= node->inputs.first; sock; sock= sock->next, a++) {
 			if (!nodeSocketIsHidden(sock)) {
 				if (copyto) {
-					switch(a) {
+					switch (a) {
 						case MAT_IN_COLOR:
 							copy_v3_v3(&ma->r, ((bNodeSocketValueRGBA*)sock->default_value)->value); break;
 						case MAT_IN_SPEC:
@@ -161,7 +161,7 @@ void nodeShaderSynchronizeID(bNode *node, int copyto)
 					}
 				}
 				else {
-					switch(a) {
+					switch (a) {
 						case MAT_IN_COLOR:
 							copy_v3_v3(((bNodeSocketValueRGBA*)sock->default_value)->value, &ma->r); break;
 						case MAT_IN_SPEC:
diff --git a/source/blender/nodes/shader/nodes/node_shader_math.c b/source/blender/nodes/shader/nodes/node_shader_math.c
index 44df496f5d6..db2b57ab51b 100644
--- a/source/blender/nodes/shader/nodes/node_shader_math.c
+++ b/source/blender/nodes/shader/nodes/node_shader_math.c
@@ -48,7 +48,7 @@ static bNodeSocketTemplate sh_node_math_out[]= {
 static void node_shader_exec_math(void *UNUSED(data), bNode *node, bNodeStack **in, 
 bNodeStack **out) 
 {
-	switch(node->custom1) { 
+	switch (node->custom1) { 
 	
 	case 0: /* Add */
 		out[0]->vec[0]= in[0]->vec[0] + in[1]->vec[0]; 
diff --git a/source/blender/nodes/texture/nodes/node_texture_math.c b/source/blender/nodes/texture/nodes/node_texture_math.c
index 29d154df884..54c9645fac3 100644
--- a/source/blender/nodes/texture/nodes/node_texture_math.c
+++ b/source/blender/nodes/texture/nodes/node_texture_math.c
@@ -51,7 +51,7 @@ static void valuefn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor
 	float in0 = tex_input_value(in[0], p, thread);
 	float in1 = tex_input_value(in[1], p, thread);
 	
-	switch(node->custom1) {
+	switch (node->custom1) {
 	
 	case 0: /* Add */
 		*out= in0 + in1; 
diff --git a/source/blender/nodes/texture/nodes/node_texture_output.c b/source/blender/nodes/texture/nodes/node_texture_output.c
index 2b899fde593..19ba0e88639 100644
--- a/source/blender/nodes/texture/nodes/node_texture_output.c
+++ b/source/blender/nodes/texture/nodes/node_texture_output.c
@@ -88,14 +88,14 @@ static void unique_name(bNode *node)
 	
 	i = node;
 	while (i->prev) i = i->prev;
-	for (; i; i=i->next) {
-		if (
-			i == node ||
-			i->type != TEX_NODE_OUTPUT ||
-			strcmp(name, ((TexNodeOutput*)(i->storage))->name)
-		)
+	for ( ; i; i = i->next) {
+		if (i == node ||
+		    i->type != TEX_NODE_OUTPUT ||
+		    strcmp(name, ((TexNodeOutput*)(i->storage))->name))
+		{
 			continue;
-		
+		}
+
 		if (!new_name) {
 			int len = strlen(name);
 			if (len >= 4 && sscanf(name + len - 4, ".%03d", &suffix) == 1) {