style cleanup

1 files changed, 384 insertions, 383 deletions

diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 7d0e9dd6005..e02ad00ac7f 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -84,35 +84,35 @@
 
 /* return codes for select, and drawing flags */
 
-#define MAN_TRANS_X		1
-#define MAN_TRANS_Y		2
-#define MAN_TRANS_Z		4
-#define MAN_TRANS_C		7
-
-#define MAN_ROT_X		8
-#define MAN_ROT_Y		16
-#define MAN_ROT_Z		32
-#define MAN_ROT_V		64
-#define MAN_ROT_T		128
-#define MAN_ROT_C		248
-
-#define MAN_SCALE_X		256
-#define MAN_SCALE_Y		512
-#define MAN_SCALE_Z		1024
-#define MAN_SCALE_C		1792
+#define MAN_TRANS_X     1
+#define MAN_TRANS_Y     2
+#define MAN_TRANS_Z     4
+#define MAN_TRANS_C     7
+
+#define MAN_ROT_X       8
+#define MAN_ROT_Y       16
+#define MAN_ROT_Z       32
+#define MAN_ROT_V       64
+#define MAN_ROT_T       128
+#define MAN_ROT_C       248
+
+#define MAN_SCALE_X     256
+#define MAN_SCALE_Y     512
+#define MAN_SCALE_Z     1024
+#define MAN_SCALE_C     1792
 
 /* color codes */
 
