style cleanup: mostly whitespace around operators

1 files changed, 167 insertions, 167 deletions

diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index c20ea004e9d..aa76d9a94c1 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -85,57 +85,57 @@
  */
 
 /* view3d handler codes */
-#define VIEW3D_HANDLER_BACKGROUND	1
-#define VIEW3D_HANDLER_PROPERTIES	2
-#define VIEW3D_HANDLER_OBJECT		3
-#define VIEW3D_HANDLER_PREVIEW		4
-#define VIEW3D_HANDLER_MULTIRES         5
-#define VIEW3D_HANDLER_TRANSFORM	6
+#define VIEW3D_HANDLER_BACKGROUND   1
+#define VIEW3D_HANDLER_PROPERTIES   2
+#define VIEW3D_HANDLER_OBJECT       3
+#define VIEW3D_HANDLER_PREVIEW      4
+#define VIEW3D_HANDLER_MULTIRES     5
+#define VIEW3D_HANDLER_TRANSFORM    6
 #define VIEW3D_HANDLER_GREASEPENCIL 7
-#define VIEW3D_HANDLER_BONESKETCH	8
+#define VIEW3D_HANDLER_BONESKETCH   8
 
 /* end XXX ************* */
 
 static void do_view3d_header_buttons(bContext *C, void *arg, int event);
 
 #define B_SCENELOCK 101
-#define B_FULL		102
-#define B_HOME		103
-#define B_VIEWBUT	104
-#define B_PERSP		105
+#define B_FULL      102
+#define B_HOME      103
+#define B_VIEWBUT   104
+#define B_PERSP     105
 #define B_MODESELECT 108
