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

4 files changed, 35 insertions, 25 deletions

diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 42aea32b7f6..e00abff30f2 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -963,7 +963,7 @@ static void node_update_frame(const bContext *UNUSED(C), bNodeTree *UNUSED(ntree
 
 static void node_common_set_butfunc(bNodeType *ntype)
 {
-	switch(ntype->type) {
+	switch (ntype->type) {
 		case NODE_GROUP:
 			ntype->uifunc= node_uifunc_group;
 			ntype->drawfunc= node_draw_group;
@@ -1176,7 +1176,7 @@ static void node_shader_buts_dynamic(uiLayout *layout, bContext *C, PointerRNA *
 static void node_shader_set_butfunc(bNodeType *ntype)
 {
 	ntype->uifuncbut = NULL;
-	switch(ntype->type) {
+	switch (ntype->type) {
 		/* case NODE_GROUP:	 note, typeinfo for group is generated... see "XXX ugly hack" */
 
 		case SH_NODE_MATERIAL:
@@ -1941,7 +1941,7 @@ static void node_composit_buts_moviedistortion(uiLayout *layout, bContext *C, Po
 static void node_composit_set_butfunc(bNodeType *ntype)
 {
 	ntype->uifuncbut = NULL;
-	switch(ntype->type) {
+	switch (ntype->type) {
 		/* case NODE_GROUP:	 note, typeinfo for group is generated... see "XXX ugly hack" */
 
 		case CMP_NODE_IMAGE:
@@ -2137,7 +2137,7 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), Pointe
 
 	col= uiLayoutColumn(layout, 0);
 
-	switch( tex->type ) {
+	switch ( tex->type ) {
 		case TEX_BLEND:
 			uiItemR(col, &tex_ptr, "progression", 0, "", ICON_NONE);
 			row= uiLayoutRow(col, 0);
@@ -2222,45 +2222,50 @@ static void node_texture_set_butfunc(bNodeType *ntype)
 	if ( ntype->type >= TEX_NODE_PROC && ntype->type < TEX_NODE_PROC_MAX ) {
 		ntype->uifunc = node_texture_buts_proc;
 	}
-	else switch(ntype->type) {
-		
+	else {
+		switch (ntype->type) {
+
 		case TEX_NODE_MATH:
 			ntype->uifunc = node_buts_math;
 			break;
-		
+
 		case TEX_NODE_MIX_RGB:
 			ntype->uifunc = node_buts_mix_rgb;
 			break;
-			
+
 		case TEX_NODE_VALTORGB:
 			ntype->uifunc = node_buts_colorramp;
 			break;
-			
+
 		case TEX_NODE_CURVE_RGB:
 			ntype->uifunc= node_buts_curvecol;
 			break;
-			
+
 		case TEX_NODE_CURVE_TIME:
 			ntype->uifunc = node_buts_time;
 			break;
-			
+
 		case TEX_NODE_TEXTURE:
 			ntype->uifunc = node_buts_texture;
 			break;
-			
+
 		case TEX_NODE_BRICKS:
 			ntype->uifunc = node_texture_buts_bricks;
 			break;
-			
+
 		case TEX_NODE_IMAGE:
 			ntype->uifunc = node_texture_buts_image;
 			break;
-			
+
 		case TEX_NODE_OUTPUT:
 			ntype->uifunc = node_texture_buts_output;
 			break;
+		}
+	}
+
+	if (ntype->uifuncbut == NULL) {
+		ntype->uifuncbut = ntype->uifunc;
 	}
-	if (ntype->uifuncbut == NULL) ntype->uifuncbut = ntype->uifunc;
 }
 
 /* ******* init draw callbacks for all tree types, only called in usiblender.c, once ************* */
@@ -2305,7 +2310,7 @@ void ED_init_node_butfuncs(void)
 	for (i=0; i < NUM_SOCKET_TYPES; ++i) {
 		stype = ntreeGetSocketType(i);
 		if (stype) {
-			switch(stype->type) {
+			switch (stype->type) {
 			case SOCK_FLOAT:
 			case SOCK_INT:
 			case SOCK_BOOLEAN:
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index dda06267237..247dd0c1fa7 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -284,7 +284,7 @@ void ED_node_shader_default(Scene *scene, ID *id)
 	
 	ntree= ntreeAddTree("Shader Nodetree", NTREE_SHADER, 0);
 
-	switch(GS(id->name)) {
+	switch (GS(id->name)) {
 		case ID_MA: {
 			Material *ma= (Material*)id;
 			ma->nodetree = ntree;
@@ -1458,7 +1458,7 @@ static int sample_invoke(bContext *C, wmOperator *op, wmEvent *event)
 
 static int sample_modal(bContext *C, wmOperator *op, wmEvent *event)
 {
-	switch(event->type) {
+	switch (event->type) {
 		case LEFTMOUSE:
 		case RIGHTMOUSE: // XXX hardcoded
 			sample_exit(C, op);
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c
index 049886b1d66..13e85c7f74d 100644
--- a/source/blender/editors/space_node/node_templates.c
+++ b/source/blender/editors/space_node/node_templates.c
@@ -220,8 +220,10 @@ static void node_socket_add_replace(Main *bmain, bNodeTree *ntree, bNode *node_t
 
 		/* also preserve mapping for texture nodes */
 		if (node_from->typeinfo->nclass == NODE_CLASS_TEXTURE &&
-		   node_prev->typeinfo->nclass == NODE_CLASS_TEXTURE)
+		    node_prev->typeinfo->nclass == NODE_CLASS_TEXTURE)
+		{
 			memcpy(node_from->storage, node_prev->storage, sizeof(NodeTexBase));
+		}
 
 		/* remove node */
 		node_remove_linked(ntree, node_prev);
@@ -295,11 +297,14 @@ static void ui_node_sock_name(bNodeSocket *sock, char name[UI_MAX_NAME_STR])
 			BLI_strncpy(node_name, node->typeinfo->name, UI_MAX_NAME_STR);
 
 		if (node->inputs.first == NULL &&
-		   node->outputs.first != node->outputs.last &&
-		   !(node->typeinfo->flag & NODE_OPTIONS))
+		    node->outputs.first != node->outputs.last &&
+		    !(node->typeinfo->flag & NODE_OPTIONS))
+		{
 			BLI_snprintf(name, UI_MAX_NAME_STR, "%s | %s", node_name, sock->link->fromsock->name);
-		else
+		}
+		else {
 			BLI_strncpy(name, node_name, UI_MAX_NAME_STR);
+		}
 	}
 	else if (sock->type == SOCK_SHADER)
 		BLI_strncpy(name, "None", UI_MAX_NAME_STR);
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index fca9927b0f5..3540c20e515 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -172,7 +172,7 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn)
 	short shader_type = snode->shaderfrom;
 	
 	/* preview renders */
-	switch(wmn->category) {
+	switch (wmn->category) {
 		case NC_SCENE:
 			switch (wmn->data) {
 				case ND_NODES:
@@ -244,7 +244,7 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn)
 				ED_area_tag_redraw(sa);
 			break;
 		case NC_SCREEN:
-			switch(wmn->data) {
+			switch (wmn->data) {
 				case ND_ANIMPLAY:
 					ED_area_tag_refresh(sa);
 					break;
@@ -429,7 +429,7 @@ static void node_header_area_draw(const bContext *C, ARegion *ar)
 static void node_region_listener(ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
-	switch(wmn->category) {
+	switch (wmn->category) {
 		case NC_SPACE:
 			if (wmn->data==ND_SPACE_NODE)
 				ED_region_tag_redraw(ar);