style cleanup

6 files changed, 51 insertions, 30 deletions

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 54b391bca6b..dcd652a6590 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1791,8 +1791,8 @@ static void ui_do_but_textedit(bContext *C, uiBlock *block, uiBut *but, uiHandle
 			button_activate_state(C, but, BUTTON_STATE_EXIT);
 			retval = WM_UI_HANDLER_BREAK;
 			break;
-		case LEFTMOUSE: {
-			
+		case LEFTMOUSE:
+		{
 			/* exit on LMB only on RELEASE for searchbox, to mimic other popups, and allow multiple menu levels */
 			if (data->searchbox)
 				inbox = ui_searchbox_inside(data->searchbox, event->x, event->y);
@@ -1958,7 +1958,8 @@ static void ui_do_but_textedit_select(bContext *C, uiBlock *block, uiBut *but, u
 	int mx, my, retval = WM_UI_HANDLER_CONTINUE;
 
 	switch (event->type) {
-		case MOUSEMOVE: {
+		case MOUSEMOVE:
+		{
 			mx = event->x;
 			my = event->y;
 			ui_window_to_block(data->region, block, &mx, &my);
@@ -5704,7 +5705,8 @@ static int ui_handle_button_event(bContext *C, wmEvent *event, uiBut *but)
 				}
 
 				break;
-			case TIMER: {
+			case TIMER:
+			{
 				/* handle tooltip timer */
 				if (event->customdata == data->tooltiptimer) {
 					WM_event_remove_timer(data->wm, data->window, data->tooltiptimer);
@@ -5781,9 +5783,11 @@ static int ui_handle_button_event(bContext *C, wmEvent *event, uiBut *but)
 	}
 	else if (data->state == BUTTON_STATE_WAIT_FLASH) {
 		switch (event->type) {
-			case TIMER: {
-				if (event->customdata == data->flashtimer)
+			case TIMER:
+			{
+				if (event->customdata == data->flashtimer) {
 					button_activate_state(C, but, BUTTON_STATE_EXIT);
+				}
 			}
 		}
 
@@ -5793,21 +5797,25 @@ static int ui_handle_button_event(bContext *C, wmEvent *event, uiBut *but)
 		/* check for exit because of mouse-over another button */
 		switch (event->type) {
 			case MOUSEMOVE:
-				
-				if (data->menu && data->menu->region)
-					if (ui_mouse_inside_region(data->menu->region, event->x, event->y))
+			{
+				uiBut *bt;
+
+				if (data->menu && data->menu->region) {
+					if (ui_mouse_inside_region(data->menu->region, event->x, event->y)) {
 						break;
-			
-				{
-					uiBut *bt = ui_but_find_mouse_over(ar, event->x, event->y);
+					}
+				}
 
-					if (bt && bt->active != data) {
-						if (but->type != COL) /* exception */
-							data->cancel = 1;
-						button_activate_state(C, but, BUTTON_STATE_EXIT);
+				bt = ui_but_find_mouse_over(ar, event->x, event->y);
+
+				if (bt && bt->active != data) {
+					if (but->type != COL) {  /* exception */
+						data->cancel = 1;
 					}
-					break;
+					button_activate_state(C, but, BUTTON_STATE_EXIT);
 				}
+				break;
+			}
 		}
 
 		ui_do_button(C, block, but, event);
diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index 8ff8e0824d6..faaf09e83b6 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -102,7 +102,8 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
 			else
 				but = uiDefButR_prop(block, TEX, 0, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
 			break;
-		case PROP_POINTER: {
+		case PROP_POINTER:
+		{
 			PointerRNA pptr;
 
 			pptr = RNA_property_pointer_get(ptr, prop);
@@ -115,7 +116,8 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
 			but = uiDefIconTextButR_prop(block, IDPOIN, 0, icon, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
 			break;
 		}
-		case PROP_COLLECTION: {
+		case PROP_COLLECTION:
+		{
 			char text[256];
 			BLI_snprintf(text, sizeof(text), IFACE_("%d items"), RNA_property_collection_length(ptr, prop));
 			but = uiDefBut(block, LABEL, 0, text, x1, y1, x2, y2, NULL, 0, 0, 0, 0, NULL);
diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c
index 7870e64228a..4ffa99319c4 100644
--- a/source/blender/editors/space_info/info_stats.c
+++ b/source/blender/editors/space_info/info_stats.c
@@ -70,7 +70,8 @@ typedef struct SceneStats {
 static void stats_object(Object *ob, int sel, int totob, SceneStats *stats)
 {
 	switch (ob->type) {
-		case OB_MESH: {
+		case OB_MESH:
+		{
 			/* we assume derivedmesh is already built, this strictly does stats now. */
 			DerivedMesh *dm = ob->derivedFinal;
 			int totvert, totedge, totface;
@@ -101,7 +102,8 @@ static void stats_object(Object *ob, int sel, int totob, SceneStats *stats)
 			break;
 		case OB_SURF:
 		case OB_CURVE:
-		case OB_FONT: {
+		case OB_FONT:
+		{
 			int tot = 0, totf = 0;
 
 			stats->totcurve += totob;
@@ -121,7 +123,8 @@ static void stats_object(Object *ob, int sel, int totob, SceneStats *stats)
 			}
 			break;
 		}
-		case OB_MBALL: {
+		case OB_MBALL:
+		{
 			int tot = 0, totf = 0;
 
 			BKE_displist_count(&ob->disp, &tot, &totf);
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index fbae8b17ebf..90ad1452356 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -309,7 +309,8 @@ void ED_node_shader_default(Scene *scene, ID *id)
 	ntree = ntreeAddTree("Shader Nodetree", NTREE_SHADER, 0);
 
 	switch (GS(id->name)) {
-		case ID_MA: {
+		case ID_MA:
+		{
 			Material *ma = (Material *)id;
 			ma->nodetree = ntree;
 
@@ -326,7 +327,8 @@ void ED_node_shader_default(Scene *scene, ID *id)
 			strength = 0.0f;
 			break;
 		}
-		case ID_WO: {
+		case ID_WO:
+		{
 			World *wo = (World *)id;
 			wo->nodetree = ntree;
 
@@ -337,7 +339,8 @@ void ED_node_shader_default(Scene *scene, ID *id)
 			strength = 1.0f;
 			break;
 		}
-		case ID_LA: {
+		case ID_LA:
+		{
 			Lamp *la = (Lamp *)id;
 			la->nodetree = ntree;
 
diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c
index 12c221b9273..fec7366ee73 100644
--- a/source/blender/editors/space_node/node_relationships.c
+++ b/source/blender/editors/space_node/node_relationships.c
@@ -560,7 +560,8 @@ static int node_link_modal(bContext *C, wmOperator *op, wmEvent *event)
 
 		case LEFTMOUSE:
 		case RIGHTMOUSE:
-		case MIDDLEMOUSE: {
+		case MIDDLEMOUSE:
+		{
 			for (linkdata = nldrag->links.first; linkdata; linkdata = linkdata->next) {
 				link = linkdata->data;
 
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 68cc1c8e9b6..a21f8fd5f34 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -5363,7 +5363,8 @@ int handleEventEdgeSlide(struct TransInfo *t, struct wmEvent *event)
 						return 1;
 					}
 					break;
-				case FKEY: {
+				case FKEY:
+				{
 					if (event->val == KM_PRESS) {
 						if (sld->is_proportional == FALSE) {
 							sld->flipped_vtx = !sld->flipped_vtx;
@@ -5372,13 +5373,16 @@ int handleEventEdgeSlide(struct TransInfo *t, struct wmEvent *event)
 					}
 					break;
 				}
-				case EVT_MODAL_MAP: {
+				case EVT_MODAL_MAP:
+				{
 					switch (event->val) {
-						case TFM_MODAL_EDGESLIDE_DOWN: {
+						case TFM_MODAL_EDGESLIDE_DOWN:
+						{
 							sld->curr_sv_index = ((sld->curr_sv_index - 1) + sld->totsv) % sld->totsv;
 							break;
 						}
-						case TFM_MODAL_EDGESLIDE_UP: {
+						case TFM_MODAL_EDGESLIDE_UP:
+						{
 							sld->curr_sv_index = (sld->curr_sv_index + 1) % sld->totsv;
 							break;
 						}