-#define B_SEL_VERT	110
-#define B_SEL_EDGE	111
-#define B_SEL_FACE	112
-#define B_MAN_TRANS	116
-#define B_MAN_ROT	117
-#define B_MAN_SCALE	118
-#define B_NDOF		119	
-#define B_MAN_MODE	120
-#define B_REDR		122
-#define B_NOP		123
+#define B_SEL_VERT  110
+#define B_SEL_EDGE  111
+#define B_SEL_FACE  112
+#define B_MAN_TRANS 116
+#define B_MAN_ROT   117
+#define B_MAN_SCALE 118
+#define B_NDOF      119
+#define B_MAN_MODE  120
+#define B_REDR      122
+#define B_NOP       123
 
 // XXX quickly ported across
 static void handle_view3d_lock(bContext *C) 
 {
-	Main *bmain= CTX_data_main(C);
-	Scene *scene= CTX_data_scene(C);
-	ScrArea *sa= CTX_wm_area(C);
-	View3D *v3d= CTX_wm_view3d(C);
+	Main *bmain = CTX_data_main(C);
+	Scene *scene = CTX_data_scene(C);
+	ScrArea *sa = CTX_wm_area(C);
+	View3D *v3d = CTX_wm_view3d(C);
 	
 	if (v3d != NULL && sa != NULL) {
-		if (v3d->localvd==NULL && v3d->scenelock && sa->spacetype==SPACE_VIEW3D) {
+		if (v3d->localvd == NULL && v3d->scenelock && sa->spacetype == SPACE_VIEW3D) {
 			/* copy to scene */
-			scene->lay= v3d->lay;
-			scene->layact= v3d->layact;
-			scene->camera= v3d->camera;
+			scene->lay = v3d->lay;
+			scene->layact = v3d->layact;
+			scene->camera = v3d->camera;
 
 			/* not through notifier, listener don't have context
 			 * and non-open screens or spaces need to be updated too */
 			BKE_screen_view3d_main_sync(&bmain->screen, scene);
 			
 			/* notifiers for scene update */
-			WM_event_add_notifier(C, NC_SCENE|ND_LAYER, scene);
+			WM_event_add_notifier(C, NC_SCENE | ND_LAYER, scene);
 		}
 	}
 }
@@ -150,11 +150,11 @@ static void view3d_layers_editmode_ensure(Scene *scene, View3D *v3d)
 {
 	/* sanity check - when in editmode disallow switching the editmode layer off since its confusing
 	 * an alternative would be to always draw the editmode object. */
-	if (scene->obedit && (scene->obedit->lay & v3d->lay)==0) {
+	if (scene->obedit && (scene->obedit->lay & v3d->lay) == 0) {
 		int bit;
-		for (bit=0; bit<32; bit++) {
-			if (scene->obedit->lay & (1<<bit)) {
-				v3d->lay |= 1<<bit;
+		for (bit = 0; bit < 32; bit++) {
+			if (scene->obedit->lay & (1 << bit)) {
+				v3d->lay |= 1 << bit;
 				break;
 			}
 		}
@@ -163,11 +163,11 @@ static void view3d_layers_editmode_ensure(Scene *scene, View3D *v3d)
 
 static int view3d_layers_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene= CTX_data_scene(C);
-	ScrArea *sa= CTX_wm_area(C);
-	View3D *v3d= sa->spacedata.first;
-	int nr= RNA_int_get(op->ptr, "nr");
-	int toggle= RNA_boolean_get(op->ptr, "toggle");
+	Scene *scene = CTX_data_scene(C);
+	ScrArea *sa = CTX_wm_area(C);
+	View3D *v3d = sa->spacedata.first;
+	int nr = RNA_int_get(op->ptr, "nr");
+	int toggle = RNA_boolean_get(op->ptr, "toggle");
 	
 	if (nr < 0)
 		return OPERATOR_CANCELLED;
@@ -175,16 +175,16 @@ static int view3d_layers_exec(bContext *C, wmOperator *op)
 	if (nr == 0) {
 		/* all layers */
 		if (!v3d->layact)
-			v3d->layact= 1;
+			v3d->layact = 1;
 
-		if (toggle && v3d->lay == ((1<<20)-1)) {
+		if (toggle && v3d->lay == ((1 << 20) - 1)) {
 			/* return to active layer only */
 			v3d->lay = v3d->layact;
 
 			view3d_layers_editmode_ensure(scene, v3d);
 		}
 		else {
-			v3d->lay |= (1<<20)-1;
+			v3d->lay |= (1 << 20) - 1;
 		}		
 	}
 	else {
@@ -192,24 +192,24 @@ static int view3d_layers_exec(bContext *C, wmOperator *op)
 		nr--;
 
 		if (RNA_boolean_get(op->ptr, "extend")) {
-			if (toggle && v3d->lay & (1<<nr) && (v3d->lay & ~(1<<nr)))
-				v3d->lay &= ~(1<<nr);
+			if (toggle && v3d->lay & (1 << nr) && (v3d->lay & ~(1 << nr)))
+				v3d->lay &= ~(1 << nr);
 			else
-				v3d->lay |= (1<<nr);
+				v3d->lay |= (1 << nr);
 		}
 		else {
-			v3d->lay = (1<<nr);
+			v3d->lay = (1 << nr);
 		}
 
 		view3d_layers_editmode_ensure(scene, v3d);
 
 		/* set active layer, ensure to always have one */
-		if (v3d->lay & (1<<nr))
-		   v3d->layact= 1<<nr;
-		else if ((v3d->lay & v3d->layact)==0) {
-			for (bit=0; bit<32; bit++) {
-				if (v3d->lay & (1<<bit)) {
-					v3d->layact= 1<<bit;
+		if (v3d->lay & (1 << nr))
+			v3d->layact = 1 << nr;
+		else if ((v3d->lay & v3d->layact) == 0) {
+			for (bit = 0; bit < 32; bit++) {
+				if (v3d->lay & (1 << bit)) {
+					v3d->layact = 1 << bit;
 					break;
 				}
 			}
@@ -238,7 +238,7 @@ static int view3d_layers_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		RNA_boolean_set(op->ptr, "extend", FALSE);
 	
 	if (event->alt) {
-		int nr= RNA_int_get(op->ptr, "nr") + 10;
+		int nr = RNA_int_get(op->ptr, "nr") + 10;
 		RNA_int_set(op->ptr, "nr", nr);
 	}
 	view3d_layers_exec(C, op);
@@ -248,7 +248,7 @@ static int view3d_layers_invoke(bContext *C, wmOperator *op, wmEvent *event)
 
 static int view3d_layers_poll(bContext *C)
 {
-	return (ED_operator_view3d_active(C) && CTX_wm_view3d(C)->localvd==NULL);
+	return (ED_operator_view3d_active(C) && CTX_wm_view3d(C)->localvd == NULL);
 }
 
 void VIEW3D_OT_layers(wmOperatorType *ot)
@@ -264,7 +264,7 @@ void VIEW3D_OT_layers(wmOperatorType *ot)
 	ot->poll = view3d_layers_poll;
 	
 	/* flags */
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 	
 	RNA_def_int(ot->srna, "nr", 1, 0, 20, "Number", "The layer number to set, zero for all layers", 0, 20);
 	RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Add this layer to the current view layers");
@@ -280,29 +280,29 @@ static int modeselect_addmode(char *str, const char *title, int id, int icon)
 
 static char *view3d_modeselect_pup(Scene *scene)
 {
-	Object *ob= OBACT;
+	Object *ob = OBACT;
 	static char string[512];
-	const char *title= IFACE_("Mode: %t");
+	const char *title = IFACE_("Mode: %t");
 	char *str = string;
 
 	BLI_strncpy(str, title, sizeof(string));
 
 	str += modeselect_addmode(str, N_("Object Mode"), OB_MODE_OBJECT, ICON_OBJECT_DATA);
 
-	if (ob==NULL || ob->data==NULL) return string;
+	if (ob == NULL || ob->data == NULL) return string;
 	if (ob->id.lib) return string;
 
 	if (!((ID *)ob->data)->lib) {
 		/* if active object is editable */
 		if ( ((ob->type == OB_MESH)
-			|| (ob->type == OB_CURVE) || (ob->type == OB_SURF) || (ob->type == OB_FONT)
-			|| (ob->type == OB_MBALL) || (ob->type == OB_LATTICE))) {
+		      || (ob->type == OB_CURVE) || (ob->type == OB_SURF) || (ob->type == OB_FONT)
+		      || (ob->type == OB_MBALL) || (ob->type == OB_LATTICE))) {
 
 			str += modeselect_addmode(str, N_("Edit Mode"), OB_MODE_EDIT, ICON_EDITMODE_HLT);
 		}
 		else if (ob->type == OB_ARMATURE) {
 			if (ob->mode & OB_MODE_POSE)
-				str += modeselect_addmode(str, N_("Edit Mode"), OB_MODE_EDIT|OB_MODE_POSE, ICON_EDITMODE_HLT);
+				str += modeselect_addmode(str, N_("Edit Mode"), OB_MODE_EDIT | OB_MODE_POSE, ICON_EDITMODE_HLT);
 			else
 				str += modeselect_addmode(str, N_("Edit Mode"), OB_MODE_EDIT, ICON_EDITMODE_HLT);
 		}
@@ -317,13 +317,13 @@ static char *view3d_modeselect_pup(Scene *scene)
 	}
 
 	/* if active object is an armature */
-	if (ob->type==OB_ARMATURE) {
+	if (ob->type == OB_ARMATURE) {
 		str += modeselect_addmode(str, N_("Pose Mode"), OB_MODE_POSE, ICON_POSE_HLT);
 	}
 
-	if ( ob->particlesystem.first ||
-	     modifiers_findByType(ob, eModifierType_Cloth) ||
-	     modifiers_findByType(ob, eModifierType_Softbody))
+	if (ob->particlesystem.first ||
+	    modifiers_findByType(ob, eModifierType_Cloth) ||
+	    modifiers_findByType(ob, eModifierType_Softbody))
 	{
 		str += modeselect_addmode(str, N_("Particle Mode"), OB_MODE_PARTICLE_EDIT, ICON_PARTICLEMODE);
 	}
@@ -340,7 +340,7 @@ static void do_view3d_header_buttons(bContext *C, void *UNUSED(arg), int event)
 	View3D *v3d = sa->spacedata.first;
 	Object *obedit = CTX_data_edit_object(C);
 	BMEditMesh *em = NULL;
-	int ctrl = win->eventstate->ctrl, shift= win->eventstate->shift;
+	int ctrl = win->eventstate->ctrl, shift = win->eventstate->shift;
 	PointerRNA props_ptr;
 	
 	if (obedit && obedit->type == OB_MESH) {
@@ -348,83 +348,83 @@ static void do_view3d_header_buttons(bContext *C, void *UNUSED(arg), int event)
 	}
 	/* watch it: if sa->win does not exist, check that when calling direct drawing routines */
 
-	switch(event) {
-	case B_REDR:
-		ED_area_tag_redraw(sa);
-		break;
-		
-	case B_MODESELECT:
-		WM_operator_properties_create(&props_ptr, "OBJECT_OT_mode_set");
-		RNA_enum_set(&props_ptr, "mode", v3d->modeselect);
-		WM_operator_name_call(C, "OBJECT_OT_mode_set", WM_OP_EXEC_REGION_WIN, &props_ptr);
-		WM_operator_properties_free(&props_ptr);
-		break;		
-		
-	case B_SEL_VERT:
-		if (em) {
-			if (shift==0 || em->selectmode==0)
-				em->selectmode= SCE_SELECT_VERTEX;
-			ts->selectmode= em->selectmode;
-			EDBM_selectmode_set(em);
-			WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
-			ED_undo_push(C, "Selectmode Set: Vertex");
-		}
-		break;
-	case B_SEL_EDGE:
-		if (em) {
-			if (shift==0 || em->selectmode==0) {
-				if ( (em->selectmode ^ SCE_SELECT_EDGE) == SCE_SELECT_VERTEX) {
-					if (ctrl) EDBM_convertsel(em, SCE_SELECT_VERTEX,SCE_SELECT_EDGE);
+	switch (event) {
+		case B_REDR:
+			ED_area_tag_redraw(sa);
+			break;
+
+		case B_MODESELECT:
+			WM_operator_properties_create(&props_ptr, "OBJECT_OT_mode_set");
+			RNA_enum_set(&props_ptr, "mode", v3d->modeselect);
+			WM_operator_name_call(C, "OBJECT_OT_mode_set", WM_OP_EXEC_REGION_WIN, &props_ptr);
+			WM_operator_properties_free(&props_ptr);
+			break;
+
+		case B_SEL_VERT:
+			if (em) {
+				if (shift == 0 || em->selectmode == 0)
+					em->selectmode = SCE_SELECT_VERTEX;
+				ts->selectmode = em->selectmode;
+				EDBM_selectmode_set(em);
+				WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+				ED_undo_push(C, "Selectmode Set: Vertex");
+			}
+			break;
+		case B_SEL_EDGE:
+			if (em) {
+				if (shift == 0 || em->selectmode == 0) {
+					if ( (em->selectmode ^ SCE_SELECT_EDGE) == SCE_SELECT_VERTEX) {
+						if (ctrl) EDBM_convertsel(em, SCE_SELECT_VERTEX, SCE_SELECT_EDGE);
+					}
+					em->selectmode = SCE_SELECT_EDGE;
 				}
-				em->selectmode = SCE_SELECT_EDGE;
+				ts->selectmode = em->selectmode;
+				EDBM_selectmode_set(em);
+				WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+				ED_undo_push(C, "Selectmode Set: Edge");
 			}
-			ts->selectmode= em->selectmode;
-			EDBM_selectmode_set(em);
-			WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
-			ED_undo_push(C, "Selectmode Set: Edge");
-		}
-		break;
-	case B_SEL_FACE:
-		if (em) {
-			if ( shift==0 || em->selectmode==0) {
-				if ( ((ts->selectmode ^ SCE_SELECT_FACE) == SCE_SELECT_VERTEX) || ((ts->selectmode ^ SCE_SELECT_FACE) == SCE_SELECT_EDGE)) {
-					if (ctrl) EDBM_convertsel(em, (ts->selectmode ^ SCE_SELECT_FACE),SCE_SELECT_FACE);
+			break;
+		case B_SEL_FACE:
+			if (em) {
+				if (shift == 0 || em->selectmode == 0) {
+					if ( ((ts->selectmode ^ SCE_SELECT_FACE) == SCE_SELECT_VERTEX) || ((ts->selectmode ^ SCE_SELECT_FACE) == SCE_SELECT_EDGE)) {
+						if (ctrl) EDBM_convertsel(em, (ts->selectmode ^ SCE_SELECT_FACE), SCE_SELECT_FACE);
+					}
+					em->selectmode = SCE_SELECT_FACE;
 				}
-				em->selectmode = SCE_SELECT_FACE;
+				ts->selectmode = em->selectmode;
+				EDBM_selectmode_set(em);
+				WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+				ED_undo_push(C, "Selectmode Set: Face");
 			}
-			ts->selectmode= em->selectmode;
-			EDBM_selectmode_set(em);
-			WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
-			ED_undo_push(C, "Selectmode Set: Face");
-		}
-		break;	
+			break;
 
-	case B_MAN_TRANS:
-		if ( shift==0 || v3d->twtype==0) {
-			v3d->twtype= V3D_MANIP_TRANSLATE;
-		}
-		ED_area_tag_redraw(sa);
-		break;
-	case B_MAN_ROT:
-		if ( shift==0 || v3d->twtype==0) {
-			v3d->twtype= V3D_MANIP_ROTATE;
-		}
-		ED_area_tag_redraw(sa);
-		break;
-	case B_MAN_SCALE:
-		if ( shift==0 || v3d->twtype==0) {
-			v3d->twtype= V3D_MANIP_SCALE;
-		}
-		ED_area_tag_redraw(sa);
-		break;
-	case B_NDOF:
-		ED_area_tag_redraw(sa);
-		break;
-	case B_MAN_MODE:
-		ED_area_tag_redraw(sa);
-		break;
-	default:
-		break;
+		case B_MAN_TRANS:
+			if (shift == 0 || v3d->twtype == 0) {
+				v3d->twtype = V3D_MANIP_TRANSLATE;
+			}
+			ED_area_tag_redraw(sa);
+			break;
+		case B_MAN_ROT:
+			if (shift == 0 || v3d->twtype == 0) {
+				v3d->twtype = V3D_MANIP_ROTATE;
+			}
+			ED_area_tag_redraw(sa);
+			break;
+		case B_MAN_SCALE:
+			if (shift == 0 || v3d->twtype == 0) {
+				v3d->twtype = V3D_MANIP_SCALE;
+			}
+			ED_area_tag_redraw(sa);
+			break;
+		case B_NDOF:
+			ED_area_tag_redraw(sa);
+			break;
+		case B_MAN_MODE:
+			ED_area_tag_redraw(sa);
+			break;
+		default:
+			break;
 	}
 }
 
@@ -445,7 +445,7 @@ static int object_mode_icon(int mode)
 void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C)
 {
 	Object *obedit = CTX_data_edit_object(C);
-	uiBlock *block= uiLayoutGetBlock(layout);
+	uiBlock *block = uiLayoutGetBlock(layout);
 
 	uiBlockSetHandleFunc(block, do_view3d_header_buttons, NULL);
 
@@ -453,35 +453,35 @@ void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C)
 		BMEditMesh *em = BMEdit_FromObject(obedit);
 		uiLayout *row;
 
-		row= uiLayoutRow(layout, 1);
-		block= uiLayoutGetBlock(row);
-		uiDefIconButBitS(block, TOG, SCE_SELECT_VERTEX, B_SEL_VERT, ICON_VERTEXSEL, 0,0,UI_UNIT_X,UI_UNIT_Y, &em->selectmode, 1.0, 0.0, 0, 0, "Vertex select - Shift-Click for multiple modes");
-		uiDefIconButBitS(block, TOG, SCE_SELECT_EDGE, B_SEL_EDGE, ICON_EDGESEL, 0,0,UI_UNIT_X,UI_UNIT_Y, &em->selectmode, 1.0, 0.0, 0, 0, "Edge select - Shift-Click for multiple modes");
-		uiDefIconButBitS(block, TOG, SCE_SELECT_FACE, B_SEL_FACE, ICON_FACESEL, 0,0,UI_UNIT_X,UI_UNIT_Y, &em->selectmode, 1.0, 0.0, 0, 0, "Face select - Shift-Click for multiple modes");
+		row = uiLayoutRow(layout, 1);
+		block = uiLayoutGetBlock(row);
+		uiDefIconButBitS(block, TOG, SCE_SELECT_VERTEX, B_SEL_VERT, ICON_VERTEXSEL, 0, 0, UI_UNIT_X, UI_UNIT_Y, &em->selectmode, 1.0, 0.0, 0, 0, "Vertex select - Shift-Click for multiple modes");
+		uiDefIconButBitS(block, TOG, SCE_SELECT_EDGE, B_SEL_EDGE, ICON_EDGESEL, 0, 0, UI_UNIT_X, UI_UNIT_Y, &em->selectmode, 1.0, 0.0, 0, 0, "Edge select - Shift-Click for multiple modes");
+		uiDefIconButBitS(block, TOG, SCE_SELECT_FACE, B_SEL_FACE, ICON_FACESEL, 0, 0, UI_UNIT_X, UI_UNIT_Y, &em->selectmode, 1.0, 0.0, 0, 0, "Face select - Shift-Click for multiple modes");
 	}
 }
 
 void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 {
-	bScreen *screen= CTX_wm_screen(C);
-	ScrArea *sa= CTX_wm_area(C);
-	View3D *v3d= sa->spacedata.first;
-	Scene *scene= CTX_data_scene(C);
-	ToolSettings *ts= CTX_data_tool_settings(C);
+	bScreen *screen = CTX_wm_screen(C);
+	ScrArea *sa = CTX_wm_area(C);
+	View3D *v3d = sa->spacedata.first;
+	Scene *scene = CTX_data_scene(C);
+	ToolSettings *ts = CTX_data_tool_settings(C);
 	PointerRNA v3dptr, toolsptr, sceneptr;
-	Object *ob= OBACT;
+	Object *ob = OBACT;
 	Object *obedit = CTX_data_edit_object(C);
 	uiBlock *block;
 	uiBut *but;
 	uiLayout *row;
-	const float dpi_fac= UI_DPI_FAC;
+	const float dpi_fac = UI_DPI_FAC;
 	int is_paint = 0;
 	
 	RNA_pointer_create(&screen->id, &RNA_SpaceView3D, v3d, &v3dptr);	
 	RNA_pointer_create(&scene->id, &RNA_ToolSettings, ts, &toolsptr);
 	RNA_pointer_create(&scene->id, &RNA_Scene, scene, &sceneptr);
 
-	block= uiLayoutGetBlock(layout);
+	block = uiLayoutGetBlock(layout);
 	uiBlockSetHandleFunc(block, do_view3d_header_buttons, NULL);
 
 	/* other buttons: */
@@ -490,31 +490,31 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 	/* mode */
 	if (ob) {
 		v3d->modeselect = ob->mode;
-		is_paint = ELEM4(ob->mode, OB_MODE_SCULPT, OB_MODE_VERTEX_PAINT, OB_MODE_WEIGHT_PAINT,OB_MODE_TEXTURE_PAINT);
+		is_paint = ELEM4(ob->mode, OB_MODE_SCULPT, OB_MODE_VERTEX_PAINT, OB_MODE_WEIGHT_PAINT, OB_MODE_TEXTURE_PAINT);
 	}
 	else {
 		v3d->modeselect = OB_MODE_OBJECT;
 	}
 
-	row= uiLayoutRow(layout, 1);
-	uiDefIconTextButS(block, MENU, B_MODESELECT, object_mode_icon(v3d->modeselect), view3d_modeselect_pup(scene) , 
-			  0,0,126 * dpi_fac, UI_UNIT_Y, &(v3d->modeselect), 0, 0, 0, 0, TIP_("Mode"));
+	row = uiLayoutRow(layout, 1);
+	uiDefIconTextButS(block, MENU, B_MODESELECT, object_mode_icon(v3d->modeselect), view3d_modeselect_pup(scene),
+	                  0, 0, 126 * dpi_fac, UI_UNIT_Y, &(v3d->modeselect), 0, 0, 0, 0, TIP_("Mode"));
 	
 	/* Draw type */
 	uiItemR(layout, &v3dptr, "viewport_shade", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 
-	if (obedit==NULL && is_paint) {
+	if (obedit == NULL && is_paint) {
 		/* Manipulators aren't used in paint modes */
 		if (!ELEM(ob->mode, OB_MODE_SCULPT, OB_MODE_PARTICLE_EDIT)) {
 			/* masks aren't used for sculpt and particle painting */
 			PointerRNA meshptr;
 
 			RNA_pointer_create(&ob->id, &RNA_Mesh, ob->data, &meshptr);
-			if (ob->mode & (OB_MODE_TEXTURE_PAINT|OB_MODE_VERTEX_PAINT)) {
+			if (ob->mode & (OB_MODE_TEXTURE_PAINT | OB_MODE_VERTEX_PAINT)) {
 				uiItemR(layout, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 			}
 			else {
-				row= uiLayoutRow(layout, 1);
+				row = uiLayoutRow(layout, 1);
 				uiItemR(row, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 				uiItemR(row, &meshptr, "use_paint_mask_vertex", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 			}
@@ -523,7 +523,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 	else {
 		const char *str_menu;
 
-		row= uiLayoutRow(layout, 1);
+		row = uiLayoutRow(layout, 1);
 		uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 
 		/* pose/object only however we want to allow in weight paint mode too
@@ -533,16 +533,16 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 		}
 
 		/* Transform widget / manipulators */
-		row= uiLayoutRow(layout, 1);
+		row = uiLayoutRow(layout, 1);
 		uiItemR(row, &v3dptr, "show_manipulator", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
-		block= uiLayoutGetBlock(row);
+		block = uiLayoutGetBlock(row);
 		
 		if (v3d->twflag & V3D_USE_MANIPULATOR) {
-			but = uiDefIconButBitC(block, TOG, V3D_MANIP_TRANSLATE, B_MAN_TRANS, ICON_MAN_TRANS, 0,0,UI_UNIT_X,UI_UNIT_Y, &v3d->twtype, 1.0, 0.0, 0, 0, TIP_("Translate manipulator - Shift-Click for multiple modes"));
+			but = uiDefIconButBitC(block, TOG, V3D_MANIP_TRANSLATE, B_MAN_TRANS, ICON_MAN_TRANS, 0, 0, UI_UNIT_X, UI_UNIT_Y, &v3d->twtype, 1.0, 0.0, 0, 0, TIP_("Translate manipulator - Shift-Click for multiple modes"));
 			uiButClearFlag(but, UI_BUT_UNDO); /* skip undo on screen buttons */
-			but = uiDefIconButBitC(block, TOG, V3D_MANIP_ROTATE, B_MAN_ROT, ICON_MAN_ROT, 0,0,UI_UNIT_X,UI_UNIT_Y, &v3d->twtype, 1.0, 0.0, 0, 0, TIP_("Rotate manipulator - Shift-Click for multiple modes"));
+			but = uiDefIconButBitC(block, TOG, V3D_MANIP_ROTATE, B_MAN_ROT, ICON_MAN_ROT, 0, 0, UI_UNIT_X, UI_UNIT_Y, &v3d->twtype, 1.0, 0.0, 0, 0, TIP_("Rotate manipulator - Shift-Click for multiple modes"));
 			uiButClearFlag(but, UI_BUT_UNDO); /* skip undo on screen buttons */
-			but = uiDefIconButBitC(block, TOG, V3D_MANIP_SCALE, B_MAN_SCALE, ICON_MAN_SCALE, 0,0,UI_UNIT_X,UI_UNIT_Y, &v3d->twtype, 1.0, 0.0, 0, 0, TIP_("Scale manipulator - Shift-Click for multiple modes"));
+			but = uiDefIconButBitC(block, TOG, V3D_MANIP_SCALE, B_MAN_SCALE, ICON_MAN_SCALE, 0, 0, UI_UNIT_X, UI_UNIT_Y, &v3d->twtype, 1.0, 0.0, 0, 0, TIP_("Scale manipulator - Shift-Click for multiple modes"));
 			uiButClearFlag(but, UI_BUT_UNDO); /* skip undo on screen buttons */
 		}
 			
@@ -551,12 +551,12 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 		}
 			
 		str_menu = BIF_menustringTransformOrientation(C, "Orientation");
-		but = uiDefButC(block, MENU, B_MAN_MODE, str_menu,0,0,70 * dpi_fac, UI_UNIT_Y, &v3d->twmode, 0, 0, 0, 0, TIP_("Transform Orientation"));
+		but = uiDefButC(block, MENU, B_MAN_MODE, str_menu, 0, 0, 70 * dpi_fac, UI_UNIT_Y, &v3d->twmode, 0, 0, 0, 0, TIP_("Transform Orientation"));
 		uiButClearFlag(but, UI_BUT_UNDO); /* skip undo on screen buttons */
 		MEM_freeN((void *)str_menu);
 	}
 
-	if (obedit==NULL && v3d->localvd==NULL) {
+	if (obedit == NULL && v3d->localvd == NULL) {
 		unsigned int ob_lay = ob ? ob->lay : 0;
 
 		/* Layers */