-#define MAN_RGB		0
-#define MAN_GHOST	1
-#define MAN_MOVECOL	2
+#define MAN_RGB     0
+#define MAN_GHOST   1
+#define MAN_MOVECOL 2
 
 /* transform widget center calc helper for below */
 static void calc_tw_center(Scene *scene, float *co)
 {
-	float *twcent= scene->twcent;
-	float *min= scene->twmin;
-	float *max= scene->twmax;
+	float *twcent = scene->twcent;
+	float *min = scene->twmin;
+	float *max = scene->twmax;
 
 	minmax_v3v3_v3(min, max, co);
 	add_v3_v3(twcent, co);
@@ -145,7 +145,7 @@ static void protectflag_to_drawflags(short protectflag, short *drawflags)
 /* for pose mode */
 static void stats_pose(Scene *scene, RegionView3D *rv3d, bPoseChannel *pchan)
 {
-	Bone *bone= pchan->bone;
+	Bone *bone = pchan->bone;
 
 	if (bone) {
 		if (bone->flag & BONE_TRANSFORM) {
@@ -159,7 +159,7 @@ static void stats_pose(Scene *scene, RegionView3D *rv3d, bPoseChannel *pchan)
 static void stats_editbone(RegionView3D *rv3d, EditBone *ebo)
 {
 	if (ebo->flag & BONE_EDITMODE_LOCKED)
-		protectflag_to_drawflags(OB_LOCK_LOC|OB_LOCK_ROT|OB_LOCK_SCALE, &rv3d->twdrawflag);
+		protectflag_to_drawflags(OB_LOCK_LOC | OB_LOCK_ROT | OB_LOCK_SCALE, &rv3d->twdrawflag);
 }
 
 /* could move into BLI_math however this is only useful for display/editing purposes */
@@ -172,9 +172,9 @@ static void axis_angle_to_gimbal_axis(float gmat[3][3], float axis[3], float ang
 
 	/* this is an un-scientific method to get a vector to cross with
 	 * XYZ intentionally YZX */
-	cross_vec[0]= axis[1];
-	cross_vec[1]= axis[2];
-	cross_vec[2]= axis[0];
+	cross_vec[0] = axis[1];
+	cross_vec[1] = axis[2];
+	cross_vec[2] = axis[0];
 
 	/* X-axis */
 	cross_v3_v3v3(gmat[0], cross_vec, axis);
@@ -183,7 +183,7 @@ static void axis_angle_to_gimbal_axis(float gmat[3][3], float axis[3], float ang
 	mul_qt_v3(quat, gmat[0]);
 
 	/* Y-axis */
-	axis_angle_to_quat(quat, axis, M_PI/2.0);
+	axis_angle_to_quat(quat, axis, M_PI / 2.0);
 	copy_v3_v3(gmat[1], gmat[0]);
 	mul_qt_v3(quat, gmat[1]);
 
@@ -196,14 +196,14 @@ static void axis_angle_to_gimbal_axis(float gmat[3][3], float axis[3], float ang
 
 static int test_rotmode_euler(short rotmode)
 {
-	return (ELEM(rotmode, ROT_MODE_AXISANGLE, ROT_MODE_QUAT)) ? 0:1;
+	return (ELEM(rotmode, ROT_MODE_AXISANGLE, ROT_MODE_QUAT)) ? 0 : 1;
 }
 
 int gimbal_axis(Object *ob, float gmat[][3])
 {
 	if (ob) {
 		if (ob->mode & OB_MODE_POSE) {
-			bPoseChannel *pchan= BKE_pose_channel_active(ob);
+			bPoseChannel *pchan = BKE_pose_channel_active(ob);
 
 			if (pchan) {
 				float mat[3][3], tmat[3][3], obmat[3][3];
@@ -270,40 +270,40 @@ int gimbal_axis(Object *ob, float gmat[][3])
 /* returns total items selected */
 int calc_manipulator_stats(const bContext *C)
 {
-	ScrArea *sa= CTX_wm_area(C);
-	ARegion *ar= CTX_wm_region(C);
-	Scene *scene= CTX_data_scene(C);
-	Object *obedit= CTX_data_edit_object(C);
+	ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = CTX_wm_region(C);
+	Scene *scene = CTX_data_scene(C);
+	Object *obedit = CTX_data_edit_object(C);
 	ToolSettings *ts = CTX_data_tool_settings(C);
-	View3D *v3d= sa->spacedata.first;
-	RegionView3D *rv3d= ar->regiondata;
+	View3D *v3d = sa->spacedata.first;
+	RegionView3D *rv3d = ar->regiondata;
 	Base *base;
-	Object *ob= OBACT;
-	int a, totsel= 0;
+	Object *ob = OBACT;
+	int a, totsel = 0;
 
 	/* transform widget matrix */
 	unit_m4(rv3d->twmat);
 
-	rv3d->twdrawflag= 0xFFFF;
+	rv3d->twdrawflag = 0xFFFF;
 
 	/* transform widget centroid/center */
 	INIT_MINMAX(scene->twmin, scene->twmax);
 	zero_v3(scene->twcent);
 
 	if (obedit) {
-		ob= obedit;
-		if ((ob->lay & v3d->lay)==0) return 0;
+		ob = obedit;
+		if ((ob->lay & v3d->lay) == 0) return 0;
 
-		if (obedit->type==OB_MESH) {
+		if (obedit->type == OB_MESH) {
 			BMEditMesh *em = BMEdit_FromObject(obedit);
 			BMEditSelection ese;
-			float vec[3]= {0, 0, 0};
+			float vec[3] = {0, 0, 0};
 
 			/* USE LAST SELECTE WITH ACTIVE */
 			if ((v3d->around == V3D_ACTIVE) && BM_select_history_active_get(em->bm, &ese)) {
 				BM_editselection_center(&ese, vec);
 				calc_tw_center(scene, vec);
-				totsel= 1;
+				totsel = 1;
 			}
 			else {
 				BMesh *bm = em->bm;
@@ -358,10 +358,10 @@ int calc_manipulator_stats(const bContext *C)
 				}
 			}
 		} /* end editmesh */
-		else if (obedit->type==OB_ARMATURE) {
-			bArmature *arm= obedit->data;
+		else if (obedit->type == OB_ARMATURE) {
+			bArmature *arm = obedit->data;
 			EditBone *ebo;
-			for (ebo= arm->edbo->first; ebo; ebo=ebo->next) {
+			for (ebo = arm->edbo->first; ebo; ebo = ebo->next) {
 				if (EBONE_VISIBLE(arm, ebo)) {
 					if (ebo->flag & BONE_TIPSEL) {
 						calc_tw_center(scene, ebo->tail);
@@ -378,24 +378,24 @@ int calc_manipulator_stats(const bContext *C)
 			}
 		}
 		else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
-			Curve *cu= obedit->data;
+			Curve *cu = obedit->data;
 			float center[3];
 
-			if (v3d->around==V3D_ACTIVE && ED_curve_actSelection(cu, center)) {
-			calc_tw_center(scene, center);
+			if (v3d->around == V3D_ACTIVE && ED_curve_actSelection(cu, center)) {
+				calc_tw_center(scene, center);
 				totsel++;
 			}
 			else {
 				Nurb *nu;
 				BezTriple *bezt;
 				BPoint *bp;
-				ListBase *nurbs= BKE_curve_editNurbs_get(cu);
+				ListBase *nurbs = BKE_curve_editNurbs_get(cu);
 
-				nu= nurbs->first;
+				nu = nurbs->first;
 				while (nu) {
 					if (nu->type == CU_BEZIER) {
-						bezt= nu->bezt;
-						a= nu->pntsu;
+						bezt = nu->bezt;
+						a = nu->pntsu;
 						while (a--) {
 							/* exceptions
 							 * if handles are hidden then only check the center points.
@@ -425,8 +425,8 @@ int calc_manipulator_stats(const bContext *C)
 						}
 					}
 					else {
-						bp= nu->bp;
-						a= nu->pntsu*nu->pntsv;
+						bp = nu->bp;
+						a = nu->pntsu * nu->pntsv;
 						while (a--) {
 							if (bp->f1 & SELECT) {
 								calc_tw_center(scene, bp->vec);
@@ -435,31 +435,31 @@ int calc_manipulator_stats(const bContext *C)
 							bp++;
 						}
 					}
-					nu= nu->next;
+					nu = nu->next;
 				}
 			}
 		}
-		else if (obedit->type==OB_MBALL) {
-			MetaBall *mb = (MetaBall*)obedit->data;
+		else if (obedit->type == OB_MBALL) {
+			MetaBall *mb = (MetaBall *)obedit->data;
 			MetaElem *ml /* , *ml_sel=NULL */ /* UNUSED */;
 
-			ml= mb->editelems->first;
+			ml = mb->editelems->first;
 			while (ml) {
 				if (ml->flag & SELECT) {
 					calc_tw_center(scene, &ml->x);
 					/* ml_sel = ml; */ /* UNUSED */
 					totsel++;
 				}
-				ml= ml->next;
+				ml = ml->next;
 			}
 		}
-		else if (obedit->type==OB_LATTICE) {
+		else if (obedit->type == OB_LATTICE) {
 			BPoint *bp;
-			Lattice *lt= obedit->data;
+			Lattice *lt = obedit->data;
 
-			bp= lt->editlatt->latt->def;
+			bp = lt->editlatt->latt->def;
 
-			a= lt->editlatt->latt->pntsu*lt->editlatt->latt->pntsv*lt->editlatt->latt->pntsw;
+			a = lt->editlatt->latt->pntsu * lt->editlatt->latt->pntsv * lt->editlatt->latt->pntsw;
 			while (a--) {
 				if (bp->f1 & SELECT) {
 					calc_tw_center(scene, bp->vec);
@@ -471,7 +471,7 @@ int calc_manipulator_stats(const bContext *C)
 
 		/* selection center */
 		if (totsel) {
-			mul_v3_fl(scene->twcent, 1.0f/(float)totsel);	// centroid!
+			mul_v3_fl(scene->twcent, 1.0f / (float)totsel);   // centroid!
 			mul_m4_v3(obedit->obmat, scene->twcent);
 			mul_m4_v3(obedit->obmat, scene->twmin);
 			mul_m4_v3(obedit->obmat, scene->twmax);
@@ -481,17 +481,17 @@ int calc_manipulator_stats(const bContext *C)
 		bPoseChannel *pchan;
 		int mode = TFM_ROTATION; // mislead counting bones... bah. We don't know the manipulator mode, could be mixed
 
-		if ((ob->lay & v3d->lay)==0) return 0;
+		if ((ob->lay & v3d->lay) == 0) return 0;
 
 		totsel = count_set_pose_transflags(&mode, 0, ob);
 
 		if (totsel) {
 			/* use channels to get stats */
-			for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+			for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
 				stats_pose(scene, rv3d, pchan);
 			}
 
-			mul_v3_fl(scene->twcent, 1.0f/(float)totsel);	// centroid!
+			mul_v3_fl(scene->twcent, 1.0f / (float)totsel);   // centroid!
 			mul_m4_v3(ob->obmat, scene->twcent);
 			mul_m4_v3(ob->obmat, scene->twmin);
 			mul_m4_v3(ob->obmat, scene->twmax);
@@ -501,17 +501,17 @@ int calc_manipulator_stats(const bContext *C)
 		;
 	}
 	else if (ob && ob->mode & OB_MODE_PARTICLE_EDIT) {
-		PTCacheEdit *edit= PE_get_current(scene, ob);
+		PTCacheEdit *edit = PE_get_current(scene, ob);
 		PTCacheEditPoint *point;
 		PTCacheEditKey *ek;
 		int k;
 
 		if (edit) {
 			point = edit->points;
-			for (a=0; a<edit->totpoint; a++, point++) {
+			for (a = 0; a < edit->totpoint; a++, point++) {
 				if (point->flag & PEP_HIDE) continue;
 
-				for (k=0, ek=point->keys; k<point->totkey; k++, ek++) {
+				for (k = 0, ek = point->keys; k < point->totkey; k++, ek++) {
 					if (ek->flag & PEK_SELECT) {
 						calc_tw_center(scene, ek->flag & PEK_USE_WCO ? ek->world_co : ek->co);
 						totsel++;
@@ -521,19 +521,19 @@ int calc_manipulator_stats(const bContext *C)
 
 			/* selection center */
 			if (totsel)
-				mul_v3_fl(scene->twcent, 1.0f/(float)totsel);	// centroid!
+				mul_v3_fl(scene->twcent, 1.0f / (float)totsel);  // centroid!
 		}
 	}
 	else {
 
 		/* we need the one selected object, if its not active */
-		ob= OBACT;
-		if (ob && !(ob->flag & SELECT)) ob= NULL;
+		ob = OBACT;
+		if (ob && !(ob->flag & SELECT)) ob = NULL;
 
-		for (base= scene->base.first; base; base= base->next) {
+		for (base = scene->base.first; base; base = base->next) {
 			if (TESTBASELIB(v3d, base)) {
-				if (ob==NULL)
-					ob= base->object;
+				if (ob == NULL)
+					ob = base->object;
 				calc_tw_center(scene, base->object->obmat[3]);
 				protectflag_to_drawflags(base->object->protectflag, &rv3d->twdrawflag);
 				totsel++;
@@ -542,7 +542,7 @@ int calc_manipulator_stats(const bContext *C)
 
 		/* selection center */
 		if (totsel) {
-			mul_v3_fl(scene->twcent, 1.0f/(float)totsel);	// centroid!
+			mul_v3_fl(scene->twcent, 1.0f / (float)totsel);   // centroid!
 		}
 	}
 
@@ -551,32 +551,32 @@ int calc_manipulator_stats(const bContext *C)
 
 		switch (v3d->twmode) {
 		
-		case V3D_MANIP_GLOBAL:
-			break; /* nothing to do */
+			case V3D_MANIP_GLOBAL:
+				break; /* nothing to do */
 
-		case V3D_MANIP_GIMBAL:
-		{
-			float mat[3][3];
-			if (gimbal_axis(ob, mat)) {
-				copy_m4_m3(rv3d->twmat, mat);
-				break;
-			}
-			/* if not gimbal, fall through to normal */
-		}
-		case V3D_MANIP_NORMAL:
-			if (obedit || ob->mode & OB_MODE_POSE) {
+			case V3D_MANIP_GIMBAL:
+			{
 				float mat[3][3];
-				ED_getTransformOrientationMatrix(C, mat, (v3d->around == V3D_ACTIVE));
-				copy_m4_m3(rv3d->twmat, mat);
-				break;
+				if (gimbal_axis(ob, mat)) {
+					copy_m4_m3(rv3d->twmat, mat);
+					break;
+				}
+				/* if not gimbal, fall through to normal */
 			}
+			case V3D_MANIP_NORMAL:
+				if (obedit || ob->mode & OB_MODE_POSE) {
+					float mat[3][3];
+					ED_getTransformOrientationMatrix(C, mat, (v3d->around == V3D_ACTIVE));
+					copy_m4_m3(rv3d->twmat, mat);
+					break;
+				}
 			/* no break we define 'normal' as 'local' in Object mode */
-		case V3D_MANIP_LOCAL:
-			copy_m4_m4(rv3d->twmat, ob->obmat);
-			normalize_m4(rv3d->twmat);
-			break;
+			case V3D_MANIP_LOCAL:
+				copy_m4_m4(rv3d->twmat, ob->obmat);
+				normalize_m4(rv3d->twmat);
+				break;
 
-		case V3D_MANIP_VIEW:
+			case V3D_MANIP_VIEW:
 			{
 				float mat[3][3];
 				copy_m3_m4(mat, rv3d->viewinv);
@@ -584,7 +584,7 @@ int calc_manipulator_stats(const bContext *C)
 				copy_m4_m3(rv3d->twmat, mat);
 			}
 			break;
-		default: /* V3D_MANIP_CUSTOM */
+			default: /* V3D_MANIP_CUSTOM */
 			{
 				float mat[3][3];
 				applyTransformOrientation(C, mat, NULL);
@@ -601,7 +601,7 @@ int calc_manipulator_stats(const bContext *C)
 /* don't draw axis perpendicular to the view */
 static void test_manipulator_axis(const bContext *C)
 {
-	RegionView3D *rv3d= CTX_wm_region_view3d(C);
+	RegionView3D *rv3d = CTX_wm_region_view3d(C);
 	float angle;
 	float vec[3];
 
@@ -613,7 +613,7 @@ static void test_manipulator_axis(const bContext *C)
 	}
 	angle = rv3d->twangle[0] = RAD2DEGF(angle);
 	if (angle < 5.0f) {
-		rv3d->twdrawflag &= ~(MAN_TRANS_X|MAN_SCALE_X);
+		rv3d->twdrawflag &= ~(MAN_TRANS_X | MAN_SCALE_X);
 	}
 
 	angle = fabs(angle_v3v3(rv3d->twmat[1], vec));
@@ -622,7 +622,7 @@ static void test_manipulator_axis(const bContext *C)
 	}
 	angle = rv3d->twangle[1] = RAD2DEGF(angle);
 	if (angle < 5.0f) {
-		rv3d->twdrawflag &= ~(MAN_TRANS_Y|MAN_SCALE_Y);
+		rv3d->twdrawflag &= ~(MAN_TRANS_Y | MAN_SCALE_Y);
 	}
 
 	angle = fabs(angle_v3v3(rv3d->twmat[2], vec));
@@ -631,7 +631,7 @@ static void test_manipulator_axis(const bContext *C)
 	}
 	angle = rv3d->twangle[2] = RAD2DEGF(angle);
 	if (angle < 5.0f) {
-		rv3d->twdrawflag &= ~(MAN_TRANS_Z|MAN_SCALE_Z);
+		rv3d->twdrawflag &= ~(MAN_TRANS_Z | MAN_SCALE_Z);
 	}
 }
 
@@ -643,7 +643,7 @@ static float screen_aligned(RegionView3D *rv3d, float mat[][4])
 	glTranslatef(mat[3][0], mat[3][1], mat[3][2]);
 
 	/* sets view screen aligned */
-	glRotatef(-360.0f*saacos(rv3d->viewquat[0])/(float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]);
+	glRotatef(-360.0f * saacos(rv3d->viewquat[0]) / (float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]);
 
 	return len_v3(mat[0]); /* draw scale */
 }
@@ -666,43 +666,43 @@ static void partial_doughnut(float radring, float radhole, int start, int end, i
 
 	if (start == 0 && end == nrings) do_caps = FALSE;
 
-	ring_delta= 2.0f*(float)M_PI/(float)nrings;
-	side_delta= 2.0f*(float)M_PI/(float)nsides;
+	ring_delta = 2.0f * (float)M_PI / (float)nrings;
+	side_delta = 2.0f * (float)M_PI / (float)nsides;
 
-	theta= (float)M_PI+0.5f*ring_delta;
-	cos_theta= (float)cos(theta);
-	sin_theta= (float)sin(theta);
+	theta = (float)M_PI + 0.5f * ring_delta;
+	cos_theta = (float)cos(theta);
+	sin_theta = (float)sin(theta);
 
-	for (i= nrings - 1; i >= 0; i--) {
-		theta1= theta + ring_delta;
-		cos_theta1= (float)cos(theta1);
-		sin_theta1= (float)sin(theta1);
+	for (i = nrings - 1; i >= 0; i--) {
+		theta1 = theta + ring_delta;
+		cos_theta1 = (float)cos(theta1);
+		sin_theta1 = (float)sin(theta1);
 
-		if (do_caps && i==start) {	// cap
+		if (do_caps && i == start) {  // cap
 			glBegin(GL_POLYGON);
-			phi= 0.0;
-			for (j= nsides; j >= 0; j--) {
+			phi = 0.0;
+			for (j = nsides; j >= 0; j--) {
 				float cos_phi, sin_phi, dist;
 
 				phi += side_delta;
-				cos_phi= (float)cos(phi);
-				sin_phi= (float)sin(phi);
-				dist= radhole + radring * cos_phi;
+				cos_phi = (float)cos(phi);
+				sin_phi = (float)sin(phi);
+				dist = radhole + radring * cos_phi;
 
 				glVertex3f(cos_theta1 * dist, -sin_theta1 * dist,  radring * sin_phi);
 			}
 			glEnd();
 		}
-		if (i>=start && i<=end) {
+		if (i >= start && i <= end) {
 			glBegin(GL_QUAD_STRIP);
-			phi= 0.0;
-			for (j= nsides; j >= 0; j--) {
+			phi = 0.0;
+			for (j = nsides; j >= 0; j--) {
 				float cos_phi, sin_phi, dist;
 
 				phi += side_delta;
-				cos_phi= (float)cos(phi);
-				sin_phi= (float)sin(phi);
-				dist= radhole + radring * cos_phi;
+				cos_phi = (float)cos(phi);
+				sin_phi = (float)sin(phi);
+				dist = radhole + radring * cos_phi;
 
 				glVertex3f(cos_theta1 * dist, -sin_theta1 * dist, radring * sin_phi);
 				glVertex3f(cos_theta * dist, -sin_theta * dist,  radring * sin_phi);
@@ -710,16 +710,16 @@ static void partial_doughnut(float radring, float radhole, int start, int end, i
 			glEnd();
 		}
 
-		if (do_caps && i==end) {	// cap
+		if (do_caps && i == end) {    // cap
 			glBegin(GL_POLYGON);
-			phi= 0.0;
-			for (j= nsides; j >= 0; j--) {
+			phi = 0.0;
+			for (j = nsides; j >= 0; j--) {
 				float cos_phi, sin_phi, dist;
 
 				phi -= side_delta;
-				cos_phi= (float)cos(phi);
-				sin_phi= (float)sin(phi);
-				dist= radhole + radring * cos_phi;
+				cos_phi = (float)cos(phi);
+				sin_phi = (float)sin(phi);
+				dist = radhole + radring * cos_phi;
 
 				glVertex3f(cos_theta * dist, -sin_theta * dist,  radring * sin_phi);
 			}
@@ -727,9 +727,9 @@ static void partial_doughnut(float radring, float radhole, int start, int end, i
 		}
 
 
-		theta= theta1;
-		cos_theta= cos_theta1;
-		sin_theta= sin_theta1;
+		theta = theta1;
+		cos_theta = cos_theta1;
+		sin_theta = sin_theta1;
 	}
 }
 
@@ -751,43 +751,43 @@ static char axisBlendAngle(float angle)
  */
 static void manipulator_setcolor(View3D *v3d, char axis, int colcode, unsigned char alpha)
 {
-	unsigned char col[4]= {0};
-	col[3]= alpha;
+	unsigned char col[4] = {0};
+	col[3] = alpha;
 
-	if (colcode==MAN_GHOST) {
-		col[3]= 70;
+	if (colcode == MAN_GHOST) {
+		col[3] = 70;
 	}
-	else if (colcode==MAN_MOVECOL) {
+	else if (colcode == MAN_MOVECOL) {
 		UI_GetThemeColor3ubv(TH_TRANSFORM, col);
 	}
 	else {
 		switch (axis) {
-		case 'C':
-			UI_GetThemeColor3ubv(TH_TRANSFORM, col);
-			if (v3d->twmode == V3D_MANIP_LOCAL) {
-				col[0]= col[0]>200?255:col[0]+55;
-				col[1]= col[1]>200?255:col[1]+55;
-				col[2]= col[2]>200?255:col[2]+55;
-			}
-			else if (v3d->twmode == V3D_MANIP_NORMAL) {
-				col[0]= col[0]<55?0:col[0]-55;
-				col[1]= col[1]<55?0:col[1]-55;
-				col[2]= col[2]<55?0:col[2]-55;
-			}
-			break;
-		case 'X':
-			col[0]= 220;
-			break;
-		case 'Y':
-			col[1]= 220;
-			break;
-		case 'Z':
-			col[0]= 30;
-			col[1]= 30;
-			col[2]= 220;
-			break;
-		default:
-			BLI_assert(!"invalid axis arg");
+			case 'C':
+				UI_GetThemeColor3ubv(TH_TRANSFORM, col);
+				if (v3d->twmode == V3D_MANIP_LOCAL) {
+					col[0] = col[0] > 200 ? 255 : col[0] + 55;
+					col[1] = col[1] > 200 ? 255 : col[1] + 55;
+					col[2] = col[2] > 200 ? 255 : col[2] + 55;
+				}
+				else if (v3d->twmode == V3D_MANIP_NORMAL) {
+					col[0] = col[0] < 55 ? 0 : col[0] - 55;
+					col[1] = col[1] < 55 ? 0 : col[1] - 55;
+					col[2] = col[2] < 55 ? 0 : col[2] - 55;
+				}
+				break;
+			case 'X':
+				col[0] = 220;
+				break;
+			case 'Y':
+				col[1] = 220;
+				break;
+			case 'Z':
+				col[0] = 30;
+				col[1] = 30;
+				col[2] = 220;
+				break;
+			default:
+				BLI_assert(!"invalid axis arg");
 		}
 	}
 
@@ -836,7 +836,7 @@ static void preOrthoFront(int ortho, float twmat[][4], int axis)
 		orthogonalize_m4(omat, axis);
 		glPushMatrix();
 		glMultMatrixf(omat);
-		glFrontFace(is_negative_m4(omat) ? GL_CW:GL_CCW);
+		glFrontFace(is_negative_m4(omat) ? GL_CW : GL_CCW);
 	}
 }
 
@@ -853,42 +853,42 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 	double plane[4];
 	float matt[4][4];
 	float size, unitmat[4][4];
-	float cywid= 0.33f*0.01f*(float)U.tw_handlesize;
-	float cusize= cywid*0.65f;
-	int arcs= (G.rt!=2);
+	float cywid = 0.33f * 0.01f * (float)U.tw_handlesize;
+	float cusize = cywid * 0.65f;
+	int arcs = (G.rt != 2);
 	int colcode;
 	int ortho;
 
-	if (moving) colcode= MAN_MOVECOL;
-	else colcode= MAN_RGB;
+	if (moving) colcode = MAN_MOVECOL;
+	else colcode = MAN_RGB;
 
 	/* when called while moving in mixed mode, do not draw when... */
-	if ((drawflags & MAN_ROT_C)==0) return;
+	if ((drawflags & MAN_ROT_C) == 0) return;
 
 	/* Init stuff */
 	glDisable(GL_DEPTH_TEST);
 	unit_m4(unitmat);
 
-	qobj= gluNewQuadric();
+	qobj = gluNewQuadric();
 	gluQuadricDrawStyle(qobj, GLU_FILL);
 
 	/* prepare for screen aligned draw */
-	size= len_v3(rv3d->twmat[0]);
+	size = len_v3(rv3d->twmat[0]);
 	glPushMatrix();
 	glTranslatef(rv3d->twmat[3][0], rv3d->twmat[3][1], rv3d->twmat[3][2]);
 
 	if (arcs) {
 		/* clipplane makes nice handles, calc here because of multmatrix but with translate! */
 		copy_v3db_v3fl(plane, rv3d->viewinv[2]);
-		plane[3]= -0.02f*size; // clip just a bit more
+		plane[3] = -0.02f * size; // clip just a bit more
 		glClipPlane(GL_CLIP_PLANE0, plane);
 	}
 	/* sets view screen aligned */
-	glRotatef(-360.0f*saacos(rv3d->viewquat[0])/(float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]);
+	glRotatef(-360.0f * saacos(rv3d->viewquat[0]) / (float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]);
 
 	/* Screen aligned help circle */
 	if (arcs) {
-		if ((G.f & G_PICKSEL)==0) {
+		if ((G.f & G_PICKSEL) == 0) {
 			UI_ThemeColorShade(TH_BACK, -30);
 			drawcircball(GL_LINE_LOOP, unitmat[3], size, unitmat);
 		}
@@ -899,22 +899,22 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 		if (G.f & G_PICKSEL) glLoadName(MAN_ROT_T);
 
 		UI_ThemeColor(TH_TRANSFORM);
-		drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f*size, unitmat);
+		drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f * size, unitmat);
 	}
 
 	/* Screen aligned view rot circle */
 	if (drawflags & MAN_ROT_V) {
 		if (G.f & G_PICKSEL) glLoadName(MAN_ROT_V);
 		UI_ThemeColor(TH_TRANSFORM);
-		drawcircball(GL_LINE_LOOP, unitmat[3], 1.2f*size, unitmat);
+		drawcircball(GL_LINE_LOOP, unitmat[3], 1.2f * size, unitmat);
 
 		if (moving) {
 			float vec[3];
-			vec[0]= 0; // XXX (float)(t->imval[0] - t->center2d[0]);
-			vec[1]= 0; // XXX (float)(t->imval[1] - t->center2d[1]);
-			vec[2]= 0.0f;
+			vec[0] = 0; // XXX (float)(t->imval[0] - t->center2d[0]);
+			vec[1] = 0; // XXX (float)(t->imval[1] - t->center2d[1]);
+			vec[2] = 0.0f;
 			normalize_v3(vec);
-			mul_v3_fl(vec, 1.2f*size);
+			mul_v3_fl(vec, 1.2f * size);
 			glBegin(GL_LINES);
 			glVertex3f(0.0f, 0.0f, 0.0f);
 			glVertex3fv(vec);
@@ -932,22 +932,22 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 		// XXX mul_m4_m3m4(matt, t->mat, rv3d->twmat);
 		if (ortho) {
 			glMultMatrixf(matt);
-			glFrontFace(is_negative_m4(matt) ? GL_CW:GL_CCW);
+			glFrontFace(is_negative_m4(matt) ? GL_CW : GL_CCW);
 		}
 	}
 	else {
 		if (ortho) {
-			glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW:GL_CCW);
+			glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW : GL_CCW);
 			glMultMatrixf(rv3d->twmat);
 		}
 	}
 
 	/* axes */
-	if (arcs==0) {
+	if (arcs == 0) {
 		if (!(G.f & G_PICKSEL)) {
-			if ( (combo & V3D_MANIP_SCALE)==0) {
+			if ((combo & V3D_MANIP_SCALE) == 0) {
 				/* axis */
-				if ( (drawflags & MAN_ROT_X) || (moving && (drawflags & MAN_ROT_Z)) ) {
+				if ((drawflags & MAN_ROT_X) || (moving && (drawflags & MAN_ROT_Z))) {
 					preOrthoFront(ortho, rv3d->twmat, 2);
 					manipulator_setcolor(v3d, 'X', colcode, 255);
 					glBegin(GL_LINES);
@@ -956,7 +956,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 					glEnd();
 					postOrtho(ortho);
 				}
-				if ( (drawflags & MAN_ROT_Y) || (moving && (drawflags & MAN_ROT_X)) ) {
+				if ((drawflags & MAN_ROT_Y) || (moving && (drawflags & MAN_ROT_X))) {
 					preOrthoFront(ortho, rv3d->twmat, 0);
 					manipulator_setcolor(v3d, 'Y', colcode, 255);
 					glBegin(GL_LINES);
@@ -965,7 +965,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 					glEnd();
 					postOrtho(ortho);
 				}
-				if ( (drawflags & MAN_ROT_Z) || (moving && (drawflags & MAN_ROT_Y)) ) {
+				if ((drawflags & MAN_ROT_Z) || (moving && (drawflags & MAN_ROT_Y))) {
 					preOrthoFront(ortho, rv3d->twmat, 1);
 					manipulator_setcolor(v3d, 'Z', colcode, 255);
 					glBegin(GL_LINES);
@@ -978,7 +978,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 		}
 	}
 
-	if (arcs==0 && moving) {
+	if (arcs == 0 && moving) {
 
 		/* Z circle */
 		if (drawflags & MAN_ROT_Z) {
@@ -1020,7 +1020,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 			preOrthoFront(ortho, rv3d->twmat, 2);
 			if (G.f & G_PICKSEL) glLoadName(MAN_ROT_Z);
 			manipulator_setcolor(v3d, 'Z', colcode, 255);
-			partial_doughnut(cusize/4.0f, 1.0f, 0, 48, 8, 48);
+			partial_doughnut(cusize / 4.0f, 1.0f, 0, 48, 8, 48);
 			postOrtho(ortho);
 		}
 		/* X circle */
@@ -1029,7 +1029,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 			if (G.f & G_PICKSEL) glLoadName(MAN_ROT_X);
 			glRotatef(90.0, 0.0, 1.0, 0.0);
 			manipulator_setcolor(v3d, 'X', colcode, 255);
-			partial_doughnut(cusize/4.0f, 1.0f, 0, 48, 8, 48);
+			partial_doughnut(cusize / 4.0f, 1.0f, 0, 48, 8, 48);
 			glRotatef(-90.0, 0.0, 1.0, 0.0);
 			postOrtho(ortho);
 		}
@@ -1039,7 +1039,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 			if (G.f & G_PICKSEL) glLoadName(MAN_ROT_Y);
 			glRotatef(-90.0, 1.0, 0.0, 0.0);
 			manipulator_setcolor(v3d, 'Y', colcode, 255);
-			partial_doughnut(cusize/4.0f, 1.0f, 0, 48, 8, 48);
+			partial_doughnut(cusize / 4.0f, 1.0f, 0, 48, 8, 48);
 			glRotatef(90.0, 1.0, 0.0, 0.0);
 			postOrtho(ortho);
 		}
@@ -1047,7 +1047,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 		glDisable(GL_CLIP_PLANE0);
 	}
 
-	if (arcs==0) {
+	if (arcs == 0) {
 
 		/* Z handle on X axis */
 		if (drawflags & MAN_ROT_Z) {
@@ -1056,7 +1056,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 			if (G.f & G_PICKSEL) glLoadName(MAN_ROT_Z);
 			manipulator_setcolor(v3d, 'Z', colcode, 255);
 
-			partial_doughnut(0.7f*cusize, 1.0f, 31, 33, 8, 64);
+			partial_doughnut(0.7f * cusize, 1.0f, 31, 33, 8, 64);
 
 			glPopMatrix();
 			postOrtho(ortho);
@@ -1071,7 +1071,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 
 			glRotatef(90.0, 1.0, 0.0, 0.0);
 			glRotatef(90.0, 0.0, 0.0, 1.0);
-			partial_doughnut(0.7f*cusize, 1.0f, 31, 33, 8, 64);
+			partial_doughnut(0.7f * cusize, 1.0f, 31, 33, 8, 64);
 
 			glPopMatrix();
 			postOrtho(ortho);
@@ -1086,7 +1086,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 
 			glRotatef(-90.0, 0.0, 1.0, 0.0);
 			glRotatef(90.0, 0.0, 0.0, 1.0);
-			partial_doughnut(0.7f*cusize, 1.0f, 31, 33, 8, 64);
+			partial_doughnut(0.7f * cusize, 1.0f, 31, 33, 8, 64);
 
 			glPopMatrix();
 			postOrtho(ortho);
@@ -1104,56 +1104,57 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 static void drawsolidcube(float size)
 {
 	static float cube[8][3] = {
-	    {-1.0, -1.0, -1.0},
-	    {-1.0, -1.0,  1.0},
-	    {-1.0,  1.0,  1.0},
-	    {-1.0,  1.0, -1.0},
-	    { 1.0, -1.0, -1.0},
-	    { 1.0, -1.0,  1.0},
-	    { 1.0,  1.0,  1.0},
-	    { 1.0,  1.0, -1.0}, };
+		{-1.0, -1.0, -1.0},
+		{-1.0, -1.0,  1.0},
+		{-1.0,  1.0,  1.0},
+		{-1.0,  1.0, -1.0},
+		{ 1.0, -1.0, -1.0},
+		{ 1.0, -1.0,  1.0},
+		{ 1.0,  1.0,  1.0},
+		{ 1.0,  1.0, -1.0},
+	};
 	float n[3] = {0.0f};
 
 	glPushMatrix();
 	glScalef(size, size, size);
 
 	glBegin(GL_QUADS);
-	n[0]= -1.0;
+	n[0] = -1.0;
 	glNormal3fv(n);
 	glVertex3fv(cube[0]); glVertex3fv(cube[1]); glVertex3fv(cube[2]); glVertex3fv(cube[3]);
-	n[0]=0;
+	n[0] = 0;
 	glEnd();
 
 	glBegin(GL_QUADS);
-	n[1]= -1.0;
+	n[1] = -1.0;
 	glNormal3fv(n);
 	glVertex3fv(cube[0]); glVertex3fv(cube[4]); glVertex3fv(cube[5]); glVertex3fv(cube[1]);
-	n[1]=0;
+	n[1] = 0;
 	glEnd();
 
 	glBegin(GL_QUADS);
-	n[0]= 1.0;
+	n[0] = 1.0;
 	glNormal3fv(n);
 	glVertex3fv(cube[4]); glVertex3fv(cube[7]); glVertex3fv(cube[6]); glVertex3fv(cube[5]);
-	n[0]=0;
+	n[0] = 0;
 	glEnd();
 
 	glBegin(GL_QUADS);
-	n[1]= 1.0;
+	n[1] = 1.0;
 	glNormal3fv(n);
 	glVertex3fv(cube[7]); glVertex3fv(cube[3]); glVertex3fv(cube[2]); glVertex3fv(cube[6]);
-	n[1]=0;
+	n[1] = 0;
 	glEnd();
 
 	glBegin(GL_QUADS);
-	n[2]= 1.0;
+	n[2] = 1.0;
 	glNormal3fv(n);
 	glVertex3fv(cube[1]); glVertex3fv(cube[5]); glVertex3fv(cube[6]); glVertex3fv(cube[2]);
-	n[2]=0;
+	n[2] = 0;
 	glEnd();
 
 	glBegin(GL_QUADS);
-	n[2]= -1.0;
+	n[2] = -1.0;
 	glNormal3fv(n);
 	glVertex3fv(cube[7]); glVertex3fv(cube[4]); glVertex3fv(cube[0]); glVertex3fv(cube[3]);
 	glEnd();
@@ -1164,32 +1165,32 @@ static void drawsolidcube(float size)
 
 static void draw_manipulator_scale(View3D *v3d, RegionView3D *rv3d, int moving, int drawflags, int combo, int colcode)
 {
-	float cywid= 0.25f*0.01f*(float)U.tw_handlesize;
-	float cusize= cywid*0.75f, dz;
+	float cywid = 0.25f * 0.01f * (float)U.tw_handlesize;
+	float cusize = cywid * 0.75f, dz;
 
 	/* when called while moving in mixed mode, do not draw when... */
-	if ((drawflags & MAN_SCALE_C)==0) return;
+	if ((drawflags & MAN_SCALE_C) == 0) return;
 
 	glDisable(GL_DEPTH_TEST);
 
 	/* not in combo mode */
-	if ( (combo & (V3D_MANIP_TRANSLATE|V3D_MANIP_ROTATE))==0) {
+	if ((combo & (V3D_MANIP_TRANSLATE | V3D_MANIP_ROTATE)) == 0) {
 		float size, unitmat[4][4];
-		int shift= 0; // XXX
+		int shift = 0; // XXX
 
 		/* center circle, do not add to selection when shift is pressed (planar constraint)  */
-		if ( (G.f & G_PICKSEL) && shift==0) glLoadName(MAN_SCALE_C);
+		if ((G.f & G_PICKSEL) && shift == 0) glLoadName(MAN_SCALE_C);
 
 		manipulator_setcolor(v3d, 'C', colcode, 255);
 		glPushMatrix();
-		size= screen_aligned(rv3d, rv3d->twmat);
+		size = screen_aligned(rv3d, rv3d->twmat);
 		unit_m4(unitmat);
-		drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f*size, unitmat);
+		drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f * size, unitmat);
 		glPopMatrix();
 
-		dz= 1.0;
+		dz = 1.0;
 	}
-	else dz= 1.0f-4.0f*cusize;
+	else dz = 1.0f - 4.0f * cusize;
 
 	if (moving) {
 		float matt[4][4];
@@ -1197,11 +1198,11 @@ static void draw_manipulator_scale(View3D *v3d, RegionView3D *rv3d, int moving,
 		copy_m4_m4(matt, rv3d->twmat); // to copy the parts outside of [3][3]
 		// XXX mul_m4_m3m4(matt, t->mat, rv3d->twmat);
 		glMultMatrixf(matt);
-		glFrontFace(is_negative_m4(matt) ? GL_CW:GL_CCW);
+		glFrontFace(is_negative_m4(matt) ? GL_CW : GL_CCW);
 	}
 	else {
 		glMultMatrixf(rv3d->twmat);
-		glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW:GL_CCW);
+		glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW : GL_CCW);
 	}
 
 	/* axis */
@@ -1233,7 +1234,7 @@ static void draw_manipulator_scale(View3D *v3d, RegionView3D *rv3d, int moving,
 
 	/* if shiftkey, center point as last, for selectbuffer order */
 	if (G.f & G_PICKSEL) {
-		int shift= 0; // XXX
+		int shift = 0; // XXX
 
 		if (shift) {
 			glTranslatef(0.0, -dz, 0.0);
@@ -1254,55 +1255,55 @@ static void draw_manipulator_scale(View3D *v3d, RegionView3D *rv3d, int moving,
 
 static void draw_cone(GLUquadricObj *qobj, float len, float width)
 {
-	glTranslatef(0.0, 0.0, -0.5f*len);
+	glTranslatef(0.0, 0.0, -0.5f * len);
 	gluCylinder(qobj, width, 0.0, len, 8, 1);
 	gluQuadricOrientation(qobj, GLU_INSIDE);
 	gluDisk(qobj, 0.0, width, 8, 1);
 	gluQuadricOrientation(qobj, GLU_OUTSIDE);
-	glTranslatef(0.0, 0.0, 0.5f*len);
+	glTranslatef(0.0, 0.0, 0.5f * len);
 }
 
 static void draw_cylinder(GLUquadricObj *qobj, float len, float width)
 {
 
-	width*= 0.8f;	// just for beauty
+	width *= 0.8f;   // just for beauty
 
-	glTranslatef(0.0, 0.0, -0.5f*len);
+	glTranslatef(0.0, 0.0, -0.5f * len);
 	gluCylinder(qobj, width, width, len, 8, 1);
 	gluQuadricOrientation(qobj, GLU_INSIDE);
 	gluDisk(qobj, 0.0, width, 8, 1);
 	gluQuadricOrientation(qobj, GLU_OUTSIDE);
 	glTranslatef(0.0, 0.0, len);
 	gluDisk(qobj, 0.0, width, 8, 1);
-	glTranslatef(0.0, 0.0, -0.5f*len);
+	glTranslatef(0.0, 0.0, -0.5f * len);
 }
 
 
 static void draw_manipulator_translate(View3D *v3d, RegionView3D *rv3d, int UNUSED(moving), int drawflags, int combo, int colcode)
 {
 	GLUquadricObj *qobj;
-	float cylen= 0.01f*(float)U.tw_handlesize;
-	float cywid= 0.25f*cylen, dz, size;
+	float cylen = 0.01f * (float)U.tw_handlesize;
+	float cywid = 0.25f * cylen, dz, size;
 	float unitmat[4][4];
-	int shift= 0; // XXX
+	int shift = 0; // XXX
 
 	/* when called while moving in mixed mode, do not draw when... */
-	if ((drawflags & MAN_TRANS_C)==0) return;
+	if ((drawflags & MAN_TRANS_C) == 0) return;
 
 	// XXX if (moving) glTranslatef(t->vec[0], t->vec[1], t->vec[2]);
 	glDisable(GL_DEPTH_TEST);
 
-	qobj= gluNewQuadric();
+	qobj = gluNewQuadric();
 	gluQuadricDrawStyle(qobj, GLU_FILL);
 
 	/* center circle, do not add to selection when shift is pressed (planar constraint) */
-	if ( (G.f & G_PICKSEL) && shift==0) glLoadName(MAN_TRANS_C);
+	if ((G.f & G_PICKSEL) && shift == 0) glLoadName(MAN_TRANS_C);
 
 	manipulator_setcolor(v3d, 'C', colcode, 255);
 	glPushMatrix();
-	size= screen_aligned(rv3d, rv3d->twmat);
+	size = screen_aligned(rv3d, rv3d->twmat);
 	unit_m4(unitmat);
-	drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f*size, unitmat);
+	drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f * size, unitmat);
 	glPopMatrix();
 
 	/* and now apply matrix, we move to local matrix drawing */
@@ -1312,14 +1313,14 @@ static void draw_manipulator_translate(View3D *v3d, RegionView3D *rv3d, int UNUS
 	glLoadName(-1);
 
 	// translate drawn as last, only axis when no combo with scale, or for ghosting
-	if ((combo & V3D_MANIP_SCALE)==0 || colcode==MAN_GHOST)
+	if ((combo & V3D_MANIP_SCALE) == 0 || colcode == MAN_GHOST)
 		draw_manipulator_axes(v3d, rv3d, colcode, drawflags & MAN_TRANS_X, drawflags & MAN_TRANS_Y, drawflags & MAN_TRANS_Z);
 
 
 	/* offset in combo mode, for rotate a bit more */
-	if (combo & (V3D_MANIP_ROTATE)) dz= 1.0f+2.0f*cylen;
-	else if (combo & (V3D_MANIP_SCALE)) dz= 1.0f+0.5f*cylen;
-	else dz= 1.0f;
+	if (combo & (V3D_MANIP_ROTATE)) dz = 1.0f + 2.0f * cylen;
+	else if (combo & (V3D_MANIP_SCALE)) dz = 1.0f + 0.5f * cylen;
+	else dz = 1.0f;
 
 	/* Z Cone */
 	glTranslatef(0.0, 0.0, dz);
@@ -1357,35 +1358,35 @@ static void draw_manipulator_rotate_cyl(View3D *v3d, RegionView3D *rv3d, int mov
 {
 	GLUquadricObj *qobj;
 	float size;
-	float cylen= 0.01f*(float)U.tw_handlesize;
-	float cywid= 0.25f*cylen;
+	float cylen = 0.01f * (float)U.tw_handlesize;
+	float cywid = 0.25f * cylen;
 
 	/* when called while moving in mixed mode, do not draw when... */
-	if ((drawflags & MAN_ROT_C)==0) return;
+	if ((drawflags & MAN_ROT_C) == 0) return;
 
 	/* prepare for screen aligned draw */
 	glPushMatrix();
-	size= screen_aligned(rv3d, rv3d->twmat);
+	size = screen_aligned(rv3d, rv3d->twmat);
 
 	glDisable(GL_DEPTH_TEST);
 
-	qobj= gluNewQuadric();
+	qobj = gluNewQuadric();
 
 	/* Screen aligned view rot circle */
 	if (drawflags & MAN_ROT_V) {
-		float unitmat[4][4]= MAT4_UNITY;
+		float unitmat[4][4] = MAT4_UNITY;
 
 		if (G.f & G_PICKSEL) glLoadName(MAN_ROT_V);
 		UI_ThemeColor(TH_TRANSFORM);
-		drawcircball(GL_LINE_LOOP, unitmat[3], 1.2f*size, unitmat);
+		drawcircball(GL_LINE_LOOP, unitmat[3], 1.2f * size, unitmat);
 
 		if (moving) {
 			float vec[3];
-			vec[0]= 0; // XXX (float)(t->imval[0] - t->center2d[0]);
-			vec[1]= 0; // XXX (float)(t->imval[1] - t->center2d[1]);
-			vec[2]= 0.0f;
+			vec[0] = 0; // XXX (float)(t->imval[0] - t->center2d[0]);
+			vec[1] = 0; // XXX (float)(t->imval[1] - t->center2d[1]);
+			vec[2] = 0.0f;
 			normalize_v3(vec);
-			mul_v3_fl(vec, 1.2f*size);
+			mul_v3_fl(vec, 1.2f * size);
 			glBegin(GL_LINES);
 			glVertex3f(0.0, 0.0, 0.0);
 			glVertex3fv(vec);
@@ -1398,8 +1399,8 @@ static void draw_manipulator_rotate_cyl(View3D *v3d, RegionView3D *rv3d, int mov
 	if (moving) {
 		float matt[4][4];
 		copy_m4_m4(matt, rv3d->twmat); // to copy the parts outside of [3][3]
-		// XXX 		if (t->flag & T_USES_MANIPULATOR) {
-		// XXX 			mul_m4_m3m4(matt, t->mat, rv3d->twmat);
+		// XXX      if (t->flag & T_USES_MANIPULATOR) {
+		// XXX          mul_m4_m3m4(matt, t->mat, rv3d->twmat);
 		// XXX }
 		glMultMatrixf(matt);
 	}
@@ -1407,13 +1408,13 @@ static void draw_manipulator_rotate_cyl(View3D *v3d, RegionView3D *rv3d, int mov
 		glMultMatrixf(rv3d->twmat);
 	}
 
-	glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW:GL_CCW);
+	glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW : GL_CCW);
 
 	/* axis */
-	if ( (G.f & G_PICKSEL)==0 ) {
+	if ((G.f & G_PICKSEL) == 0) {
 
 		// only draw axis when combo didn't draw scale axes
-		if ((combo & V3D_MANIP_SCALE)==0)
+		if ((combo & V3D_MANIP_SCALE) == 0)
 			draw_manipulator_axes(v3d, rv3d, colcode, drawflags & MAN_ROT_X, drawflags & MAN_ROT_Y, drawflags & MAN_ROT_Z);
 
 		/* only has to be set when not in picking */
@@ -1459,15 +1460,15 @@ static void draw_manipulator_rotate_cyl(View3D *v3d, RegionView3D *rv3d, int mov
 
 /* main call, does calc centers & orientation too */
 /* uses global G.moving */
-static int drawflags= 0xFFFF;		// only for the calls below, belongs in scene...?
+static int drawflags = 0xFFFF;       // only for the calls below, belongs in scene...?
 
 void BIF_draw_manipulator(const bContext *C)
 {
-	ScrArea *sa= CTX_wm_area(C);
-	ARegion *ar= CTX_wm_region(C);
-	Scene *scene= CTX_data_scene(C);
-	View3D *v3d= sa->spacedata.first;
-	RegionView3D *rv3d= ar->regiondata;
+	ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = CTX_wm_region(C);
+	Scene *scene = CTX_data_scene(C);
+	View3D *v3d = sa->spacedata.first;
+	RegionView3D *rv3d = ar->regiondata;
 	int totsel;
 
 	if (!(v3d->twflag & V3D_USE_MANIPULATOR)) return;
@@ -1477,38 +1478,38 @@ void BIF_draw_manipulator(const bContext *C)
 	{
 		v3d->twflag &= ~V3D_DRAW_MANIPULATOR;
 
-		totsel= calc_manipulator_stats(C);
-		if (totsel==0) return;
+		totsel = calc_manipulator_stats(C);
+		if (totsel == 0) return;
 
 		v3d->twflag |= V3D_DRAW_MANIPULATOR;
 
 		/* now we can define center */
 		switch (v3d->around) {
-		case V3D_CENTER:
-		case V3D_ACTIVE:
-			rv3d->twmat[3][0]= (scene->twmin[0] + scene->twmax[0])/2.0f;
-			rv3d->twmat[3][1]= (scene->twmin[1] + scene->twmax[1])/2.0f;
-			rv3d->twmat[3][2]= (scene->twmin[2] + scene->twmax[2])/2.0f;
-			if (v3d->around==V3D_ACTIVE && scene->obedit==NULL) {
-				Object *ob= OBACT;
-				if (ob && !(ob->mode & OB_MODE_POSE))
-					copy_v3_v3(rv3d->twmat[3], ob->obmat[3]);
-			}
-			break;
-		case V3D_LOCAL:
-		case V3D_CENTROID:
-			copy_v3_v3(rv3d->twmat[3], scene->twcent);
-			break;
-		case V3D_CURSOR:
-			copy_v3_v3(rv3d->twmat[3], give_cursor(scene, v3d));
-			break;
+			case V3D_CENTER:
+			case V3D_ACTIVE:
+				rv3d->twmat[3][0] = (scene->twmin[0] + scene->twmax[0]) / 2.0f;
+				rv3d->twmat[3][1] = (scene->twmin[1] + scene->twmax[1]) / 2.0f;
+				rv3d->twmat[3][2] = (scene->twmin[2] + scene->twmax[2]) / 2.0f;
+				if (v3d->around == V3D_ACTIVE && scene->obedit == NULL) {
+					Object *ob = OBACT;
+					if (ob && !(ob->mode & OB_MODE_POSE))
+						copy_v3_v3(rv3d->twmat[3], ob->obmat[3]);
+				}
+				break;
+			case V3D_LOCAL:
+			case V3D_CENTROID:
+				copy_v3_v3(rv3d->twmat[3], scene->twcent);
+				break;
+			case V3D_CURSOR:
+				copy_v3_v3(rv3d->twmat[3], give_cursor(scene, v3d));
+				break;
 		}
 
 		mul_mat3_m4_fl(rv3d->twmat, ED_view3d_pixel_size(rv3d, rv3d->twmat[3]) * U.tw_size * 5.0f);
 	}
 
 	test_manipulator_axis(C);
-	drawflags= rv3d->twdrawflag;	/* set in calc_manipulator_stats */
+	drawflags = rv3d->twdrawflag;    /* set in calc_manipulator_stats */
 
 	if (v3d->twflag & V3D_DRAW_MANIPULATOR) {
 
@@ -1516,7 +1517,7 @@ void BIF_draw_manipulator(const bContext *C)
 		glEnable(GL_BLEND);
 		if (v3d->twtype & V3D_MANIP_ROTATE) {
 
-			if (G.rt==3) {
+			if (G.rt == 3) {
 				if (G.moving) draw_manipulator_rotate_cyl(v3d, rv3d, 1, drawflags, v3d->twtype, MAN_MOVECOL);
 				else draw_manipulator_rotate_cyl(v3d, rv3d, 0, drawflags, v3d->twtype, MAN_RGB);
 			}
@@ -1536,31 +1537,31 @@ void BIF_draw_manipulator(const bContext *C)
 
 static int manipulator_selectbuf(ScrArea *sa, ARegion *ar, const int mval[2], float hotspot)
 {
-	View3D *v3d= sa->spacedata.first;
-	RegionView3D *rv3d= ar->regiondata;
+	View3D *v3d = sa->spacedata.first;
+	RegionView3D *rv3d = ar->regiondata;
 	rctf rect;
-	GLuint buffer[64];		// max 4 items per select, so large enuf
+	GLuint buffer[64];      // max 4 items per select, so large enuf
 	short hits;
 	extern void setwinmatrixview3d(ARegion *ar, View3D *v3d, rctf *rect); // XXX check a bit later on this... (ton)
 
 	G.f |= G_PICKSEL;
 
-	rect.xmin = mval[0]-hotspot;
-	rect.xmax = mval[0]+hotspot;
-	rect.ymin = mval[1]-hotspot;
-	rect.ymax = mval[1]+hotspot;
+	rect.xmin = mval[0] - hotspot;
+	rect.xmax = mval[0] + hotspot;
+	rect.ymin = mval[1] - hotspot;
+	rect.ymax = mval[1] + hotspot;
 
 	setwinmatrixview3d(ar, v3d, &rect);
 	mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat);
 
 	glSelectBuffer(64, buffer);
 	glRenderMode(GL_SELECT);
-	glInitNames();	/* these two calls whatfor? It doesnt work otherwise */
+	glInitNames();  /* these two calls whatfor? It doesnt work otherwise */
 	glPushName(-2);
 
 	/* do the drawing */
 	if (v3d->twtype & V3D_MANIP_ROTATE) {
-		if (G.rt==3) draw_manipulator_rotate_cyl(v3d, rv3d, 0, MAN_ROT_C & rv3d->twdrawflag, v3d->twtype, MAN_RGB);
+		if (G.rt == 3) draw_manipulator_rotate_cyl(v3d, rv3d, 0, MAN_ROT_C & rv3d->twdrawflag, v3d->twtype, MAN_RGB);
 		else draw_manipulator_rotate(v3d, rv3d, 0, MAN_ROT_C & rv3d->twdrawflag, v3d->twtype);
 	}
 	if (v3d->twtype & V3D_MANIP_SCALE)
@@ -1569,37 +1570,37 @@ static int manipulator_selectbuf(ScrArea *sa, ARegion *ar, const int mval[2], fl
 		draw_manipulator_translate(v3d, rv3d, 0, MAN_TRANS_C & rv3d->twdrawflag, v3d->twtype, MAN_RGB);
 
 	glPopName();
-	hits= glRenderMode(GL_RENDER);
+	hits = glRenderMode(GL_RENDER);
 
 	G.f &= ~G_PICKSEL;
 	setwinmatrixview3d(ar, v3d, NULL);
 	mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat);
 
-	if (hits==1) return buffer[3];
-	else if (hits>1) {
-		GLuint val, dep, mindep=0, mindeprot=0, minval=0, minvalrot=0;
+	if (hits == 1) return buffer[3];
+	else if (hits > 1) {
+		GLuint val, dep, mindep = 0, mindeprot = 0, minval = 0, minvalrot = 0;
 		int a;
 
 		/* we compare the hits in buffer, but value centers highest */
 		/* we also store the rotation hits separate (because of arcs) and return hits on other widgets if there are */
 
-		for (a=0; a<hits; a++) {
-			dep= buffer[4*a + 1];
-			val= buffer[4*a + 3];
+		for (a = 0; a < hits; a++) {
+			dep = buffer[4 * a + 1];
+			val = buffer[4 * a + 3];
 
-			if (val==MAN_TRANS_C) return MAN_TRANS_C;
-			else if (val==MAN_SCALE_C) return MAN_SCALE_C;
+			if (val == MAN_TRANS_C) return MAN_TRANS_C;
+			else if (val == MAN_SCALE_C) return MAN_SCALE_C;
 			else {
 				if (val & MAN_ROT_C) {
-					if (minvalrot==0 || dep<mindeprot) {
-						mindeprot= dep;
-						minvalrot= val;
+					if (minvalrot == 0 || dep < mindeprot) {
+						mindeprot = dep;
+						minvalrot = val;
 					}
 				}
 				else {
-					if (minval==0 || dep<mindep) {
-						mindep= dep;
-						minval= val;
+					if (minval == 0 || dep < mindep) {
+						mindep = dep;
+						minval = val;
 					}
 				}
 			}
@@ -1617,9 +1618,9 @@ static int manipulator_selectbuf(ScrArea *sa, ARegion *ar, const int mval[2], fl
 /* return 0; nothing happened */
 int BIF_do_manipulator(bContext *C, struct wmEvent *event, wmOperator *op)
 {
-	ScrArea *sa= CTX_wm_area(C);
-	View3D *v3d= sa->spacedata.first;
-	ARegion *ar= CTX_wm_region(C);
+	ScrArea *sa = CTX_wm_area(C);
+	View3D *v3d = sa->spacedata.first;
+	ARegion *ar = CTX_wm_region(C);
 	int constraint_axis[3] = {0, 0, 0};
 	int val;
 	int shift = event->shift;
@@ -1631,41 +1632,41 @@ int BIF_do_manipulator(bContext *C, struct wmEvent *event, wmOperator *op)
 	RNA_enum_set(op->ptr, "constraint_orientation", v3d->twmode);
 
 	// find the hotspots first test narrow hotspot
-	val= manipulator_selectbuf(sa, ar, event->mval, 0.5f*(float)U.tw_hotspot);
+	val = manipulator_selectbuf(sa, ar, event->mval, 0.5f * (float)U.tw_hotspot);
 	if (val) {
 
 		// drawflags still global, for drawing call above
-		drawflags= manipulator_selectbuf(sa, ar, event->mval, 0.2f*(float)U.tw_hotspot);
-		if (drawflags==0) drawflags= val;
+		drawflags = manipulator_selectbuf(sa, ar, event->mval, 0.2f * (float)U.tw_hotspot);
+		if (drawflags == 0) drawflags = val;
 
 		if (drawflags & MAN_TRANS_C) {
 			switch (drawflags) {
-			case MAN_TRANS_C:
-				break;
-			case MAN_TRANS_X:
-				if (shift) {
-					constraint_axis[1] = 1;
-					constraint_axis[2] = 1;
-				}
-				else
-					constraint_axis[0] = 1;
-				break;
-			case MAN_TRANS_Y:
-				if (shift) {
-					constraint_axis[0] = 1;
-					constraint_axis[2] = 1;
-				}
-				else
-					constraint_axis[1] = 1;
-				break;
-			case MAN_TRANS_Z:
-				if (shift) {
-					constraint_axis[0] = 1;
-					constraint_axis[1] = 1;
-				}
-				else
-					constraint_axis[2] = 1;
-				break;
+				case MAN_TRANS_C:
+					break;
+				case MAN_TRANS_X:
+					if (shift) {
+						constraint_axis[1] = 1;
+						constraint_axis[2] = 1;
+					}
+					else
+						constraint_axis[0] = 1;
+					break;
+				case MAN_TRANS_Y:
+					if (shift) {
+						constraint_axis[0] = 1;
+						constraint_axis[2] = 1;
+					}
+					else
+						constraint_axis[1] = 1;
+					break;
+				case MAN_TRANS_Z:
+					if (shift) {
+						constraint_axis[0] = 1;
+						constraint_axis[1] = 1;
+					}
+					else
+						constraint_axis[2] = 1;
+					break;
 			}
 			RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
 			WM_operator_name_call(C, "TRANSFORM_OT_translate", WM_OP_INVOKE_DEFAULT, op->ptr);
@@ -1673,30 +1674,30 @@ int BIF_do_manipulator(bContext *C, struct wmEvent *event, wmOperator *op)
 		}
 		else if (drawflags & MAN_SCALE_C) {
 			switch (drawflags) {
-			case MAN_SCALE_X:
-				if (shift) {
-					constraint_axis[1] = 1;
-					constraint_axis[2] = 1;
-				}
-				else
-					constraint_axis[0] = 1;
-				break;
-			case MAN_SCALE_Y:
-				if (shift) {
-					constraint_axis[0] = 1;
-					constraint_axis[2] = 1;
-				}
-				else
-					constraint_axis[1] = 1;
-				break;
-			case MAN_SCALE_Z:
-				if (shift) {
-					constraint_axis[0] = 1;
-					constraint_axis[1] = 1;
-				}
-				else
-					constraint_axis[2] = 1;
-				break;
+				case MAN_SCALE_X:
+					if (shift) {
+						constraint_axis[1] = 1;
+						constraint_axis[2] = 1;
+					}
+					else
+						constraint_axis[0] = 1;
+					break;
+				case MAN_SCALE_Y:
+					if (shift) {
+						constraint_axis[0] = 1;
+						constraint_axis[2] = 1;
+					}
+					else
+						constraint_axis[1] = 1;
+					break;
+				case MAN_SCALE_Z:
+					if (shift) {
+						constraint_axis[0] = 1;
+						constraint_axis[1] = 1;
+					}
+					else
+						constraint_axis[2] = 1;
+					break;
 			}
 			RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
 			WM_operator_name_call(C, "TRANSFORM_OT_resize", WM_OP_INVOKE_DEFAULT, op->ptr);
@@ -1708,15 +1709,15 @@ int BIF_do_manipulator(bContext *C, struct wmEvent *event, wmOperator *op)
 		}
 		else if (drawflags & MAN_ROT_C) {
 			switch (drawflags) {
-			case MAN_ROT_X:
-				constraint_axis[0] = 1;
-				break;
-			case MAN_ROT_Y:
-				constraint_axis[1] = 1;
-				break;
-			case MAN_ROT_Z:
-				constraint_axis[2] = 1;
-				break;
+				case MAN_ROT_X:
+					constraint_axis[0] = 1;
+					break;
+				case MAN_ROT_Y:
+					constraint_axis[1] = 1;
+					break;
+				case MAN_ROT_Z:
+					constraint_axis[2] = 1;
+					break;
 			}
 			RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
 			WM_operator_name_call(C, "TRANSFORM_OT_rotate", WM_OP_INVOKE_DEFAULT, op->ptr);
@@ -1724,7 +1725,7 @@ int BIF_do_manipulator(bContext *C, struct wmEvent *event, wmOperator *op)
 		}
 	}
 	/* after transform, restore drawflags */
-	drawflags= 0xFFFF;
+	drawflags = 0xFFFF;
 
 	return val;
 }