style cleanup: mostly whitespace around operators

1 files changed, 1293 insertions, 1292 deletions

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index b78d5b23e3f..0332bd0bdb7 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -55,7 +55,7 @@
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_anim.h"			//for the where_on_path function
+#include "BKE_anim.h"  //for the where_on_path function
 #include "BKE_armature.h"
 #include "BKE_camera.h"
 #include "BKE_constraint.h" // for the get_constraint_target function
@@ -107,18 +107,18 @@
 #include "wm_subwindow.h"
 #include "BLF_api.h"
 
-#include "view3d_intern.h"	// own include
+#include "view3d_intern.h"  // own include
 
 
 /* this condition has been made more complex since editmode can draw textures */
 #define CHECK_OB_DRAWTEXTURE(vd, dt)                                          \
-	((ELEM(vd->drawtype, OB_TEXTURE, OB_MATERIAL) && dt>OB_SOLID) ||          \
-	(vd->drawtype==OB_SOLID && vd->flag2 & V3D_SOLID_TEX))
+    ((ELEM(vd->drawtype, OB_TEXTURE, OB_MATERIAL) && dt > OB_SOLID) ||          \
+     (vd->drawtype == OB_SOLID && vd->flag2 & V3D_SOLID_TEX))
 
 typedef enum eWireDrawMode {
-	OBDRAW_WIRE_OFF= 0,
-	OBDRAW_WIRE_ON= 1,
-	OBDRAW_WIRE_ON_DEPTH= 2
+	OBDRAW_WIRE_OFF = 0,
+	OBDRAW_WIRE_ON = 1,
+	OBDRAW_WIRE_ON_DEPTH = 2
 } eWireDrawMode;
 
 /* user data structures for derived mesh callbacks */
@@ -195,7 +195,7 @@ static int check_ob_drawface_dot(Scene *sce, View3D *vd, char dt)
 		return 1;
 
 	/* if its drawing textures with zbuf sel, then don't draw dots */
-	if (dt==OB_TEXTURE && vd->drawtype==OB_TEXTURE)
+	if (dt == OB_TEXTURE && vd->drawtype == OB_TEXTURE)
 		return 0;
 
 	if ((vd->drawtype >= OB_SOLID) && (vd->flag2 & V3D_SOLID_TEX))
@@ -209,10 +209,10 @@ static int check_ob_drawface_dot(Scene *sce, View3D *vd, char dt)
  * */
 static void view3d_project_short_clip(ARegion *ar, const float vec[3], short adr[2], int is_local)
 {
-	RegionView3D *rv3d= ar->regiondata;
+	RegionView3D *rv3d = ar->regiondata;
 	float fx, fy, vec4[4];
 	
-	adr[0]= IS_CLIPPED;
+	adr[0] = IS_CLIPPED;
 	
 	/* clipplanes in eye space */
 	if (rv3d->rflag & RV3D_CLIPPING) {
@@ -221,21 +221,21 @@ static void view3d_project_short_clip(ARegion *ar, const float vec[3], short adr
 	}
 	
 	copy_v3_v3(vec4, vec);
-	vec4[3]= 1.0;
+	vec4[3] = 1.0;
 	
 	mul_m4_v4(rv3d->persmatob, vec4);
 	
 	/* clipplanes in window space */
-	if ( vec4[3] > (float)BL_NEAR_CLIP ) {	/* is the NEAR clipping cutoff for picking */
-		fx= (ar->winx/2)*(1 + vec4[0]/vec4[3]);
+	if (vec4[3] > (float)BL_NEAR_CLIP) {    /* is the NEAR clipping cutoff for picking */
+		fx = (ar->winx / 2) * (1 + vec4[0] / vec4[3]);
 		
-		if ( fx>0 && fx<ar->winx) {
+		if (fx > 0 && fx < ar->winx) {
 			
-			fy= (ar->winy/2)*(1 + vec4[1]/vec4[3]);
+			fy = (ar->winy / 2) * (1 + vec4[1] / vec4[3]);
 			
 			if (fy > 0.0f && fy < (float)ar->winy) {
-				adr[0]= (short)floorf(fx);
-				adr[1]= (short)floorf(fy);
+				adr[0] = (short)floorf(fx);
+				adr[1] = (short)floorf(fy);
 			}
 		}
 	}
@@ -244,28 +244,28 @@ static void view3d_project_short_clip(ARegion *ar, const float vec[3], short adr
 /* BMESH NOTE: this function is unused in bmesh only */
 
 /* only use while object drawing */
-static void UNUSED_FUNCTION(view3d_project_short_noclip)(ARegion *ar, const float vec[3], short adr[2])
+static void UNUSED_FUNCTION(view3d_project_short_noclip) (ARegion * ar, const float vec[3], short adr[2])
 {
-	RegionView3D *rv3d= ar->regiondata;
+	RegionView3D *rv3d = ar->regiondata;
 	float fx, fy, vec4[4];
 	
-	adr[0]= IS_CLIPPED;
+	adr[0] = IS_CLIPPED;
 	
 	copy_v3_v3(vec4, vec);
-	vec4[3]= 1.0;
+	vec4[3] = 1.0;
 	
 	mul_m4_v4(rv3d->persmatob, vec4);
 	
-	if ( vec4[3] > (float)BL_NEAR_CLIP ) {	/* is the NEAR clipping cutoff for picking */
-		fx= (ar->winx/2)*(1 + vec4[0]/vec4[3]);
+	if (vec4[3] > (float)BL_NEAR_CLIP) {    /* is the NEAR clipping cutoff for picking */
+		fx = (ar->winx / 2) * (1 + vec4[0] / vec4[3]);
 		
-		if ( fx>-32700 && fx<32700) {
+		if (fx > -32700 && fx < 32700) {
 			
-			fy= (ar->winy/2)*(1 + vec4[1]/vec4[3]);
+			fy = (ar->winy / 2) * (1 + vec4[1] / vec4[3]);
 			
 			if (fy > -32700.0f && fy < 32700.0f) {
-				adr[0]= (short)floorf(fx);
-				adr[1]= (short)floorf(fy);
+				adr[0] = (short)floorf(fx);
+				adr[1] = (short)floorf(fy);
 			}
 		}
 	}
@@ -274,10 +274,10 @@ static void UNUSED_FUNCTION(view3d_project_short_noclip)(ARegion *ar, const floa
 /* same as view3d_project_short_clip but use persmat instead of persmatob for projection */
 static void view3d_project_short_clip_persmat(ARegion *ar, const float vec[3], short adr[2], int is_local)
 {
-	RegionView3D *rv3d= ar->regiondata;
+	RegionView3D *rv3d = ar->regiondata;
 	float fx, fy, vec4[4];
 
-	adr[0]= IS_CLIPPED;
+	adr[0] = IS_CLIPPED;
 
 	/* clipplanes in eye space */
 	if (rv3d->rflag & RV3D_CLIPPING) {
@@ -286,21 +286,21 @@ static void view3d_project_short_clip_persmat(ARegion *ar, const float vec[3], s
 	}
 
 	copy_v3_v3(vec4, vec);
-	vec4[3]= 1.0;
+	vec4[3] = 1.0;
 
 	mul_m4_v4(rv3d->persmat, vec4);
 
 	/* clipplanes in window space */
-	if ( vec4[3] > (float)BL_NEAR_CLIP ) {	/* is the NEAR clipping cutoff for picking */
-		fx= (ar->winx/2)*(1 + vec4[0]/vec4[3]);
+	if (vec4[3] > (float)BL_NEAR_CLIP) {    /* is the NEAR clipping cutoff for picking */
+		fx = (ar->winx / 2) * (1 + vec4[0] / vec4[3]);
 
-		if ( fx>0 && fx<ar->winx) {
+		if (fx > 0 && fx < ar->winx) {
 
-			fy= (ar->winy/2)*(1 + vec4[1]/vec4[3]);
+			fy = (ar->winy / 2) * (1 + vec4[1] / vec4[3]);
 
 			if (fy > 0.0f && fy < (float)ar->winy) {
-				adr[0]= (short)floorf(fx);
-				adr[1]= (short)floorf(fy);
+				adr[0] = (short)floorf(fx);
+				adr[1] = (short)floorf(fy);
 			}
 		}
 	}
@@ -317,7 +317,7 @@ int draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, int dt)
 		return 0;
 	if (!CHECK_OB_DRAWTEXTURE(v3d, dt))
 		return 0;
-	if (ob==OBACT && (ob && ob->mode & OB_MODE_WEIGHT_PAINT))
+	if (ob == OBACT && (ob && ob->mode & OB_MODE_WEIGHT_PAINT))
 		return 0;
 	if (scene_use_new_shading_nodes(scene))
 		return 0;
@@ -336,14 +336,13 @@ static int check_alpha_pass(Base *base)
 	return (base->object->dtx & OB_DRAWTRANSP);
 }
 
-	/***/
-static unsigned int colortab[24]=
-	{0x0,		0xFF88FF, 0xFFBBFF, 
-	 0x403000,	0xFFFF88, 0xFFFFBB, 
-	 0x104040,	0x66CCCC, 0x77CCCC, 
-	 0x104010,	0x55BB55, 0x66FF66, 
-	 0xFFFFFF
-};
+/***/
+static unsigned int colortab[24] =
+{0x0,       0xFF88FF, 0xFFBBFF,
+ 0x403000,  0xFFFF88, 0xFFFFBB,
+ 0x104040,  0x66CCCC, 0x77CCCC,
+ 0x104010,  0x55BB55, 0x66FF66,
+ 0xFFFFFF};
 
 
 static float cube[8][3] = {
@@ -434,16 +433,16 @@ static const float cosval[CIRCLE_RESOL] = {
 
 static void draw_xyz_wire(const float c[3], float size, int axis)
 {
-	float v1[3]= {0.f, 0.f, 0.f}, v2[3] = {0.f, 0.f, 0.f};
+	float v1[3] = {0.f, 0.f, 0.f}, v2[3] = {0.f, 0.f, 0.f};
 	float dim = size * 0.1f;
 	float dx[3], dy[3], dz[3];
 
-	dx[0]=dim; dx[1]=0.f; dx[2]=0.f;
-	dy[0]=0.f; dy[1]=dim; dy[2]=0.f;
-	dz[0]=0.f; dz[1]=0.f; dz[2]=dim;
+	dx[0] = dim; dx[1] = 0.f; dx[2] = 0.f;
+	dy[0] = 0.f; dy[1] = dim; dy[2] = 0.f;
+	dz[0] = 0.f; dz[1] = 0.f; dz[2] = dim;
 
-	switch(axis) {
-		case 0:		/* x axis */
+	switch (axis) {
+		case 0:     /* x axis */
 			glBegin(GL_LINES);
 			
 			/* bottom left to top right */
@@ -465,7 +464,7 @@ static void draw_xyz_wire(const float c[3], float size, int axis)
 			
 			glEnd();
 			break;
-		case 1:		/* y axis */
+		case 1:     /* y axis */
 			glBegin(GL_LINES);
 			
 			/* bottom left to top right */
@@ -488,7 +487,7 @@ static void draw_xyz_wire(const float c[3], float size, int axis)
 			
 			glEnd();
 			break;
-		case 2:		/* z axis */
+		case 2:     /* z axis */
 			glBegin(GL_LINE_STRIP);
 			
 			/* start at top left */
@@ -521,23 +520,23 @@ static void draw_xyz_wire(const float c[3], float size, int axis)
 void drawaxes(float size, char drawtype)
 {
 	int axis;
-	float v1[3]= {0.0, 0.0, 0.0};
-	float v2[3]= {0.0, 0.0, 0.0};
-	float v3[3]= {0.0, 0.0, 0.0};
+	float v1[3] = {0.0, 0.0, 0.0};
+	float v2[3] = {0.0, 0.0, 0.0};
+	float v3[3] = {0.0, 0.0, 0.0};
 	
-	switch(drawtype) {
+	switch (drawtype) {
 
 		case OB_PLAINAXES:
-			for (axis=0; axis<3; axis++) {
+			for (axis = 0; axis < 3; axis++) {
 				glBegin(GL_LINES);
 
-				v1[axis]= size;
-				v2[axis]= -size;
+				v1[axis] = size;
+				v2[axis] = -size;
 				glVertex3fv(v1);
 				glVertex3fv(v2);
 
 				/* reset v1 & v2 to zero */
-				v1[axis]= v2[axis]= 0.0f;
+				v1[axis] = v2[axis] = 0.0f;
 
 				glEnd();
 			}
@@ -546,7 +545,7 @@ void drawaxes(float size, char drawtype)
 
 			glBegin(GL_LINES);
 			/* in positive z direction only */
-			v1[2]= size;
+			v1[2] = size;
 			glVertex3fv(v1);
 			glVertex3fv(v2);
 			glEnd();
@@ -554,11 +553,11 @@ void drawaxes(float size, char drawtype)
 			/* square pyramid */
 			glBegin(GL_TRIANGLES);
 
-			v2[0]= size * 0.035f; v2[1] = size * 0.035f;
-			v3[0]= size * -0.035f; v3[1] = size * 0.035f;
-			v2[2]= v3[2]= size * 0.75f;
+			v2[0] = size * 0.035f; v2[1] = size * 0.035f;
+			v3[0] = size * -0.035f; v3[1] = size * 0.035f;
+			v2[2] = v3[2] = size * 0.75f;
 
-			for (axis=0; axis<4; axis++) {
+			for (axis = 0; axis < 4; axis++) {
 				if (axis % 2 == 1) {
 					v2[0] = -v2[0];
 					v3[1] = -v3[1];
@@ -595,33 +594,33 @@ void drawaxes(float size, char drawtype)
 		case OB_ARROWS:
 		default:
 		{
-			for (axis=0; axis<3; axis++) {
-				const int arrow_axis= (axis==0) ? 1:0;
+			for (axis = 0; axis < 3; axis++) {
+				const int arrow_axis = (axis == 0) ? 1 : 0;
 
 				glBegin(GL_LINES);
 
-				v2[axis]= size;
+				v2[axis] = size;
 				glVertex3fv(v1);
 				glVertex3fv(v2);
 				
-				v1[axis]= size*0.85f;
-				v1[arrow_axis]= -size*0.08f;
+				v1[axis] = size * 0.85f;
+				v1[arrow_axis] = -size * 0.08f;
 				glVertex3fv(v1);
 				glVertex3fv(v2);
 				
-				v1[arrow_axis]= size*0.08f;
+				v1[arrow_axis] = size * 0.08f;
 				glVertex3fv(v1);
 				glVertex3fv(v2);
 
 				glEnd();
 				
-				v2[axis]+= size*0.125f;
+				v2[axis] += size * 0.125f;
 
 				draw_xyz_wire(v2, size, axis);
 
 
 				/* reset v1 & v2 to zero */
-				v1[arrow_axis]= v1[axis]= v2[axis]= 0.0f;
+				v1[arrow_axis] = v1[axis] = v2[axis] = 0.0f;
 			}
 			break;
 		}
@@ -632,7 +631,7 @@ void drawaxes(float size, char drawtype)
 /* Function to draw an Image on a empty Object */
 static void draw_empty_image(Object *ob)
 {
-	Image *ima = (Image*)ob->data;
+	Image *ima = (Image *)ob->data;
 	ImBuf *ibuf = ima ? BKE_image_get_ibuf(ima, NULL) : NULL;
 
 	float scale, ofs_x, ofs_y, sca_x, sca_y;
@@ -644,37 +643,37 @@ static void draw_empty_image(Object *ob)
 
 	/* Get the buffer dimensions so we can fallback to fake ones */
 	if (ibuf && ibuf->rect) {
-		ima_x= ibuf->x;
-		ima_y= ibuf->y;
+		ima_x = ibuf->x;
+		ima_y = ibuf->y;
 	}
 	else {
-		ima_x= 1;
-		ima_y= 1;
+		ima_x = 1;
+		ima_y = 1;
 	}
 
 	/* Get the image aspect even if the buffer is invalid */
 	if (ima) {
 		if (ima->aspx > ima->aspy) {
-			sca_x= 1.0f;
-			sca_y= ima->aspy / ima->aspx;
+			sca_x = 1.0f;
+			sca_y = ima->aspy / ima->aspx;
 		}
 		else if (ima->aspx < ima->aspy) {
-			sca_x= ima->aspx / ima->aspy;
-			sca_y= 1.0f;
+			sca_x = ima->aspx / ima->aspy;
+			sca_y = 1.0f;
 		}
 		else {
-			sca_x= 1.0f;
-			sca_y= 1.0f;
+			sca_x = 1.0f;
+			sca_y = 1.0f;
 		}
 	}
 	else {
-		sca_x= 1.0f;
-		sca_y= 1.0f;
+		sca_x = 1.0f;
+		sca_y = 1.0f;
 	}
 
 	/* Calculate the scale center based on objects origin */
-	ofs_x= ob->ima_ofs[0] * ima_x;
-	ofs_y= ob->ima_ofs[1] * ima_y;
+	ofs_x = ob->ima_ofs[0] * ima_x;
+	ofs_y = ob->ima_ofs[1] * ima_y;
 
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
@@ -683,7 +682,7 @@ static void draw_empty_image(Object *ob)
 	glTranslatef(0.0f,  0.0f,  0.0f);
 
 	/* Calculate Image scale */
-	scale= (ob->empty_drawsize / (float)MAX2(ima_x * sca_x, ima_y * sca_y));
+	scale = (ob->empty_drawsize / (float)MAX2(ima_x * sca_x, ima_y * sca_y));
 
 	/* Set the object scale */
 	glScalef(scale * sca_x, scale * sca_y, 1.0f);
@@ -721,16 +720,16 @@ static void draw_empty_image(Object *ob)
 static void circball_array_fill(float verts[CIRCLE_RESOL][3], const float cent[3], float rad, float tmat[][4])
 {
 	float vx[3], vy[3];
-	float *viter= (float *)verts;
+	float *viter = (float *)verts;
 	unsigned int a;
 
 	mul_v3_v3fl(vx, tmat[0], rad);
 	mul_v3_v3fl(vy, tmat[1], rad);
 
-	for (a=0; a < CIRCLE_RESOL; a++, viter += 3) {
-		viter[0]= cent[0] + sinval[a] * vx[0] + cosval[a] * vy[0];
-		viter[1]= cent[1] + sinval[a] * vx[1] + cosval[a] * vy[1];
-		viter[2]= cent[2] + sinval[a] * vx[2] + cosval[a] * vy[2];
+	for (a = 0; a < CIRCLE_RESOL; a++, viter += 3) {
+		viter[0] = cent[0] + sinval[a] * vx[0] + cosval[a] * vy[0];
+		viter[1] = cent[1] + sinval[a] * vx[1] + cosval[a] * vy[1];
+		viter[2] = cent[2] + sinval[a] * vx[2] + cosval[a] * vy[2];
 	}
 }
 
@@ -749,16 +748,16 @@ void drawcircball(int mode, const float cent[3], float rad, float tmat[][4])
 /* circle for object centers, special_color is for library or ob users */
 static void drawcentercircle(View3D *v3d, RegionView3D *rv3d, const float co[3], int selstate, int special_color)
 {
-	const float size= ED_view3d_pixel_size(rv3d, co) * (float)U.obcenter_dia * 0.5f;
+	const float size = ED_view3d_pixel_size(rv3d, co) * (float)U.obcenter_dia * 0.5f;
 	float verts[CIRCLE_RESOL][3];
 
 	/* using gldepthfunc guarantees that it does write z values,
 	 * but not checks for it, so centers remain visible independent order of drawing */
-	if (v3d->zbuf)  glDepthFunc(GL_ALWAYS);
+	if (v3d->zbuf) glDepthFunc(GL_ALWAYS);
 	glEnable(GL_BLEND);
 	
 	if (special_color) {
-		if (selstate==ACTIVE || selstate==SELECT) glColor4ub(0x88, 0xFF, 0xFF, 155);
+		if (selstate == ACTIVE || selstate == SELECT) glColor4ub(0x88, 0xFF, 0xFF, 155);
 
 		else glColor4ub(0x55, 0xCC, 0xCC, 155);
 	}
@@ -786,12 +785,12 @@ static void drawcentercircle(View3D *v3d, RegionView3D *rv3d, const float co[3],
 
 	glDisable(GL_BLEND);
 
-	if (v3d->zbuf)  glDepthFunc(GL_LEQUAL);
+	if (v3d->zbuf) glDepthFunc(GL_LEQUAL);
 }
 
 /* *********** text drawing for object/particles/armature ************* */
 static ListBase CachedText[3];
-static int CachedTextLevel= 0;
+static int CachedTextLevel = 0;
 
 typedef struct ViewCachedString {
 	struct ViewCachedString *next, *prev;
@@ -809,8 +808,8 @@ typedef struct ViewCachedString {
 
 void view3d_cached_text_draw_begin(void)
 {
-	ListBase *strings= &CachedText[CachedTextLevel];
-	strings->first= strings->last= NULL;
+	ListBase *strings = &CachedText[CachedTextLevel];
+	strings->first = strings->last = NULL;
 	CachedTextLevel++;
 }
 
@@ -819,17 +818,17 @@ void view3d_cached_text_draw_add(const float co[3],
                                  short xoffs, short flag,
                                  const unsigned char col[4])
 {
-	int alloc_len= strlen(str) + 1;
-	ListBase *strings= &CachedText[CachedTextLevel-1];
+	int alloc_len = strlen(str) + 1;
+	ListBase *strings = &CachedText[CachedTextLevel - 1];
 	/* TODO, replace with more efficient malloc, perhaps memarena per draw? */
-	ViewCachedString *vos= MEM_callocN(sizeof(ViewCachedString) + alloc_len, "ViewCachedString");
+	ViewCachedString *vos = MEM_callocN(sizeof(ViewCachedString) + alloc_len, "ViewCachedString");
 
 	BLI_addtail(strings, vos);
 	copy_v3_v3(vos->vec, co);
-	vos->col.pack= *((int *)col);
-	vos->xoffs= xoffs;
-	vos->flag= flag;
-	vos->str_len= alloc_len-1;
+	vos->col.pack = *((int *)col);
+	vos->xoffs = xoffs;
+	vos->flag = flag;
+	vos->str_len = alloc_len - 1;
 
 	/* allocate past the end */
 	memcpy(++vos, str, alloc_len);
@@ -837,13 +836,13 @@ void view3d_cached_text_draw_add(const float co[3],
 
 void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, int depth_write, float mat[][4])
 {
-	RegionView3D *rv3d= ar->regiondata;
-	ListBase *strings= &CachedText[CachedTextLevel-1];
+	RegionView3D *rv3d = ar->regiondata;
+	ListBase *strings = &CachedText[CachedTextLevel - 1];
 	ViewCachedString *vos;
-	int tot= 0;
+	int tot = 0;
 	
 	/* project first and test */
-	for (vos= strings->first; vos; vos= vos->next) {
+	for (vos = strings->first; vos; vos = vos->next) {
 		if (mat && !(vos->flag & V3D_CACHE_TEXT_WORLDSPACE))
 			mul_m4_v3(mat, vos->vec);
 
@@ -852,12 +851,12 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, int depth_write, floa
 		else
 			view3d_project_short_clip(ar, vos->vec, vos->sco, (vos->flag & V3D_CACHE_TEXT_LOCALCLIP) != 0);
 
-		if (vos->sco[0]!=IS_CLIPPED)
+		if (vos->sco[0] != IS_CLIPPED)
 			tot++;
 	}
 
 	if (tot) {
-		int col_pack_prev= 0;
+		int col_pack_prev = 0;
 
 #if 0
 		bglMats mats; /* ZBuffer depth vars */
@@ -884,34 +883,34 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, int depth_write, floa
 			glDepthMask(0);
 		}
 		
-		for (vos= strings->first; vos; vos= vos->next) {
+		for (vos = strings->first; vos; vos = vos->next) {
 			/* too slow, reading opengl info while drawing is very bad,
 			 * better to see if we can use the zbuffer while in pixel space - campbell */
 #if 0
 			if (v3d->zbuf && (vos->flag & V3D_CACHE_TEXT_ZBUF)) {
 				gluProject(vos->vec[0], vos->vec[1], vos->vec[2], mats.modelview, mats.projection, (GLint *)mats.viewport, &ux, &uy, &uz);
-				glReadPixels(ar->winrct.xmin+vos->mval[0]+vos->xoffs, ar->winrct.ymin+vos->mval[1], 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth);
+				glReadPixels(ar->winrct.xmin + vos->mval[0] + vos->xoffs, ar->winrct.ymin + vos->mval[1], 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth);
 
 				if (uz > depth)
 					continue;
 			}
 #endif
-			if (vos->sco[0]!=IS_CLIPPED) {
-				const char *str= (char *)(vos+1);
+			if (vos->sco[0] != IS_CLIPPED) {
+				const char *str = (char *)(vos + 1);
 
 				if (col_pack_prev != vos->col.pack) {
 					glColor3ubv(vos->col.ub);
-					col_pack_prev= vos->col.pack;
+					col_pack_prev = vos->col.pack;
 				}
 
 				((vos->flag & V3D_CACHE_TEXT_ASCII) ?
-				            BLF_draw_default_ascii :
-				            BLF_draw_default
-				            ) ( (float)vos->sco[0] + vos->xoffs,
-				                (float)vos->sco[1],
-				                (depth_write) ? 0.0f: 2.0f,
-				                str,
-				                vos->str_len);
+				 BLF_draw_default_ascii :
+				 BLF_draw_default
+				)( (float)vos->sco[0] + vos->xoffs,
+				   (float)vos->sco[1],
+				   (depth_write) ? 0.0f : 2.0f,
+				   str,
+				   vos->str_len);
 			}
 		}
 		
@@ -942,8 +941,8 @@ static void drawcube(void)
 {
 
 	glBegin(GL_LINE_STRIP);
-	glVertex3fv(cube[0]); glVertex3fv(cube[1]);glVertex3fv(cube[2]); glVertex3fv(cube[3]);
-	glVertex3fv(cube[0]); glVertex3fv(cube[4]);glVertex3fv(cube[5]); glVertex3fv(cube[6]);
+	glVertex3fv(cube[0]); glVertex3fv(cube[1]); glVertex3fv(cube[2]); glVertex3fv(cube[3]);
+	glVertex3fv(cube[0]); glVertex3fv(cube[4]); glVertex3fv(cube[5]); glVertex3fv(cube[6]);
 	glVertex3fv(cube[7]); glVertex3fv(cube[4]);
 	glEnd();
 
@@ -966,25 +965,25 @@ static void drawcube(void)
 static void drawcube_size(float size)
 {
 	glBegin(GL_LINE_STRIP);
-	glVertex3f(-size,-size,-size); glVertex3f(-size,-size,size);
-	glVertex3f(-size,size,size); glVertex3f(-size,size,-size);
+	glVertex3f(-size, -size, -size); glVertex3f(-size, -size, size);
+	glVertex3f(-size, size, size); glVertex3f(-size, size, -size);
 
-	glVertex3f(-size,-size,-size); glVertex3f(size,-size,-size);
-	glVertex3f(size,-size,size); glVertex3f(size,size,size);
+	glVertex3f(-size, -size, -size); glVertex3f(size, -size, -size);
+	glVertex3f(size, -size, size); glVertex3f(size, size, size);
 
-	glVertex3f(size,size,-size); glVertex3f(size,-size,-size);
+	glVertex3f(size, size, -size); glVertex3f(size, -size, -size);
 	glEnd();
 
 	glBegin(GL_LINE_STRIP);
-	glVertex3f(-size,-size,size); glVertex3f(size,-size,size);
+	glVertex3f(-size, -size, size); glVertex3f(size, -size, size);
 	glEnd();
 
 	glBegin(GL_LINE_STRIP);
-	glVertex3f(-size,size,size); glVertex3f(size,size,size);
+	glVertex3f(-size, size, size); glVertex3f(size, size, size);
 	glEnd();
 
 	glBegin(GL_LINE_STRIP);
-	glVertex3f(-size,size,-size); glVertex3f(size,size,-size);
+	glVertex3f(-size, size, -size); glVertex3f(size, size, -size);
 	glEnd();
 }
 
@@ -998,8 +997,8 @@ static void drawcube_size(const float size[3])
 	
 
 	glBegin(GL_LINE_STRIP);
-	glVertex3fv(cube[0]); glVertex3fv(cube[1]);glVertex3fv(cube[2]); glVertex3fv(cube[3]);
-	glVertex3fv(cube[0]); glVertex3fv(cube[4]);glVertex3fv(cube[5]); glVertex3fv(cube[6]);
+	glVertex3fv(cube[0]); glVertex3fv(cube[1]); glVertex3fv(cube[2]); glVertex3fv(cube[3]);
+	glVertex3fv(cube[0]); glVertex3fv(cube[4]); glVertex3fv(cube[5]); glVertex3fv(cube[6]);
 	glVertex3fv(cube[7]); glVertex3fv(cube[4]);
 	glEnd();
 
@@ -1047,17 +1046,17 @@ static void drawshadbuflimits(Lamp *la, float mat[][4])
 static void spotvolume(float lvec[3], float vvec[3], const float inp)
 {
 	/* camera is at 0,0,0 */
-	float temp[3],plane[3],mat1[3][3],mat2[3][3],mat3[3][3],mat4[3][3],q[4],co,si,angle;
+	float temp[3], plane[3], mat1[3][3], mat2[3][3], mat3[3][3], mat4[3][3], q[4], co, si, angle;
 
 	normalize_v3(lvec);
-	normalize_v3(vvec);				/* is this the correct vector ? */
+	normalize_v3(vvec);             /* is this the correct vector ? */
 
-	cross_v3_v3v3(temp,vvec,lvec);		/* equation for a plane through vvec en lvec */
-	cross_v3_v3v3(plane,lvec,temp);		/* a plane perpendicular to this, parrallel with lvec */
+	cross_v3_v3v3(temp, vvec, lvec);      /* equation for a plane through vvec en lvec */
+	cross_v3_v3v3(plane, lvec, temp);     /* a plane perpendicular to this, parrallel with lvec */
 
 	/* vectors are exactly aligned, use the X axis, this is arbitrary */
 	if (normalize_v3(plane) == 0.0f)
-		plane[1]= 1.0f;
+		plane[1] = 1.0f;
 
 	/* now we've got two equations: one of a cone and one of a plane, but we have
 	 * three unknowns. We remove one unknown by rotating the plane to z=0 (the plane normal) */
@@ -1072,46 +1071,46 @@ static void spotvolume(float lvec[3], float vvec[3], const float inp)
 	q[3] =  0;
 	normalize_v3(&q[1]);
 
-	angle = saacos(plane[2])/2.0f;
+	angle = saacos(plane[2]) / 2.0f;
 	co = cosf(angle);
-	si = sqrtf(1-co*co);
+	si = sqrtf(1 - co * co);
 
 	q[0] =  co;
 	q[1] *= si;
 	q[2] *= si;
 	q[3] =  0;
 
-	quat_to_mat3(mat1,q);
+	quat_to_mat3(mat1, q);
 
 	/* rotate lamp vector now over acos(inp) degrees */
 	copy_v3_v3(vvec, lvec);
 
 	unit_m3(mat2);
 	co = inp;
-	si = sqrtf(1.0f-inp*inp);
+	si = sqrtf(1.0f - inp * inp);
 
 	mat2[0][0] =  co;
 	mat2[1][0] = -si;
 	mat2[0][1] =  si;
 	mat2[1][1] =  co;
-	mul_m3_m3m3(mat3,mat2,mat1);
+	mul_m3_m3m3(mat3, mat2, mat1);
 
 	mat2[1][0] =  si;
 	mat2[0][1] = -si;
-	mul_m3_m3m3(mat4,mat2,mat1);
+	mul_m3_m3m3(mat4, mat2, mat1);
 	transpose_m3(mat1);
 
-	mul_m3_m3m3(mat2,mat1,mat3);
-	mul_m3_v3(mat2,lvec);
-	mul_m3_m3m3(mat2,mat1,mat4);
-	mul_m3_v3(mat2,vvec);
+	mul_m3_m3m3(mat2, mat1, mat3);
+	mul_m3_v3(mat2, lvec);
+	mul_m3_m3m3(mat2, mat1, mat4);
+	mul_m3_v3(mat2, vvec);
 
 	return;
 }
 
 static void draw_spot_cone(Lamp *la, float x, float z)
 {
-	z= fabs(z);
+	z = fabs(z);
 
 	glBegin(GL_TRIANGLE_FAN);
 	glVertex3f(0.0f, 0.0f, -x);
@@ -1127,9 +1126,9 @@ static void draw_spot_cone(Lamp *la, float x, float z)
 		float angle;
 		int a;
 
-		for (a=0; a<33; a++) {
-			angle= a*M_PI*2/(33-1);
-			glVertex3f(z*cosf(angle), z*sinf(angle), 0);
+		for (a = 0; a < 33; a++) {
+			angle = a * M_PI * 2 / (33 - 1);
+			glVertex3f(z * cosf(angle), z * sinf(angle), 0);
 		}
 	}
 
@@ -1168,22 +1167,22 @@ static void draw_transp_spot_volume(Lamp *la, float x, float z)
 
 static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, int dt, int flag)
 {
-	Object *ob= base->object;
-	const float pixsize= ED_view3d_pixel_size(rv3d, ob->obmat[3]);
-	Lamp *la= ob->data;
-	float vec[3], lvec[3], vvec[3], circrad, x,y,z;
+	Object *ob = base->object;
+	const float pixsize = ED_view3d_pixel_size(rv3d, ob->obmat[3]);
+	Lamp *la = ob->data;
+	float vec[3], lvec[3], vvec[3], circrad, x, y, z;
 	float lampsize;
 	float imat[4][4], curcol[4];
 	unsigned char col[4];
 	/* cone can't be drawn for duplicated lamps, because duplilist would be freed to */
 	/* the moment of view3d_draw_transp() call */
-	const short is_view= (rv3d->persp==RV3D_CAMOB && v3d->camera == base->object);
-	const short drawcone= ((dt > OB_WIRE) &&
-	                       !(G.f & G_PICKSEL) &&
-	                       (la->type == LA_SPOT) &&
-	                       (la->mode & LA_SHOW_CONE) &&
-	                       !(base->flag & OB_FROMDUPLI) &&
-	                       !is_view);
+	const short is_view = (rv3d->persp == RV3D_CAMOB && v3d->camera == base->object);
+	const short drawcone = ((dt > OB_WIRE) &&
+	                        !(G.f & G_PICKSEL) &&
+	                        (la->type == LA_SPOT) &&
+	                        (la->mode & LA_SHOW_CONE) &&
+	                        !(base->flag & OB_FROMDUPLI) &&
+	                        !is_view);
 
 	if (drawcone && !v3d->transp) {
 		/* in this case we need to draw delayed */
@@ -1196,7 +1195,7 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	glLoadMatrixf(rv3d->viewmat);
 
 	/* lets calculate the scale: */
-	lampsize= pixsize*((float)U.obcenter_dia*0.5f);
+	lampsize = pixsize * ((float)U.obcenter_dia * 0.5f);
 
 	/* and view aligned matrix: */
 	copy_m4_m4(imat, rv3d->viewinv);
@@ -1208,13 +1207,13 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	
 	/* for AA effects */
 	glGetFloatv(GL_CURRENT_COLOR, curcol);
-	curcol[3]= 0.6;
+	curcol[3] = 0.6;
 	glColor4fv(curcol);
 	
 	if (lampsize > 0.0f) {
 
-		if (ob->id.us>1) {
-			if (ob==OBACT || (ob->flag & SELECT)) glColor4ub(0x88, 0xFF, 0xFF, 155);
+		if (ob->id.us > 1) {
+			if (ob == OBACT || (ob->flag & SELECT)) glColor4ub(0x88, 0xFF, 0xFF, 155);
 			else glColor4ub(0x77, 0xCC, 0xCC, 155);
 		}
 		
@@ -1225,19 +1224,19 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 		drawcircball(GL_POLYGON, vec, lampsize, imat);
 		
 		/* restore */
-		if (ob->id.us>1)
+		if (ob->id.us > 1)
 			glColor4fv(curcol);
 
 		/* Outer circle */
-		circrad = 3.0f*lampsize;
+		circrad = 3.0f * lampsize;
 		setlinestyle(3);
 
 		drawcircball(GL_LINE_LOOP, vec, circrad, imat);
 
 		/* draw dashed outer circle if shadow is on. remember some lamps can't have certain shadows! */
-		if (la->type!=LA_HEMI) {
+		if (la->type != LA_HEMI) {
 			if ((la->mode & LA_SHAD_RAY) || ((la->mode & LA_SHAD_BUF) && (la->type == LA_SPOT))) {
-				drawcircball(GL_LINE_LOOP, vec, circrad + 3.0f*pixsize, imat);
+				drawcircball(GL_LINE_LOOP, vec, circrad + 3.0f * pixsize, imat);
 			}
 		}
 	}
@@ -1247,12 +1246,12 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	}
 	
 	/* draw the pretty sun rays */
-	if (la->type==LA_SUN) {
+	if (la->type == LA_SUN) {
 		float v1[3], v2[3], mat[3][3];
 		short axis;
 		
 		/* setup a 45 degree rotation matrix */
-		vec_rot_to_mat3(mat, imat[2], (float)M_PI/4.0f);
+		vec_rot_to_mat3(mat, imat[2], (float)M_PI / 4.0f);
 		
 		/* vectors */
 		mul_v3_v3fl(v1, imat[0], circrad * 1.2f);
@@ -1264,7 +1263,7 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 		setlinestyle(3);
 		
 		glBegin(GL_LINES);
-		for (axis=0; axis<8; axis++) {
+		for (axis = 0; axis < 8; axis++) {
 			glVertex3fv(v1);
 			glVertex3fv(v2);
 			mul_m3_v3(mat, v1);
@@ -1276,30 +1275,30 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 
 	}
 	
-	if (la->type==LA_LOCAL) {
+	if (la->type == LA_LOCAL) {
 		if (la->mode & LA_SPHERE) {
 			drawcircball(GL_LINE_LOOP, vec, la->dist, imat);
 		}
 		/* yafray: for photonlight also draw lightcone as for spot */
 	}
 	
-	glPopMatrix();	/* back in object space */
+	glPopMatrix();  /* back in object space */
 	zero_v3(vec);
 	
 	if (is_view) {
 		/* skip drawing extra info */
 	}
-	else if ((la->type==LA_SPOT) || (la->type==LA_YF_PHOTON)) {
-		lvec[0]=lvec[1]= 0.0;
+	else if ((la->type == LA_SPOT) || (la->type == LA_YF_PHOTON)) {
+		lvec[0] = lvec[1] = 0.0;
 		lvec[2] = 1.0;
 		x = rv3d->persmat[0][2];
 		y = rv3d->persmat[1][2];
 		z = rv3d->persmat[2][2];
-		vvec[0]= x*ob->obmat[0][0] + y*ob->obmat[0][1] + z*ob->obmat[0][2];
-		vvec[1]= x*ob->obmat[1][0] + y*ob->obmat[1][1] + z*ob->obmat[1][2];
-		vvec[2]= x*ob->obmat[2][0] + y*ob->obmat[2][1] + z*ob->obmat[2][2];
+		vvec[0] = x * ob->obmat[0][0] + y * ob->obmat[0][1] + z * ob->obmat[0][2];
+		vvec[1] = x * ob->obmat[1][0] + y * ob->obmat[1][1] + z * ob->obmat[1][2];
+		vvec[2] = x * ob->obmat[2][0] + y * ob->obmat[2][1] + z * ob->obmat[2][2];
 
-		y = cosf(la->spotsize*(float)(M_PI/360.0));
+		y = cosf(la->spotsize * (float)(M_PI / 360.0));
 		spotvolume(lvec, vvec, y);
 		x = -la->dist;
 		mul_v3_fl(lvec, x);
@@ -1312,33 +1311,33 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 		glVertex3fv(lvec);
 		glEnd();
 		
-		z = x*sqrtf(1.0f - y*y);
+		z = x * sqrtf(1.0f - y * y);
 		x *= y;
 
 		/* draw the circle/square at the end of the cone */
-		glTranslatef(0.0, 0.0 ,  x);
+		glTranslatef(0.0, 0.0,  x);
 		if (la->mode & LA_SQUARE) {
 			float tvec[3];
-			float z_abs= fabs(z);
+			float z_abs = fabs(z);
 
-			tvec[0]= tvec[1]= z_abs;
-			tvec[2]= 0.0;
+			tvec[0] = tvec[1] = z_abs;
+			tvec[2] = 0.0;
 
 			glBegin(GL_LINE_LOOP);
 			glVertex3fv(tvec);
-			tvec[1]= -z_abs; /* neg */
+			tvec[1] = -z_abs; /* neg */
 			glVertex3fv(tvec);
-			tvec[0]= -z_abs; /* neg */
+			tvec[0] = -z_abs; /* neg */
 			glVertex3fv(tvec);
-			tvec[1]= z_abs; /* pos */
+			tvec[1] = z_abs; /* pos */
 			glVertex3fv(tvec);
 			glEnd();
 		}
 		else circ(0.0, 0.0, fabsf(z));
 		
 		/* draw the circle/square representing spotbl */
-		if (la->type==LA_SPOT) {
-			float spotblcirc = fabs(z)*(1 - pow(la->spotblend, 2));
+		if (la->type == LA_SPOT) {
+			float spotblcirc = fabs(z) * (1 - pow(la->spotblend, 2));
 			/* hide line if it is zero size or overlaps with outer border,
 			 * previously it adjusted to always to show it but that seems
 			 * confusing because it doesn't show the actual blend size */
@@ -1350,11 +1349,11 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 			draw_transp_spot_volume(la, x, z);
 
 		/* draw clip start, useful for wide cones where its not obvious where the start is */
-		glTranslatef(0.0, 0.0 , -x); /* reverse translation above */
-		if (la->type==LA_SPOT && (la->mode & LA_SHAD_BUF) ) {
+		glTranslatef(0.0, 0.0, -x);  /* reverse translation above */
+		if (la->type == LA_SPOT && (la->mode & LA_SHAD_BUF) ) {
 			float lvec_clip[3];
 			float vvec_clip[3];
-			float clipsta_fac= la->clipsta / -x;
+			float clipsta_fac = la->clipsta / -x;
 
 			interp_v3_v3v3(lvec_clip, vec, lvec, clipsta_fac);
 			interp_v3_v3v3(vvec_clip, vec, vvec, clipsta_fac);
@@ -1371,11 +1370,11 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 		glBegin(GL_LINE_STRIP);
 		vec[2] = -circrad;
 		glVertex3fv(vec);
-		vec[2]= -la->dist;
+		vec[2] = -la->dist;
 		glVertex3fv(vec);
 		glEnd();
 		
-		if (la->type==LA_HEMI) {
+		if (la->type == LA_HEMI) {
 			/* draw the hemisphere curves */
 			short axis, steps, dir;
 			float outdist, zdist, mul;
@@ -1384,24 +1383,24 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 			
 			setlinestyle(4);
 			/* loop over the 4 compass points, and draw each arc as a LINE_STRIP */
-			for (axis=0; axis<4; axis++) {
-				float v[3]= {0.0, 0.0, 0.0};
+			for (axis = 0; axis < 4; axis++) {
+				float v[3] = {0.0, 0.0, 0.0};
 				zdist = 0.02;
 				
 				glBegin(GL_LINE_STRIP);
 				
-				for (steps=0; steps<6; steps++) {
-					if (axis == 0 || axis == 1) { 		/* x axis up, x axis down */
+				for (steps = 0; steps < 6; steps++) {
+					if (axis == 0 || axis == 1) {       /* x axis up, x axis down */
 						/* make the arcs start at the edge of the energy circle */
-						if (steps == 0) v[0] = dir*circrad;
-						else v[0] = v[0] + dir*(steps*outdist);
+						if (steps == 0) v[0] = dir * circrad;
+						else v[0] = v[0] + dir * (steps * outdist);
 					}
-					else if (axis == 2 || axis == 3) { 		/* y axis up, y axis down */
+					else if (axis == 2 || axis == 3) {      /* y axis up, y axis down */
 						/* make the arcs start at the edge of the energy circle */
 						v[1] = (steps == 0) ? (dir * circrad) : (v[1] + dir * (steps * outdist));
 					}
 
-					v[2] = v[2] - steps*zdist;
+					v[2] = v[2] - steps * zdist;
 					
 					glVertex3fv(v);
 					
@@ -1414,16 +1413,16 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 			}
 		}
 	}
-	else if (la->type==LA_AREA) {
+	else if (la->type == LA_AREA) {
 		setlinestyle(3);
-		if (la->area_shape==LA_AREA_SQUARE)
-			fdrawbox(-la->area_size*0.5f, -la->area_size*0.5f, la->area_size*0.5f, la->area_size*0.5f);
-		else if (la->area_shape==LA_AREA_RECT)
-			fdrawbox(-la->area_size*0.5f, -la->area_sizey*0.5f, la->area_size*0.5f, la->area_sizey*0.5f);
+		if (la->area_shape == LA_AREA_SQUARE)
+			fdrawbox(-la->area_size * 0.5f, -la->area_size * 0.5f, la->area_size * 0.5f, la->area_size * 0.5f);
+		else if (la->area_shape == LA_AREA_RECT)
+			fdrawbox(-la->area_size * 0.5f, -la->area_sizey * 0.5f, la->area_size * 0.5f, la->area_sizey * 0.5f);
 
 		glBegin(GL_LINE_STRIP);
-		glVertex3f(0.0,0.0,-circrad);
-		glVertex3f(0.0,0.0,-la->dist);
+		glVertex3f(0.0, 0.0, -circrad);
+		glVertex3f(0.0, 0.0, -la->dist);
 		glEnd();
 	}
 	
@@ -1442,12 +1441,12 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 
 	glEnable(GL_BLEND);
 	
-	if (vec[2]>0) vec[2] -= circrad;
+	if (vec[2] > 0) vec[2] -= circrad;
 	else vec[2] += circrad;
 	
 	glBegin(GL_LINE_STRIP);
 	glVertex3fv(vec);
-	vec[2]= 0;
+	vec[2] = 0;
 	glVertex3fv(vec);
 	glEnd();
 	
@@ -1495,22 +1494,22 @@ static void draw_focus_cross(float dist, float size)
 
 #ifdef VIEW3D_CAMERA_BORDER_HACK
 float view3d_camera_border_hack_col[4];
-short view3d_camera_border_hack_test= FALSE;
+short view3d_camera_border_hack_test = FALSE;
 #endif
 
 /* ****************** draw clip data *************** */
 
 static void draw_bundle_sphere(void)
 {
-	static GLuint displist= 0;
+	static GLuint displist = 0;
 
 	if (displist == 0) {
 		GLUquadricObj *qobj;
 
-		displist= glGenLists(1);
+		displist = glGenLists(1);
 		glNewList(displist, GL_COMPILE);
 
-		qobj= gluNewQuadric();
+		qobj = gluNewQuadric();
 		gluQuadricDrawStyle(qobj, GLU_FILL);
 		glShadeModel(GL_SMOOTH);
 		gluSphere(qobj, 0.05, 8, 8);
@@ -1527,12 +1526,12 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
                                                 MovieClip *clip, MovieTrackingObject *tracking_object, int flag,
                                                 int *global_track_index, int draw_selected)
 {
-	MovieTracking *tracking= &clip->tracking;
+	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingTrack *track;
 	float mat[4][4], imat[4][4];
 	unsigned char col[4], scol[4];
-	int tracknr= *global_track_index;
-	ListBase *tracksbase= BKE_tracking_object_tracks(tracking, tracking_object);
+	int tracknr = *global_track_index;
+	ListBase *tracksbase = BKE_tracking_object_tracks(tracking, tracking_object);
 
 	UI_GetThemeColor4ubv(TH_TEXT, col);
 	UI_GetThemeColor4ubv(TH_SELECT, scol);
@@ -1559,31 +1558,31 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 		glMultMatrixf(imat);
 	}
 
-	for (track= tracksbase->first; track; track= track->next) {
-		int selected= TRACK_SELECTED(track);
+	for (track = tracksbase->first; track; track = track->next) {
+		int selected = TRACK_SELECTED(track);
 
 		if (draw_selected && !selected)
 			continue;
 
-		if ((track->flag&TRACK_HAS_BUNDLE)==0)
+		if ((track->flag & TRACK_HAS_BUNDLE) == 0)
 			continue;
 
-		if (flag&DRAW_PICKING)
-			glLoadName(base->selcol + (tracknr<<16));
+		if (flag & DRAW_PICKING)
+			glLoadName(base->selcol + (tracknr << 16));
 
 		glPushMatrix();
 		glTranslatef(track->bundle_pos[0], track->bundle_pos[1], track->bundle_pos[2]);
-		glScalef(v3d->bundle_size/0.05f, v3d->bundle_size/0.05f, v3d->bundle_size/0.05f);
+		glScalef(v3d->bundle_size / 0.05f, v3d->bundle_size / 0.05f, v3d->bundle_size / 0.05f);
 
-		if (v3d->drawtype==OB_WIRE) {
+		if (v3d->drawtype == OB_WIRE) {
 			glDisable(GL_LIGHTING);
 
 			if (selected) {
-				if (base==BASACT) UI_ThemeColor(TH_ACTIVE);
+				if (base == BASACT) UI_ThemeColor(TH_ACTIVE);
 				else UI_ThemeColor(TH_SELECT);
 			}
 			else {
-				if (track->flag&TRACK_CUSTOMCOLOR) glColor3fv(track->color);
+				if (track->flag & TRACK_CUSTOMCOLOR) glColor3fv(track->color);
 				else UI_ThemeColor(TH_WIRE);
 			}
 
@@ -1591,11 +1590,11 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 
 			glEnable(GL_LIGHTING);
 		}
-		else if (v3d->drawtype>OB_WIRE) {
-			if (v3d->bundle_drawtype==OB_EMPTY_SPHERE) {
+		else if (v3d->drawtype > OB_WIRE) {
+			if (v3d->bundle_drawtype == OB_EMPTY_SPHERE) {
 				/* selection outline */
 				if (selected) {
-					if (base==BASACT) UI_ThemeColor(TH_ACTIVE);
+					if (base == BASACT) UI_ThemeColor(TH_ACTIVE);
 					else UI_ThemeColor(TH_SELECT);
 
 					glLineWidth(2.f);
@@ -1609,7 +1608,7 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 					glLineWidth(1.f);
 				}
 
-				if (track->flag&TRACK_CUSTOMCOLOR) glColor3fv(track->color);
+				if (track->flag & TRACK_CUSTOMCOLOR) glColor3fv(track->color);
 				else UI_ThemeColor(TH_BUNDLE_SOLID);
 
 				draw_bundle_sphere();
@@ -1618,11 +1617,11 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 				glDisable(GL_LIGHTING);
 
 				if (selected) {
-					if (base==BASACT) UI_ThemeColor(TH_ACTIVE);
+					if (base == BASACT) UI_ThemeColor(TH_ACTIVE);
 					else UI_ThemeColor(TH_SELECT);
 				}
 				else {
-					if (track->flag&TRACK_CUSTOMCOLOR) glColor3fv(track->color);
+					if (track->flag & TRACK_CUSTOMCOLOR) glColor3fv(track->color);
 					else UI_ThemeColor(TH_WIRE);
 				}
 
@@ -1634,7 +1633,7 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 
 		glPopMatrix();
 
-		if ((flag & DRAW_PICKING)==0 && (v3d->flag2&V3D_SHOW_BUNDLENAME)) {
+		if ((flag & DRAW_PICKING) == 0 && (v3d->flag2 & V3D_SHOW_BUNDLENAME)) {
 			float pos[3];
 			unsigned char tcol[4];
 
@@ -1648,21 +1647,21 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 		tracknr++;
 	}
 
-	if ((flag & DRAW_PICKING)==0) {
-		if ((v3d->flag2&V3D_SHOW_CAMERAPATH) && (tracking_object->flag&TRACKING_OBJECT_CAMERA)) {
+	if ((flag & DRAW_PICKING) == 0) {
+		if ((v3d->flag2 & V3D_SHOW_CAMERAPATH) && (tracking_object->flag & TRACKING_OBJECT_CAMERA)) {
 			MovieTrackingReconstruction *reconstruction;
-			reconstruction= BKE_tracking_object_reconstruction(tracking, tracking_object);
+			reconstruction = BKE_tracking_object_reconstruction(tracking, tracking_object);
 
 			if (reconstruction->camnr) {
-				MovieReconstructedCamera *camera= reconstruction->cameras;
-				int a= 0;
+				MovieReconstructedCamera *camera = reconstruction->cameras;
+				int a = 0;
 
 				glDisable(GL_LIGHTING);
 				UI_ThemeColor(TH_CAMERA_PATH);
 				glLineWidth(2.0f);
 
 				glBegin(GL_LINE_STRIP);
-				for (a= 0; a<reconstruction->camnr; a++, camera++) {
+				for (a = 0; a < reconstruction->camnr; a++, camera++) {
 					glVertex3fv(camera->mat[3]);
 				}
 				glEnd();
@@ -1675,21 +1674,21 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 
 	glPopMatrix();
 
-	*global_track_index= tracknr;
+	*global_track_index = tracknr;
 }
 
 static void draw_viewport_reconstruction(Scene *scene, Base *base, View3D *v3d, MovieClip *clip,
                                          int flag, int draw_selected)
 {
-	MovieTracking *tracking= &clip->tracking;
+	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingObject *tracking_object;
 	float curcol[4];
-	int global_track_index= 1;
+	int global_track_index = 1;
 
-	if ((v3d->flag2&V3D_SHOW_RECONSTRUCTION)==0)
+	if ((v3d->flag2 & V3D_SHOW_RECONSTRUCTION) == 0)
 		return;
 
-	if (v3d->flag2&V3D_RENDER_OVERRIDE)
+	if (v3d->flag2 & V3D_RENDER_OVERRIDE)
 		return;
 
 	glGetFloatv(GL_CURRENT_COLOR, curcol);
@@ -1699,12 +1698,12 @@ static void draw_viewport_reconstruction(Scene *scene, Base *base, View3D *v3d,
 	glEnable(GL_COLOR_MATERIAL);
 	glShadeModel(GL_SMOOTH);
 
-	tracking_object= tracking->objects.first;
+	tracking_object = tracking->objects.first;
 	while (tracking_object) {
 		draw_viewport_object_reconstruction(scene, base, v3d, clip, tracking_object,
 		                                    flag, &global_track_index, draw_selected);
 
-		tracking_object= tracking_object->next;
+		tracking_object = tracking_object->next;
 	}
 
 	/* restore */
@@ -1714,7 +1713,7 @@ static void draw_viewport_reconstruction(Scene *scene, Base *base, View3D *v3d,
 
 	glColor4fv(curcol);
 
-	if (flag&DRAW_PICKING)
+	if (flag & DRAW_PICKING)
 		glLoadName(base->selcol);
 }
 
@@ -1723,13 +1722,13 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
 {
 	/* a standing up pyramid with (0,0,0) as top */
 	Camera *cam;
-	Object *ob= base->object;
+	Object *ob = base->object;
 	float tvec[3];
 	float vec[4][3], asp[2], shift[2], scale[3];
 	int i;
 	float drawsize;
-	const short is_view= (rv3d->persp==RV3D_CAMOB && ob==v3d->camera);
-	MovieClip *clip= object_get_movieclip(scene, base->object, 0);
+	const short is_view = (rv3d->persp == RV3D_CAMOB && ob == v3d->camera);
+	MovieClip *clip = object_get_movieclip(scene, base->object, 0);
 
 	/* draw data for movie clip set as active for scene */
 	if (clip) {
@@ -1740,16 +1739,16 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
 #ifdef VIEW3D_CAMERA_BORDER_HACK
 	if (is_view && !(G.f & G_PICKSEL)) {
 		glGetFloatv(GL_CURRENT_COLOR, view3d_camera_border_hack_col);
-		view3d_camera_border_hack_test= TRUE;
+		view3d_camera_border_hack_test = TRUE;
 		return;
 	}
 #endif
 
-	cam= ob->data;
+	cam = ob->data;
 
-	scale[0]= 1.0f / len_v3(ob->obmat[0]);
-	scale[1]= 1.0f / len_v3(ob->obmat[1]);
-	scale[2]= 1.0f / len_v3(ob->obmat[2]);
+	scale[0] = 1.0f / len_v3(ob->obmat[0]);
+	scale[1] = 1.0f / len_v3(ob->obmat[1]);
+	scale[2] = 1.0f / len_v3(ob->obmat[2]);
 
 	camera_view_frame_ex(scene, cam, cam->drawsize, is_view, scale,
 	                     asp, shift, &drawsize, vec);
@@ -1782,33 +1781,33 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
 
 
 	/* arrow on top */
-	tvec[2]= vec[1][2]; /* copy the depth */
+	tvec[2] = vec[1][2]; /* copy the depth */
 
 
 	/* draw an outline arrow for inactive cameras and filled
 	 * for active cameras. We actually draw both outline+filled
 	 * for active cameras so the wire can be seen side-on */
-	for (i=0;i<2;i++) {
-		if (i==0) glBegin(GL_LINE_LOOP);
-		else if (i==1 && (ob == v3d->camera)) glBegin(GL_TRIANGLES);
+	for (i = 0; i < 2; i++) {
+		if (i == 0) glBegin(GL_LINE_LOOP);
+		else if (i == 1 && (ob == v3d->camera)) glBegin(GL_TRIANGLES);
 		else break;
 
-		tvec[0]= shift[0] + ((-0.7f * drawsize) * scale[0]);
-		tvec[1]= shift[1] + ((drawsize * (asp[1] + 0.1f)) * scale[1]);
+		tvec[0] = shift[0] + ((-0.7f * drawsize) * scale[0]);
+		tvec[1] = shift[1] + ((drawsize * (asp[1] + 0.1f)) * scale[1]);
 		glVertex3fv(tvec); /* left */
 		
-		tvec[0]= shift[0] + ((0.7f * drawsize) * scale[0]);
+		tvec[0] = shift[0] + ((0.7f * drawsize) * scale[0]);
 		glVertex3fv(tvec); /* right */
 		
-		tvec[0]= shift[0];
-		tvec[1]= shift[1] + ((1.1f * drawsize * (asp[1] + 0.7f)) * scale[1]);
+		tvec[0] = shift[0];
+		tvec[1] = shift[1] + ((1.1f * drawsize * (asp[1] + 0.7f)) * scale[1]);
 		glVertex3fv(tvec); /* top */
 
 		glEnd();
 	}
 
-	if (flag==0) {
-		if (cam->flag & (CAM_SHOWLIMITS+CAM_SHOWMIST)) {
+	if (flag == 0) {
+		if (cam->flag & (CAM_SHOWLIMITS + CAM_SHOWMIST)) {
 			float nobmat[4][4];
 			World *wrld;
 
@@ -1826,9 +1825,9 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
 				draw_focus_cross(object_camera_dof_distance(ob), cam->drawsize);
 			}
 
-			wrld= scene->world;
+			wrld = scene->world;
 			if (cam->flag & CAM_SHOWMIST)
-				if (wrld) draw_limit_line(wrld->miststa, wrld->miststa+wrld->mistdist, 0xFFFFFF);
+				if (wrld) draw_limit_line(wrld->miststa, wrld->miststa + wrld->mistdist, 0xFFFFFF);
 
 			glPopMatrix();
 		}
@@ -1847,7 +1846,7 @@ static void drawspeaker(Scene *UNUSED(scene), View3D *UNUSED(v3d), RegionView3D
 	glEnable(GL_BLEND);
 
 	for (j = 0; j < 3; j++) {
-		vec[2] = 0.25f * j -0.125f;
+		vec[2] = 0.25f * j - 0.125f;
 
 		glBegin(GL_LINE_LOOP);
 		for (i = 0; i < 16; i++) {
@@ -1868,7 +1867,7 @@ static void drawspeaker(Scene *UNUSED(scene), View3D *UNUSED(v3d), RegionView3D
 				vec[1] *= 0.5f;
 			}
 
-			vec[2] = 0.25f * i -0.125f;
+			vec[2] = 0.25f * i - 0.125f;
 			glVertex3fv(vec);
 		}
 		glEnd();
@@ -1880,23 +1879,23 @@ static void drawspeaker(Scene *UNUSED(scene), View3D *UNUSED(v3d), RegionView3D
 static void lattice_draw_verts(Lattice *lt, DispList *dl, short sel)
 {
 	BPoint *bp = lt->def;
-	float *co = dl?dl->verts:NULL;
+	float *co = dl ? dl->verts : NULL;
 	int u, v, w;
 
-	UI_ThemeColor(sel?TH_VERTEX_SELECT:TH_VERTEX);
+	UI_ThemeColor(sel ? TH_VERTEX_SELECT : TH_VERTEX);
 	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
 	bglBegin(GL_POINTS);
 
-	for (w=0; w<lt->pntsw; w++) {
-		int wxt = (w==0 || w==lt->pntsw-1);
-		for (v=0; v<lt->pntsv; v++) {
-			int vxt = (v==0 || v==lt->pntsv-1);
-			for (u=0; u<lt->pntsu; u++, bp++, co+=3) {
-				int uxt = (u==0 || u==lt->pntsu-1);
+	for (w = 0; w < lt->pntsw; w++) {
+		int wxt = (w == 0 || w == lt->pntsw - 1);
+		for (v = 0; v < lt->pntsv; v++) {
+			int vxt = (v == 0 || v == lt->pntsv - 1);
+			for (u = 0; u < lt->pntsu; u++, bp++, co += 3) {
+				int uxt = (u == 0 || u == lt->pntsu - 1);
 				if (!(lt->flag & LT_OUTSIDE) || uxt || vxt || wxt) {
-					if (bp->hide==0) {
-						if ((bp->f1 & SELECT)==sel) {
-							bglVertex3fv(dl?co:bp->vec);
+					if (bp->hide == 0) {
+						if ((bp->f1 & SELECT) == sel) {
+							bglVertex3fv(dl ? co : bp->vec);
 						}
 					}
 				}
@@ -1910,19 +1909,19 @@ static void lattice_draw_verts(Lattice *lt, DispList *dl, short sel)
 
 void lattice_foreachScreenVert(ViewContext *vc, void (*func)(void *userData, BPoint *bp, int x, int y), void *userData)
 {
-	Object *obedit= vc->obedit;
-	Lattice *lt= obedit->data;
+	Object *obedit = vc->obedit;
+	Lattice *lt = obedit->data;
 	BPoint *bp = lt->editlatt->latt->def;
 	DispList *dl = find_displist(&obedit->disp, DL_VERTS);
-	float *co = dl?dl->verts:NULL;
-	int i, N = lt->editlatt->latt->pntsu*lt->editlatt->latt->pntsv*lt->editlatt->latt->pntsw;
+	float *co = dl ? dl->verts : NULL;
+	int i, N = lt->editlatt->latt->pntsu * lt->editlatt->latt->pntsv * lt->editlatt->latt->pntsw;
 	short s[2] = {IS_CLIPPED, 0};
 
 	ED_view3d_clipping_local(vc->rv3d, obedit->obmat); /* for local clipping lookups */
 
-	for (i=0; i<N; i++, bp++, co+=3) {
-		if (bp->hide==0) {
-			view3d_project_short_clip(vc->ar, dl?co:bp->vec, s, TRUE);
+	for (i = 0; i < N; i++, bp++, co += 3) {
+		if (bp->hide == 0) {
+			view3d_project_short_clip(vc->ar, dl ? co : bp->vec, s, TRUE);
 			if (s[0] != IS_CLIPPED)
 				func(userData, bp, s[0], s[1]);
 		}
@@ -1931,19 +1930,19 @@ void lattice_foreachScreenVert(ViewContext *vc, void (*func)(void *userData, BPo
 
 static void drawlattice__point(Lattice *lt, DispList *dl, int u, int v, int w, int use_wcol)
 {
-	int index = ((w*lt->pntsv + v)*lt->pntsu) + u;
+	int index = ((w * lt->pntsv + v) * lt->pntsu) + u;
 
 	if (use_wcol) {
 		float col[3];
-		MDeformWeight *mdw= defvert_find_index (lt->dvert+index, use_wcol-1);
+		MDeformWeight *mdw = defvert_find_index(lt->dvert + index, use_wcol - 1);
 		
-		weight_to_rgb(col, mdw?mdw->weight:0.0f);
+		weight_to_rgb(col, mdw ? mdw->weight : 0.0f);
 		glColor3fv(col);
 
 	}
 	
 	if (dl) {
-		glVertex3fv(&dl->verts[index*3]);
+		glVertex3fv(&dl->verts[index * 3]);
 	}
 	else {
 		glVertex3fv(lt->def[index].vec);
@@ -1953,45 +1952,45 @@ static void drawlattice__point(Lattice *lt, DispList *dl, int u, int v, int w, i
 /* lattice color is hardcoded, now also shows weightgroup values in edit mode */
 static void drawlattice(Scene *scene, View3D *v3d, Object *ob)
 {
-	Lattice *lt= ob->data;
+	Lattice *lt = ob->data;
 	DispList *dl;
 	int u, v, w;
-	int use_wcol= 0, is_edit= (lt->editlatt != NULL);
+	int use_wcol = 0, is_edit = (lt->editlatt != NULL);
 
 	/* now we default make displist, this will modifiers work for non animated case */
-	if (ob->disp.first==NULL)
+	if (ob->disp.first == NULL)
 		lattice_calc_modifiers(scene, ob);
-	dl= find_displist(&ob->disp, DL_VERTS);
+	dl = find_displist(&ob->disp, DL_VERTS);
 	
 	if (is_edit) {
-		lt= lt->editlatt->latt;
+		lt = lt->editlatt->latt;
 
 		cpack(0x004000);
 		
 		if (ob->defbase.first && lt->dvert) {
-			use_wcol= ob->actdef;
+			use_wcol = ob->actdef;
 			glShadeModel(GL_SMOOTH);
 		}
 	}
 	
 	glBegin(GL_LINES);
-	for (w=0; w<lt->pntsw; w++) {
-		int wxt = (w==0 || w==lt->pntsw-1);
-		for (v=0; v<lt->pntsv; v++) {
-			int vxt = (v==0 || v==lt->pntsv-1);
-			for (u=0; u<lt->pntsu; u++) {
-				int uxt = (u==0 || u==lt->pntsu-1);
+	for (w = 0; w < lt->pntsw; w++) {
+		int wxt = (w == 0 || w == lt->pntsw - 1);
+		for (v = 0; v < lt->pntsv; v++) {
+			int vxt = (v == 0 || v == lt->pntsv - 1);
+			for (u = 0; u < lt->pntsu; u++) {
+				int uxt = (u == 0 || u == lt->pntsu - 1);
 
 				if (w && ((uxt || vxt) || !(lt->flag & LT_OUTSIDE))) {
-					drawlattice__point(lt, dl, u, v, w-1, use_wcol);
+					drawlattice__point(lt, dl, u, v, w - 1, use_wcol);
 					drawlattice__point(lt, dl, u, v, w, use_wcol);
 				}
 				if (v && ((uxt || wxt) || !(lt->flag & LT_OUTSIDE))) {
-					drawlattice__point(lt, dl, u, v-1, w, use_wcol);
+					drawlattice__point(lt, dl, u, v - 1, w, use_wcol);
 					drawlattice__point(lt, dl, u, v, w, use_wcol);
 				}
 				if (u && ((vxt || wxt) || !(lt->flag & LT_OUTSIDE))) {
-					drawlattice__point(lt, dl, u-1, v, w, use_wcol);
+					drawlattice__point(lt, dl, u - 1, v, w, use_wcol);
 					drawlattice__point(lt, dl, u, v, w, use_wcol);
 				}
 			}
@@ -2025,7 +2024,7 @@ static void mesh_foreachScreenVert__mapFunc(void *userData, int index, float *co
 	BMVert *eve = EDBM_get_vert_for_index(data->vc.em, index);
 
 	if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
-		short s[2]= {IS_CLIPPED, 0};
+		short s[2] = {IS_CLIPPED, 0};
 
 		if (data->clipVerts != V3D_CLIP_TEST_OFF) {
 			view3d_project_short_clip(data->vc.ar, co, s, TRUE);
@@ -2036,26 +2035,26 @@ static void mesh_foreachScreenVert__mapFunc(void *userData, int index, float *co
 			project_short_noclip(data->vc.ar, co2, s);
 		}
 
-		if (s[0]!=IS_CLIPPED)
+		if (s[0] != IS_CLIPPED)
 			data->func(data->userData, eve, s[0], s[1], index);
 	}
 }
 
 void mesh_foreachScreenVert(
-        ViewContext *vc,
-        void (*func)(void *userData, BMVert *eve, int x, int y, int index),
-        void *userData, eV3DClipTest clipVerts)
+    ViewContext *vc,
+    void (*func)(void *userData, BMVert *eve, int x, int y, int index),
+    void *userData, eV3DClipTest clipVerts)
 {
 	foreachScreenVert_userData data;
 	DerivedMesh *dm = editbmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
 	
-	data.vc= *vc;
+	data.vc = *vc;
 	data.func = func;
 	data.userData = userData;
 	data.clipVerts = clipVerts;
 
 	if (clipVerts != V3D_CLIP_TEST_OFF)
-		ED_view3d_clipping_local(vc->rv3d, vc->obedit->obmat); /* for local clipping lookups */
+		ED_view3d_clipping_local(vc->rv3d, vc->obedit->obmat);  /* for local clipping lookups */
 
 	EDBM_init_index_arrays(vc->em, 1, 0, 0);
 	dm->foreachMappedVert(dm, mesh_foreachScreenVert__mapFunc, &data);
@@ -2070,7 +2069,7 @@ static void drawSelectedVertices__mapFunc(void *userData, int index, float *co,
 	MVert *mv = &((MVert *)userData)[index];
 
 	if (!(mv->flag & ME_HIDE)) {
-		const char sel= mv->flag & SELECT;
+		const char sel = mv->flag & SELECT;
 
 		// TODO define selected color
 		if (sel) {
@@ -2120,8 +2119,8 @@ static void mesh_foreachScreenEdge__mapFunc(void *userData, int index, float *v0
 			project_short_noclip(data->vc.ar, v2_co, s[1]);
 
 			if (data->clipVerts == V3D_CLIP_TEST_REGION) {
-				if ( !is_co_in_region(data->vc.ar, s[0]) &&
-				     !is_co_in_region(data->vc.ar, s[1]))
+				if (!is_co_in_region(data->vc.ar, s[0]) &&
+				    !is_co_in_region(data->vc.ar, s[1]))
 				{
 					return;
 				}
@@ -2133,20 +2132,20 @@ static void mesh_foreachScreenEdge__mapFunc(void *userData, int index, float *v0
 }
 
 void mesh_foreachScreenEdge(
-        ViewContext *vc,
-        void (*func)(void *userData, BMEdge *eed, int x0, int y0, int x1, int y1, int index),
-        void *userData, eV3DClipTest clipVerts)
+    ViewContext *vc,
+    void (*func)(void *userData, BMEdge *eed, int x0, int y0, int x1, int y1, int index),
+    void *userData, eV3DClipTest clipVerts)
 {
 	foreachScreenEdge_userData data;
 	DerivedMesh *dm = editbmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
 
-	data.vc= *vc;
+	data.vc = *vc;
 	data.func = func;
 	data.userData = userData;
 	data.clipVerts = clipVerts;
 
 	if (clipVerts != V3D_CLIP_TEST_OFF)
-		ED_view3d_clipping_local(vc->rv3d, vc->obedit->obmat); /* for local clipping lookups */
+		ED_view3d_clipping_local(vc->rv3d, vc->obedit->obmat);  /* for local clipping lookups */
 
 	EDBM_init_index_arrays(vc->em, 0, 1, 0);
 	dm->foreachMappedEdge(dm, mesh_foreachScreenEdge__mapFunc, &data);
@@ -2174,14 +2173,14 @@ static void mesh_foreachScreenFace__mapFunc(void *userData, int index, float *ce
 }
 
 void mesh_foreachScreenFace(
-        ViewContext *vc,
-        void (*func)(void *userData, BMFace *efa, int x, int y, int index),
-        void *userData)
+    ViewContext *vc,
+    void (*func)(void *userData, BMFace *efa, int x, int y, int index),
+    void *userData)
 {
 	foreachScreenFace_userData data;
 	DerivedMesh *dm = editbmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
 
-	data.vc= *vc;
+	data.vc = *vc;
 	data.func = func;
 	data.userData = userData;
 
@@ -2196,24 +2195,24 @@ void mesh_foreachScreenFace(
 }
 
 void nurbs_foreachScreenVert(
-        ViewContext *vc,
-        void (*func)(void *userData, Nurb *nu, BPoint *bp, BezTriple *bezt, int beztindex, int x, int y),
-        void *userData)
+    ViewContext *vc,
+    void (*func)(void *userData, Nurb *nu, BPoint *bp, BezTriple *bezt, int beztindex, int x, int y),
+    void *userData)
 {
-	Curve *cu= vc->obedit->data;
+	Curve *cu = vc->obedit->data;
 	short s[2] = {IS_CLIPPED, 0};
 	Nurb *nu;
 	int i;
-	ListBase *nurbs= curve_editnurbs(cu);
+	ListBase *nurbs = curve_editnurbs(cu);
 
 	ED_view3d_clipping_local(vc->rv3d, vc->obedit->obmat); /* for local clipping lookups */
 
-	for (nu= nurbs->first; nu; nu=nu->next) {
+	for (nu = nurbs->first; nu; nu = nu->next) {
 		if (nu->type == CU_BEZIER) {
-			for (i=0; i<nu->pntsu; i++) {
+			for (i = 0; i < nu->pntsu; i++) {
 				BezTriple *bezt = &nu->bezt[i];
 
-				if (bezt->hide==0) {
+				if (bezt->hide == 0) {
 					
 					if (cu->drawflag & CU_HIDE_HANDLES) {
 						view3d_project_short_clip(vc->ar, bezt->vec[1], s, TRUE);
@@ -2235,10 +2234,10 @@ void nurbs_foreachScreenVert(
 			}
 		}
 		else {
-			for (i=0; i<nu->pntsu*nu->pntsv; i++) {
+			for (i = 0; i < nu->pntsu * nu->pntsv; i++) {
 				BPoint *bp = &nu->bp[i];
 
-				if (bp->hide==0) {
+				if (bp->hide == 0) {
 					view3d_project_short_clip(vc->ar, bp->vec, s, TRUE);
 					if (s[0] != IS_CLIPPED)
 						func(userData, nu, bp, NULL, -1, s[0], s[1]);
@@ -2288,7 +2287,7 @@ static void draw_dm_face_centers__mapFunc(void *userData, int index, float *cent
 	BMFace *efa = EDBM_get_face_for_index(((void **)userData)[0], index);
 	int sel = *(((int **)userData)[1]);
 	
-	if (efa && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BM_elem_flag_test(efa, BM_ELEM_SELECT)==sel) {
+	if (efa && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BM_elem_flag_test(efa, BM_ELEM_SELECT) == sel) {
 		bglVertex3fv(cent);
 	}
 }
@@ -2336,12 +2335,12 @@ static void draw_dm_vert_normals(BMEditMesh *em, Scene *scene, DerivedMesh *dm)
 /* Draw verts with color set based on selection */
 static void draw_dm_verts__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s))
 {
-	drawDMVerts_userData * data = userData;
+	drawDMVerts_userData *data = userData;
 	BMVert *eve = EDBM_get_vert_for_index(data->em, index);
 
-	if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BM_elem_flag_test(eve, BM_ELEM_SELECT)==data->sel) {
+	if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BM_elem_flag_test(eve, BM_ELEM_SELECT) == data->sel) {
 		/* draw active larger - need to stop/start point drawing for this :/ */
-		if (eve==data->eve_act) {
+		if (eve == data->eve_act) {
 			float size = UI_GetThemeValuef(TH_VERTEX_SIZE);
 			UI_ThemeColor4(TH_EDITMESH_ACTIVE);
 			
@@ -2352,7 +2351,7 @@ static void draw_dm_verts__mapFunc(void *userData, int index, float *co, float *
 			bglVertex3fv(co);
 			bglEnd();
 			
-			UI_ThemeColor4(data->sel?TH_VERTEX_SELECT:TH_VERTEX);
+			UI_ThemeColor4(data->sel ? TH_VERTEX_SELECT : TH_VERTEX);
 			glPointSize(size);
 			bglBegin(GL_POINTS);
 		}
@@ -2379,13 +2378,13 @@ static DMDrawOption draw_dm_edges_sel__setDrawOptions(void *userData, int index)
 {
 	BMEdge *eed;
 	//unsigned char **cols = userData, *col;
-	drawDMEdgesSel_userData * data = userData;
+	drawDMEdgesSel_userData *data = userData;
 	unsigned char *col;
 
 	eed = EDBM_get_edge_for_index(data->em, index);
 
 	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-		if (eed==data->eed_act) {
+		if (eed == data->eed_act) {
 			glColor4ubv(data->actCol);
 		}
 		else {
@@ -2396,7 +2395,7 @@ static DMDrawOption draw_dm_edges_sel__setDrawOptions(void *userData, int index)
 				col = data->baseCol;
 			}
 			/* no alpha, this is used so a transparent color can disable drawing unselected edges in editmode  */
-			if (col[3]==0)
+			if (col[3] == 0)
 				return DM_DRAW_OPTION_SKIP;
 			
 			glColor4ubv(col);
@@ -2437,17 +2436,17 @@ static void draw_dm_edges(BMEditMesh *em, DerivedMesh *dm)
 /* Draw edges with color interpolated based on selection */
 static DMDrawOption draw_dm_edges_sel_interp__setDrawOptions(void *userData, int index)
 {
-	if (BM_elem_flag_test(EDBM_get_edge_for_index(((void**)userData)[0], index), BM_ELEM_HIDDEN))
+	if (BM_elem_flag_test(EDBM_get_edge_for_index(((void **)userData)[0], index), BM_ELEM_HIDDEN))
 		return DM_DRAW_OPTION_SKIP;
 	else
 		return DM_DRAW_OPTION_NORMAL;
 }
 static void draw_dm_edges_sel_interp__setDrawInterpOptions(void *userData, int index, float t)
 {
-	BMEdge *eed = EDBM_get_edge_for_index(((void**)userData)[0], index);
+	BMEdge *eed = EDBM_get_edge_for_index(((void **)userData)[0], index);
 	unsigned char **cols = userData;
-	unsigned char *col0 = cols[(BM_elem_flag_test(eed->v1, BM_ELEM_SELECT))?2:1];
-	unsigned char *col1 = cols[(BM_elem_flag_test(eed->v2, BM_ELEM_SELECT))?2:1];
+	unsigned char *col0 = cols[(BM_elem_flag_test(eed->v1, BM_ELEM_SELECT)) ? 2 : 1];
+	unsigned char *col1 = cols[(BM_elem_flag_test(eed->v2, BM_ELEM_SELECT)) ? 2 : 1];
 
 	glColor4ub(col0[0] + (col1[0] - col0[0]) * t,
 	           col0[1] + (col1[1] - col0[1]) * t,
@@ -2496,10 +2495,10 @@ static void draw_dm_edges_sharp(BMEditMesh *em, DerivedMesh *dm)
 
 
 /* Draw faces with color set based on selection
-	 * return 2 for the active face so it renders with stipple enabled */
+ * return 2 for the active face so it renders with stipple enabled */
 static DMDrawOption draw_dm_faces_sel__setDrawOptions(void *userData, int index)
 {
-	drawDMFacesSel_userData * data = userData;
+	drawDMFacesSel_userData *data = userData;
 	BMFace *efa = EDBM_get_face_for_index(data->em, index);
 	unsigned char *col;
 	
@@ -2512,8 +2511,8 @@ static DMDrawOption draw_dm_faces_sel__setDrawOptions(void *userData, int index)
 			return DM_DRAW_OPTION_STIPPLE;
 		}
 		else {
-			col = data->cols[BM_elem_flag_test(efa, BM_ELEM_SELECT)?1:0];
-			if (col[3]==0)
+			col = data->cols[BM_elem_flag_test(efa, BM_ELEM_SELECT) ? 1 : 0];
+			if (col[3] == 0)
 				return DM_DRAW_OPTION_SKIP;
 			glColor4ubv(col);
 			return DM_DRAW_OPTION_NORMAL;
@@ -2534,8 +2533,8 @@ static int draw_dm_faces_sel__compareDrawOptions(void *userData, int index, int
 	if (!data->orig_index)
 		return 0;
 
-	efa= EDBM_get_face_for_index(data->em, data->orig_index[index]);
-	next_efa= EDBM_get_face_for_index(data->em, data->orig_index[next_index]);
+	efa = EDBM_get_face_for_index(data->em, data->orig_index[index]);
+	next_efa = EDBM_get_face_for_index(data->em, data->orig_index[next_index]);
 
 	if (efa == next_efa)
 		return 1;
@@ -2543,10 +2542,10 @@ static int draw_dm_faces_sel__compareDrawOptions(void *userData, int index, int
 	if (efa == data->efa_act || next_efa == data->efa_act)
 		return 0;
 
-	col = data->cols[BM_elem_flag_test(efa, BM_ELEM_SELECT)?1:0];
-	next_col = data->cols[BM_elem_flag_test(next_efa, BM_ELEM_SELECT)?1:0];
+	col = data->cols[BM_elem_flag_test(efa, BM_ELEM_SELECT) ? 1 : 0];
+	next_col = data->cols[BM_elem_flag_test(next_efa, BM_ELEM_SELECT) ? 1 : 0];
 
-	if (col[3]==0 || next_col[3]==0)
+	if (col[3] == 0 || next_col[3] == 0)
 		return 0;
 
 	return col == next_col;
@@ -2557,7 +2556,7 @@ static void draw_dm_faces_sel(BMEditMesh *em, DerivedMesh *dm, unsigned char *ba
                               unsigned char *selCol, unsigned char *actCol, BMFace *efa_act)
 {
 	drawDMFacesSel_userData data;
-	data.dm= dm;
+	data.dm = dm;
 	data.cols[0] = baseCol;
 	data.em = em;
 	data.cols[1] = selCol;
@@ -2577,7 +2576,7 @@ static DMDrawOption draw_dm_creases__setDrawOptions(void *userData, int index)
 	if (!crease)
 		return DM_DRAW_OPTION_SKIP;
 	
-	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && *crease!=0.0f) {
+	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && *crease != 0.0f) {
 		UI_ThemeColorBlend(TH_WIRE, TH_EDGE_CREASE, *crease);
 		return DM_DRAW_OPTION_NORMAL;
 	}
@@ -2601,7 +2600,7 @@ static DMDrawOption draw_dm_bweights__setDrawOptions(void *userData, int index)
 	if (!bweight)
 		return DM_DRAW_OPTION_SKIP;
 	
-	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && *bweight!=0.0f) {
+	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && *bweight != 0.0f) {
 		UI_ThemeColorBlend(TH_WIRE, TH_EDGE_SELECT, *bweight);
 		return DM_DRAW_OPTION_NORMAL;
 	}
@@ -2618,14 +2617,14 @@ static void draw_dm_bweights__mapFunc(void *userData, int index, float *co, floa
 	if (!bweight)
 		return;
 	
-	if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && *bweight!=0.0f) {
+	if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && *bweight != 0.0f) {
 		UI_ThemeColorBlend(TH_VERTEX, TH_VERTEX_SELECT, *bweight);
 		bglVertex3fv(co);
 	}
 }
 static void draw_dm_bweights(BMEditMesh *em, Scene *scene, DerivedMesh *dm)
 {
-	ToolSettings *ts= scene->toolsettings;
+	ToolSettings *ts = scene->toolsettings;
 
 	if (ts->selectmode & SCE_SELECT_VERTEX) {
 		glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE) + 2);
@@ -2652,24 +2651,24 @@ static void draw_dm_bweights(BMEditMesh *em, Scene *scene, DerivedMesh *dm)
 static void draw_em_fancy_verts(Scene *scene, View3D *v3d, Object *obedit, 
                                 BMEditMesh *em, DerivedMesh *cageDM, BMVert *eve_act)
 {
-	ToolSettings *ts= scene->toolsettings;
+	ToolSettings *ts = scene->toolsettings;
 	int sel;
 
-	if (v3d->zbuf) glDepthMask(0);		// disable write in zbuffer, zbuf select
+	if (v3d->zbuf) glDepthMask(0);      // disable write in zbuffer, zbuf select
 
-	for (sel=0; sel<2; sel++) {
+	for (sel = 0; sel < 2; sel++) {
 		unsigned char col[4], fcol[4];
 		int pass;
 
-		UI_GetThemeColor3ubv(sel?TH_VERTEX_SELECT:TH_VERTEX, col);
-		UI_GetThemeColor3ubv(sel?TH_FACE_DOT:TH_WIRE, fcol);
+		UI_GetThemeColor3ubv(sel ? TH_VERTEX_SELECT : TH_VERTEX, col);
+		UI_GetThemeColor3ubv(sel ? TH_FACE_DOT : TH_WIRE, fcol);
 
-		for (pass=0; pass<2; pass++) {
+		for (pass = 0; pass < 2; pass++) {
 			float size = UI_GetThemeValuef(TH_VERTEX_SIZE);
 			float fsize = UI_GetThemeValuef(TH_FACEDOT_SIZE);
 
-			if (pass==0) {
-				if (v3d->zbuf && !(v3d->flag&V3D_ZBUF_SELECT)) {
+			if (pass == 0) {
+				if (v3d->zbuf && !(v3d->flag & V3D_ZBUF_SELECT)) {
 					glDisable(GL_DEPTH_TEST);
 
 					glEnable(GL_BLEND);
@@ -2678,8 +2677,8 @@ static void draw_em_fancy_verts(Scene *scene, View3D *v3d, Object *obedit,
 					continue;
 				}
 
-				size = (size > 2.1f ? size/2.0f:size);
-				fsize = (fsize > 2.1f ? fsize/2.0f:fsize);
+				size = (size > 2.1f ? size / 2.0f : size);
+				fsize = (fsize > 2.1f ? fsize / 2.0f : fsize);
 				col[3] = fcol[3] = 100;
 			}
 			else {
@@ -2698,7 +2697,7 @@ static void draw_em_fancy_verts(Scene *scene, View3D *v3d, Object *obedit,
 				draw_dm_face_centers(em, cageDM, sel);
 			}
 			
-			if (pass==0) {
+			if (pass == 0) {
 				glDisable(GL_BLEND);
 				glEnable(GL_DEPTH_TEST);
 			}
@@ -2713,7 +2712,7 @@ static void draw_em_fancy_edges(BMEditMesh *em, Scene *scene, View3D *v3d,
                                 Mesh *me, DerivedMesh *cageDM, short sel_only,
                                 BMEdge *eed_act)
 {
-	ToolSettings *ts= scene->toolsettings;
+	ToolSettings *ts = scene->toolsettings;
 	int pass;
 	unsigned char wireCol[4], selCol[4], actCol[4];
 
@@ -2727,10 +2726,10 @@ static void draw_em_fancy_edges(BMEditMesh *em, Scene *scene, View3D *v3d,
 	if (sel_only)
 		wireCol[3] = 0;
 
-	for (pass=0; pass<2; pass++) {
+	for (pass = 0; pass < 2; pass++) {
 		/* show wires in transparant when no zbuf clipping for select */
-		if (pass==0) {
-			if (v3d->zbuf && (v3d->flag & V3D_ZBUF_SELECT)==0) {
+		if (pass == 0) {
+			if (v3d->zbuf && (v3d->flag & V3D_ZBUF_SELECT) == 0) {
 				glEnable(GL_BLEND);
 				glDisable(GL_DEPTH_TEST);
 				selCol[3] = 85;
@@ -2765,7 +2764,7 @@ static void draw_em_fancy_edges(BMEditMesh *em, Scene *scene, View3D *v3d,
 			}
 		}
 
-		if (pass==0) {
+		if (pass == 0) {
 			glDisable(GL_BLEND);
 			glEnable(GL_DEPTH_TEST);
 		}
@@ -2775,27 +2774,27 @@ static void draw_em_fancy_edges(BMEditMesh *em, Scene *scene, View3D *v3d,
 static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitSettings *unit)
 {
 	const short txt_flag = V3D_CACHE_TEXT_ASCII | V3D_CACHE_TEXT_LOCALCLIP;
-	Mesh *me= ob->data;
+	Mesh *me = ob->data;
 	float v1[3], v2[3], v3[3], vmid[3], fvec[3];
 	char numstr[32]; /* Stores the measurement display text here */
 	const char *conv_float; /* Use a float conversion matching the grid size */
-	unsigned char col[4]= {0, 0, 0, 255}; /* color of the text to draw */
+	unsigned char col[4] = {0, 0, 0, 255}; /* color of the text to draw */
 	float area; /* area of the face */
-	float grid= unit->system ? unit->scale_length : v3d->grid;
-	const int do_split= unit->flag & USER_UNIT_OPT_SPLIT;
-	const int do_global= v3d->flag & V3D_GLOBAL_STATS;
-	const int do_moving= G.moving;
+	float grid = unit->system ? unit->scale_length : v3d->grid;
+	const int do_split = unit->flag & USER_UNIT_OPT_SPLIT;
+	const int do_global = v3d->flag & V3D_GLOBAL_STATS;
+	const int do_moving = G.moving;
 
 	BMIter iter;
 	int i;
 
 	/* make the precision of the pronted value proportionate to the gridsize */
 
-	if (grid < 0.01f)		conv_float= "%.6g";
-	else if (grid < 0.1f)	conv_float= "%.5g";
-	else if (grid < 1.0f)	conv_float= "%.4g";
-	else if (grid < 10.0f)	conv_float= "%.3g";
-	else					conv_float= "%.2g";
+	if (grid < 0.01f) conv_float = "%.6g";
+	else if (grid < 0.1f) conv_float = "%.5g";
+	else if (grid < 1.0f) conv_float = "%.4g";
+	else if (grid < 10.0f) conv_float = "%.3g";
+	else conv_float = "%.2g";
 	
 	if (me->drawflag & ME_DRAWEXTRA_EDGELEN) {
 		BMEdge *eed;
@@ -2803,7 +2802,7 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
 		UI_GetThemeColor3ubv(TH_DRAWEXTRA_EDGELEN, col);
 
 		eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL);
-		for (; eed; eed=BM_iter_step(&iter)) {
+		for (; eed; eed = BM_iter_step(&iter)) {
 			/* draw selected edges, or edges next to selected verts while draging */
 			if (BM_elem_flag_test(eed, BM_ELEM_SELECT) ||
 			    (do_moving && (BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) ||
@@ -2839,16 +2838,16 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
 		BMFace *f;
 		int n;
 
-#define DRAW_EM_MEASURE_STATS_FACEAREA()                                             \
-		if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {                                  \
-			mul_v3_fl(vmid, 1.0/n);                                                  \
-			if (unit->system)                                                        \
-				bUnit_AsString(numstr, sizeof(numstr), area*unit->scale_length,      \
-					3, unit->system, B_UNIT_LENGTH, do_split, FALSE);                \
-			else                                                                     \
-				BLI_snprintf(numstr, sizeof(numstr), conv_float, area);              \
-			view3d_cached_text_draw_add(vmid, numstr, 0, txt_flag, col);             \
-		}
+#define DRAW_EM_MEASURE_STATS_FACEAREA()                                      \
+	if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {                               \
+		mul_v3_fl(vmid, 1.0 / n);                                             \
+		if (unit->system)                                                     \
+			bUnit_AsString(numstr, sizeof(numstr), area * unit->scale_length, \
+			               3, unit->system, B_UNIT_LENGTH, do_split, FALSE);  \
+		else                                                                  \
+			BLI_snprintf(numstr, sizeof(numstr), conv_float, area);           \
+		view3d_cached_text_draw_add(vmid, numstr, 0, txt_flag, col);          \
+	}
 
 		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col);
 		
@@ -2894,7 +2893,7 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
 
 
 		for (efa = BM_iter_new(&iter, em->bm, BM_FACES_OF_MESH, NULL);
-		     efa; efa=BM_iter_step(&iter))
+		     efa; efa = BM_iter_step(&iter))
 		{
 			BMIter liter;
 			BMLoop *loop;
@@ -2940,10 +2939,10 @@ static void draw_em_indices(BMEditMesh *em)
 	unsigned char col[4];
 
 	BMIter iter;
-	BMesh *bm= em->bm;
+	BMesh *bm = em->bm;
 
 	/* For now, reuse appropriate theme colors from stats text colors */
-	i= 0;
+	i = 0;
 	if (em->selectmode & SCE_SELECT_VERTEX) {
 		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col);
 		BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
@@ -2956,7 +2955,7 @@ static void draw_em_indices(BMEditMesh *em)
 	}
 
 	if (em->selectmode & SCE_SELECT_EDGE) {
-		i= 0;
+		i = 0;
 		UI_GetThemeColor3ubv(TH_DRAWEXTRA_EDGELEN, col);
 		BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
 			if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
@@ -2969,7 +2968,7 @@ static void draw_em_indices(BMEditMesh *em)
 	}
 
 	if (em->selectmode & SCE_SELECT_FACE) {
-		i= 0;
+		i = 0;
 		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col);
 		BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
 			if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {
@@ -2987,7 +2986,7 @@ static DMDrawOption draw_em_fancy__setFaceOpts(void *userData, int index)
 	BMFace *efa = EDBM_get_face_for_index(userData, index);
 
 	if (efa && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		GPU_enable_material(efa->mat_nr+1, NULL);
+		GPU_enable_material(efa->mat_nr + 1, NULL);
 		return DM_DRAW_OPTION_NORMAL;
 	}
 	else
@@ -3014,28 +3013,28 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 	BMVert *eve_act = NULL;
 	
 	if (em->bm->selected.last) {
-		BMEditSelection *ese= em->bm->selected.last;
+		BMEditSelection *ese = em->bm->selected.last;
 		/* face is handeled above */
 #if 0
-		if (ese->type == BM_FACE ) {
+		if (ese->type == BM_FACE) {
 			efa_act = (BMFace *)ese->data;
 		}
 		else 
 #endif
-		if ( ese->htype == BM_EDGE ) {
+		if (ese->htype == BM_EDGE) {
 			eed_act = (BMEdge *)ese->ele;
 		}
-		else if ( ese->htype == BM_VERT ) {
+		else if (ese->htype == BM_VERT) {
 			eve_act = (BMVert *)ese->ele;
 		}
 	}
 	
 	EDBM_init_index_arrays(em, 1, 1, 1);
 
-	if (dt>OB_WIRE) {
+	if (dt > OB_WIRE) {
 		if (CHECK_OB_DRAWTEXTURE(v3d, dt)) {
 			if (draw_glsl_material(scene, ob, v3d, dt)) {
-				glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
+				glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
 
 				finalDM->drawMappedFacesGLSL(finalDM, GPU_enable_material,
 				                             draw_em_fancy__setGLSLFaceOpts, em);
@@ -3053,7 +3052,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 			glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, (me->flag & ME_TWOSIDED) ? GL_TRUE : GL_FALSE);
 
 			glEnable(GL_LIGHTING);
-			glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
+			glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
 			finalDM->drawMappedFaces(finalDM, draw_em_fancy__setFaceOpts, GPU_enable_material, NULL, me->edit_btmesh, 0);
 
 			glFrontFace(GL_CCW);
@@ -3069,13 +3068,13 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 		glDepthMask(0);
 	}
 	else {
-		if (cageDM!=finalDM) {
+		if (cageDM != finalDM) {
 			UI_ThemeColorBlend(TH_WIRE, TH_BACK, 0.7);
 			finalDM->drawEdges(finalDM, 1, 0);
 		}
 	}
 	
-	if (me->drawflag & ME_DRAWFACES) {	/* transp faces */
+	if (me->drawflag & ME_DRAWFACES) {  /* transp faces */
 		unsigned char col1[4], col2[4], col3[4];
 
 		UI_GetThemeColor4ubv(TH_FACE, col1);
@@ -3083,7 +3082,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 		UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, col3);
 		
 		glEnable(GL_BLEND);
-		glDepthMask(0);		// disable write in zbuffer, needed for nice transp
+		glDepthMask(0);     // disable write in zbuffer, needed for nice transp
 		
 		/* don't draw unselected faces, only selected, this is MUCH nicer when texturing */
 		if (CHECK_OB_DRAWTEXTURE(v3d, dt))
@@ -3092,7 +3091,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 		draw_dm_faces_sel(em, cageDM, col1, col2, col3, efa_act);
 
 		glDisable(GL_BLEND);
-		glDepthMask(1);		// restore write in zbuffer
+		glDepthMask(1);     // restore write in zbuffer
 	}
 	else if (efa_act) {
 		/* even if draw faces is off it would be nice to draw the stipple face
@@ -3103,17 +3102,17 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 		UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, col3);
 		
 		glEnable(GL_BLEND);
-		glDepthMask(0);		// disable write in zbuffer, needed for nice transp
+		glDepthMask(0);     // disable write in zbuffer, needed for nice transp
 		
 		draw_dm_faces_sel(em, cageDM, col1, col2, col3, efa_act);
 
 		glDisable(GL_BLEND);
-		glDepthMask(1);		// restore write in zbuffer
+		glDepthMask(1);     // restore write in zbuffer
 		
 	}
 
 	/* here starts all fancy draw-extra over */
-	if ((me->drawflag & ME_DRAWEDGES)==0 && CHECK_OB_DRAWTEXTURE(v3d, dt)) {
+	if ((me->drawflag & ME_DRAWEDGES) == 0 && CHECK_OB_DRAWTEXTURE(v3d, dt)) {
 		/* we are drawing textures and 'ME_DRAWEDGES' is disabled, don't draw any edges */
 		
 		/* only draw selected edges otherwise there is no way of telling if a face is selected */
@@ -3127,7 +3126,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 
 			draw_dm_edges_seams(em, cageDM);
 
-			glColor3ub(0,0,0);
+			glColor3ub(0, 0, 0);
 			glLineWidth(1);
 		}
 		
@@ -3137,7 +3136,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 
 			draw_dm_edges_sharp(em, cageDM);
 
-			glColor3ub(0,0,0);
+			glColor3ub(0, 0, 0);
 			glLineWidth(1);
 		}
 
@@ -3162,7 +3161,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 			draw_dm_vert_normals(em, scene, cageDM);
 		}
 
-		if ( (me->drawflag & (ME_DRAWEXTRA_EDGELEN|ME_DRAWEXTRA_FACEAREA|ME_DRAWEXTRA_FACEANG)) &&
+		if ( (me->drawflag & (ME_DRAWEXTRA_EDGELEN | ME_DRAWEXTRA_FACEAREA | ME_DRAWEXTRA_FACEANG)) &&
 		     !(v3d->flag2 & V3D_RENDER_OVERRIDE))
 		{
 			draw_em_measure_stats(v3d, ob, em, &scene->unit);
@@ -3174,7 +3173,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 		}
 	}
 
-	if (dt>OB_WIRE) {
+	if (dt > OB_WIRE) {
 		glDepthMask(1);
 		bglPolygonOffset(rv3d->dist, 0.0);
 		GPU_disable_material();
@@ -3213,14 +3212,14 @@ static void draw_mesh_object_outline(View3D *v3d, Object *ob, DerivedMesh *dm)
 
 static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, int dt, int flag)
 {
-	Object *ob= base->object;
+	Object *ob = base->object;
 	Mesh *me = ob->data;
-	Material *ma= give_current_material(ob, 1);
+	Material *ma = give_current_material(ob, 1);
 	const short hasHaloMat = (ma && (ma->material_type == MA_TYPE_HALO));
-	eWireDrawMode draw_wire= OBDRAW_WIRE_OFF;
+	eWireDrawMode draw_wire = OBDRAW_WIRE_OFF;
 	int /* totvert,*/ totedge, totface;
-	DerivedMesh *dm= mesh_get_derived_final(scene, ob, scene->customdata_mask);
-	const short is_obact= (ob == OBACT);
+	DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);
+	const short is_obact = (ob == OBACT);
 	int draw_flags = (is_obact && paint_facesel_test(ob)) ? DRAW_FACE_SELECT : 0;
 
 	if (!dm)
@@ -3233,10 +3232,10 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 
 	/* Unwanted combination */
 	if (draw_flags & DRAW_FACE_SELECT) {
-		draw_wire= OBDRAW_WIRE_OFF;
+		draw_wire = OBDRAW_WIRE_OFF;
 	}
 	else if (ob->dtx & OB_DRAWWIRE) {
-		draw_wire= OBDRAW_WIRE_ON_DEPTH; /* draw wire after solid using zoffset and depth buffer adjusment */
+		draw_wire = OBDRAW_WIRE_ON_DEPTH; /* draw wire after solid using zoffset and depth buffer adjusment */
 	}
 	
 	/* totvert = dm->getNumVerts(dm); */ /*UNUSED*/
@@ -3244,25 +3243,25 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 	totface = dm->getNumTessFaces(dm);
 	
 	/* vertexpaint, faceselect wants this, but it doesnt work for shaded? */
-	glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
+	glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
 
-	if (dt==OB_BOUNDBOX) {
-		if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_WIRE)==0)
+	if (dt == OB_BOUNDBOX) {
+		if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_WIRE) == 0)
 			draw_bounding_volume(scene, ob, ob->boundtype);
 	}
-	else if (hasHaloMat || (totface==0 && totedge==0)) {
+	else if (hasHaloMat || (totface == 0 && totedge == 0)) {
 		glPointSize(1.5);
 		dm->drawVerts(dm);
 		glPointSize(1.0);
 	}
-	else if (dt==OB_WIRE || totface==0) {
-		draw_wire= OBDRAW_WIRE_ON; /* draw wire only, no depth buffer stuff  */
+	else if (dt == OB_WIRE || totface == 0) {
+		draw_wire = OBDRAW_WIRE_ON; /* draw wire only, no depth buffer stuff  */
 	}
 	else if ( (draw_flags & DRAW_FACE_SELECT || (is_obact && ob->mode & OB_MODE_TEXTURE_PAINT)) ||
 	          CHECK_OB_DRAWTEXTURE(v3d, dt))
 	{
 		if ( (v3d->flag & V3D_SELECT_OUTLINE) &&
-		     ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) &&
+		     ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) &&
 		     (base->flag & SELECT) &&
 		     !(G.f & G_PICKSEL || (draw_flags & DRAW_FACE_SELECT)) &&
 		     (draw_wire == OBDRAW_WIRE_OFF))
@@ -3271,7 +3270,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 		}
 
 		if (draw_glsl_material(scene, ob, v3d, dt) && !(draw_flags & DRAW_MODIFIERS_PREVIEW)) {
-			glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
+			glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
 
 			dm->drawFacesGLSL(dm, GPU_enable_material);
 //			if (get_ob_property(ob, "Text"))
@@ -3290,11 +3289,11 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 			else
 				UI_ThemeColor(TH_WIRE);
 
-			if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
+			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0)
 				dm->drawLooseEdges(dm);
 		}
 	}
-	else if (dt==OB_SOLID) {
+	else if (dt == OB_SOLID) {
 		if (is_obact && ob->mode & OB_MODE_WEIGHT_PAINT) {
 			/* weight paint in solid mode, special case. focus on making the weights clear
 			 * rather than the shading, this is also forced in wire view */
@@ -3303,7 +3302,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 			                    DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH);
 
 			bglPolygonOffset(rv3d->dist, 1.0);
-			glDepthMask(0);	// disable write in zbuffer, selected edge wires show better
+			glDepthMask(0); // disable write in zbuffer, selected edge wires show better
 
 			glEnable(GL_BLEND);
 			glColor4ub(255, 255, 255, 96);
@@ -3320,17 +3319,17 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 			GPU_disable_material();
 			
 			/* since we already draw wire as wp guide, don't draw over the top */
-			draw_wire= OBDRAW_WIRE_OFF;
+			draw_wire = OBDRAW_WIRE_OFF;
 		}
 		else if (draw_flags & DRAW_MODIFIERS_PREVIEW) {
 			/* for object selection draws no shade */
-			if (flag & (DRAW_PICKING|DRAW_CONSTCOLOR)) {
+			if (flag & (DRAW_PICKING | DRAW_CONSTCOLOR)) {
 				dm->drawFacesSolid(dm, NULL, 0, GPU_enable_material);
 			}
 			else {
 				/* draw outline */
 				if ( (v3d->flag & V3D_SELECT_OUTLINE) &&
-				     ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) &&
+				     ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) &&
 				     (base->flag & SELECT) &&
 				     (draw_wire == OBDRAW_WIRE_OFF) &&
 				     (ob->sculpt == NULL))
@@ -3345,7 +3344,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 				
 				/* set default spec */
 				glColorMaterial(GL_FRONT_AND_BACK, GL_SPECULAR);
-				glEnable(GL_COLOR_MATERIAL);	/* according manpages needed */
+				glEnable(GL_COLOR_MATERIAL);    /* according manpages needed */
 				glColor3ub(120, 120, 120);
 				glDisable(GL_COLOR_MATERIAL);
 				/* diffuse */
@@ -3364,7 +3363,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 			Paint *p;
 
 			if ( (v3d->flag & V3D_SELECT_OUTLINE) &&
-			     ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) &&
+			     ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) &&
 			     (base->flag & SELECT) &&
 			     (draw_wire == OBDRAW_WIRE_OFF) &&
 			     (ob->sculpt == NULL))
@@ -3375,12 +3374,12 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 			glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, (me->flag & ME_TWOSIDED) ? GL_TRUE : GL_FALSE);
 
 			glEnable(GL_LIGHTING);
-			glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
+			glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
 
-			if (ob->sculpt && (p=paint_get_active(scene))) {
+			if (ob->sculpt && (p = paint_get_active(scene))) {
 				float planes[4][4];
 				float (*fpl)[4] = NULL;
-				int fast= (p->flags & PAINT_FAST_NAVIGATE) && (rv3d->rflag & RV3D_NAVIGATING);
+				int fast = (p->flags & PAINT_FAST_NAVIGATE) && (rv3d->rflag & RV3D_NAVIGATING);
 
 				if (ob->sculpt->partial_redraw) {
 					if (ar->do_draw & RGN_DRAW_PARTIAL) {
@@ -3408,11 +3407,11 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 			else {
 				UI_ThemeColor(TH_WIRE);
 			}
-			if (!ob->sculpt && (v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
+			if (!ob->sculpt && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0)
 				dm->drawLooseEdges(dm);
 		}
 	}
-	else if (dt==OB_PAINT) {
+	else if (dt == OB_PAINT) {
 		if (is_obact) {
 			if (ob && ob->mode & OB_MODE_WEIGHT_PAINT) {
 				/* enforce default material settings */
@@ -3420,7 +3419,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 				
 				/* but set default spec */
 				glColorMaterial(GL_FRONT_AND_BACK, GL_SPECULAR);
-				glEnable(GL_COLOR_MATERIAL);	/* according manpages needed */
+				glEnable(GL_COLOR_MATERIAL);    /* according manpages needed */
 				glColor3ub(120, 120, 120);
 				glDisable(GL_COLOR_MATERIAL);
 				/* diffuse */
@@ -3435,7 +3434,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 
 				GPU_disable_material();
 			}
-			else if (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_TEXTURE_PAINT)) {
+			else if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_TEXTURE_PAINT)) {
 				if (me->mloopcol)
 					dm->drawMappedFaces(dm, NULL, GPU_enable_material, NULL, NULL,
 					                    DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH);
@@ -3449,23 +3448,23 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 	}
 	
 	/* set default draw color back for wire or for draw-extra later on */
-	if (dt!=OB_WIRE) {
+	if (dt != OB_WIRE) {
 		if (base->flag & SELECT) {
 			if (is_obact && ob->flag & OB_FROMGROUP)
 				UI_ThemeColor(TH_GROUP_ACTIVE);
 			else if (ob->flag & OB_FROMGROUP)
 				UI_ThemeColorShade(TH_GROUP_ACTIVE, -16);
-			else if (flag!=DRAW_CONSTCOLOR)
+			else if (flag != DRAW_CONSTCOLOR)
 				UI_ThemeColor(is_obact ? TH_ACTIVE : TH_SELECT);
 			else
-				glColor3ub(80,80,80);
+				glColor3ub(80, 80, 80);
 		}
 		else {
 			if (ob->flag & OB_FROMGROUP)
 				UI_ThemeColor(TH_GROUP);
 			else {
-				if (ob->dtx & OB_DRAWWIRE && flag==DRAW_CONSTCOLOR)
-					glColor3ub(80,80,80);
+				if (ob->dtx & OB_DRAWWIRE && flag == DRAW_CONSTCOLOR)
+					glColor3ub(80, 80, 80);
 				else
 					UI_ThemeColor(TH_WIRE);
 			}
@@ -3494,15 +3493,15 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 		 * if draw wire is 1 then just drawing wire, no need for depth buffer stuff,
 		 * otherwise this wire is to overlay solid mode faces so do some depth buffer tricks.
 		 */
-		if (dt!=OB_WIRE && (draw_wire == OBDRAW_WIRE_ON_DEPTH)) {
+		if (dt != OB_WIRE && (draw_wire == OBDRAW_WIRE_ON_DEPTH)) {
 			bglPolygonOffset(rv3d->dist, 1.0);
-			glDepthMask(0);	// disable write in zbuffer, selected edge wires show better
+			glDepthMask(0); // disable write in zbuffer, selected edge wires show better
 		}
 		
-		if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_SOLID)==0)
-			dm->drawEdges(dm, (dt==OB_WIRE || totface==0), me->drawflag & ME_ALLEDGES);
+		if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_SOLID) == 0)
+			dm->drawEdges(dm, (dt == OB_WIRE || totface == 0), me->drawflag & ME_ALLEDGES);
 
-		if (dt!=OB_WIRE && (draw_wire == OBDRAW_WIRE_ON_DEPTH)) {
+		if (dt != OB_WIRE && (draw_wire == OBDRAW_WIRE_ON_DEPTH)) {
 			glDepthMask(1);
 			bglPolygonOffset(rv3d->dist, 0.0);
 		}
@@ -3523,39 +3522,39 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 /* returns 1 if nothing was drawn, for detecting to draw an object center */
 static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, int dt, int flag)
 {
-	Object *ob= base->object;
-	Object *obedit= scene->obedit;
-	Mesh *me= ob->data;
-	BMEditMesh *em= me->edit_btmesh;
-	int do_alpha_after= 0, drawlinked= 0, retval= 0, glsl, check_alpha, i;
+	Object *ob = base->object;
+	Object *obedit = scene->obedit;
+	Mesh *me = ob->data;
+	BMEditMesh *em = me->edit_btmesh;
+	int do_alpha_after = 0, drawlinked = 0, retval = 0, glsl, check_alpha, i;
 
 	/* If we are drawing shadows and any of the materials don't cast a shadow,
 	 * then don't draw the object */
 	if (v3d->flag2 & V3D_RENDER_SHADOW) {
-		for (i=0; i<ob->totcol; ++i) {
-			Material *ma= give_current_material(ob, i);
+		for (i = 0; i < ob->totcol; ++i) {
+			Material *ma = give_current_material(ob, i);
 			if (ma && !(ma->mode & MA_SHADBUF)) {
 				return 1;
 			}
 		}
 	}
 	
-	if (obedit && ob!=obedit && ob->data==obedit->data) {
+	if (obedit && ob != obedit && ob->data == obedit->data) {
 		if (ob_get_key(ob) || ob_get_key(obedit)) {}
 		else if (ob->modifiers.first || obedit->modifiers.first) {}
-		else drawlinked= 1;
+		else drawlinked = 1;
 	}
 	
-	if (ob==obedit || drawlinked) {
+	if (ob == obedit || drawlinked) {
 		DerivedMesh *finalDM, *cageDM;
 		
-		if (obedit!=ob)
+		if (obedit != ob)
 			finalDM = cageDM = editbmesh_get_derived_base(ob, em);
 		else
 			cageDM = editbmesh_get_derived_cage_and_final(scene, ob, em, &finalDM,
 			                                              scene->customdata_mask);
 
-		if (dt>OB_WIRE) {
+		if (dt > OB_WIRE) {
 			glsl = draw_glsl_material(scene, ob, v3d, dt);
 
 			GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
@@ -3565,25 +3564,25 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 
 		GPU_end_object_materials();
 
-		if (obedit!=ob && finalDM)
+		if (obedit != ob && finalDM)
 			finalDM->release(finalDM);
 	}
 	else {
 		/* don't create boundbox here with mesh_get_bb(), the derived system will make it, puts deformed bb's OK */
-		if (me->totpoly <= 4 || ED_view3d_boundbox_clip(rv3d, ob->obmat, (ob->bb)? ob->bb: me->bb)) {
+		if (me->totpoly <= 4 || ED_view3d_boundbox_clip(rv3d, ob->obmat, (ob->bb) ? ob->bb : me->bb)) {
 			glsl = draw_glsl_material(scene, ob, v3d, dt);
 			check_alpha = check_alpha_pass(base);
 
-			if (dt==OB_SOLID || glsl) {
+			if (dt == OB_SOLID || glsl) {
 				GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl,
-				                           (check_alpha)? &do_alpha_after: NULL);
+				                           (check_alpha) ? &do_alpha_after : NULL);
 			}
 
 			draw_mesh_fancy(scene, ar, v3d, rv3d, base, dt, flag);
 
 			GPU_end_object_materials();
 			
-			if (me->totvert==0) retval= 1;
+			if (me->totvert == 0) retval = 1;
 		}
 	}
 	
@@ -3608,8 +3607,8 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 
 /* ************** DRAW DISPLIST ****************** */
 
-static int draw_index_wire= 1;
-static int index3_nors_incr= 1;
+static int draw_index_wire = 1;
+static int index3_nors_incr = 1;
 
 /* returns 1 when nothing was drawn */
 static int drawDispListwire(ListBase *dlbase)
@@ -3618,57 +3617,57 @@ static int drawDispListwire(ListBase *dlbase)
 	int parts, nr;
 	float *data;
 
-	if (dlbase==NULL) return 1;
+	if (dlbase == NULL) return 1;
 	
 	glEnableClientState(GL_VERTEX_ARRAY);
 	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
-	for (dl= dlbase->first; dl; dl= dl->next) {
-		if (dl->parts==0 || dl->nr==0)
+	for (dl = dlbase->first; dl; dl = dl->next) {
+		if (dl->parts == 0 || dl->nr == 0)
 			continue;
 		
-		data= dl->verts;
+		data = dl->verts;
 
-		switch(dl->type) {
+		switch (dl->type) {
 			case DL_SEGM:
 
 				glVertexPointer(3, GL_FLOAT, 0, data);
 
-				for (parts=0; parts<dl->parts; parts++)
-					glDrawArrays(GL_LINE_STRIP, parts*dl->nr, dl->nr);
+				for (parts = 0; parts < dl->parts; parts++)
+					glDrawArrays(GL_LINE_STRIP, parts * dl->nr, dl->nr);
 				
 				break;
 			case DL_POLY:
 
 				glVertexPointer(3, GL_FLOAT, 0, data);
 
-				for (parts=0; parts<dl->parts; parts++)
-					glDrawArrays(GL_LINE_LOOP, parts*dl->nr, dl->nr);
+				for (parts = 0; parts < dl->parts; parts++)
+					glDrawArrays(GL_LINE_LOOP, parts * dl->nr, dl->nr);
 
 				break;
 			case DL_SURF:
 
 				glVertexPointer(3, GL_FLOAT, 0, data);
 
-				for (parts=0; parts<dl->parts; parts++) {
+				for (parts = 0; parts < dl->parts; parts++) {
 					if (dl->flag & DL_CYCL_U)
-						glDrawArrays(GL_LINE_LOOP, parts*dl->nr, dl->nr);
+						glDrawArrays(GL_LINE_LOOP, parts * dl->nr, dl->nr);
 					else
-						glDrawArrays(GL_LINE_STRIP, parts*dl->nr, dl->nr);
+						glDrawArrays(GL_LINE_STRIP, parts * dl->nr, dl->nr);
 				}
 
-				for (nr=0; nr<dl->nr; nr++) {
-					int ofs= 3*dl->nr;
+				for (nr = 0; nr < dl->nr; nr++) {
+					int ofs = 3 * dl->nr;
 
-					data= (  dl->verts )+3*nr;
-					parts= dl->parts;
+					data = (dl->verts) + 3 * nr;
+					parts = dl->parts;
 
 					if (dl->flag & DL_CYCL_V) glBegin(GL_LINE_LOOP);
 					else glBegin(GL_LINE_STRIP);
 
 					while (parts--) {
 						glVertex3fv(data);
-						data+=ofs;
+						data += ofs;
 					}
 					glEnd();
 
@@ -3684,14 +3683,14 @@ static int drawDispListwire(ListBase *dlbase)
 			case DL_INDEX3:
 				if (draw_index_wire) {
 					glVertexPointer(3, GL_FLOAT, 0, dl->verts);
-					glDrawElements(GL_TRIANGLES, 3*dl->parts, GL_UNSIGNED_INT, dl->index);
+					glDrawElements(GL_TRIANGLES, 3 * dl->parts, GL_UNSIGNED_INT, dl->index);
 				}
 				break;
 
 			case DL_INDEX4:
 				if (draw_index_wire) {
 					glVertexPointer(3, GL_FLOAT, 0, dl->verts);
-					glDrawElements(GL_QUADS, 4*dl->parts, GL_UNSIGNED_INT, dl->index);
+					glDrawElements(GL_QUADS, 4 * dl->parts, GL_UNSIGNED_INT, dl->index);
 				}
 				break;
 		}
@@ -3710,7 +3709,7 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 	float *data, curcol[4];
 	float *ndata;
 	
-	if (lb==NULL) return;
+	if (lb == NULL) return;
 	
 	/* for drawing wire */
 	glGetFloatv(GL_CURRENT_COLOR, curcol);
@@ -3721,18 +3720,18 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 	if (ob->transflag & OB_NEG_SCALE) glFrontFace(GL_CW);
 	else glFrontFace(GL_CCW);
 	
-	if (ob->type==OB_MBALL) {	// mball always smooth shaded
+	if (ob->type == OB_MBALL) {   // mball always smooth shaded
 		glShadeModel(GL_SMOOTH);
 	}
 	
-	dl= lb->first;
+	dl = lb->first;
 	while (dl) {
-		data= dl->verts;
-		ndata= dl->nors;
+		data = dl->verts;
+		ndata = dl->nors;
 
-		switch(dl->type) {
+		switch (dl->type) {
 			case DL_SEGM:
-				if (ob->type==OB_SURF) {
+				if (ob->type == OB_SURF) {
 					int nr;
 
 					glDisable(GL_LIGHTING);
@@ -3742,7 +3741,7 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 					// glDrawArrays(GL_LINE_STRIP, 0, dl->nr);
 
 					glBegin(GL_LINE_STRIP);
-					for (nr= dl->nr; nr; nr--, data+=3)
+					for (nr = dl->nr; nr; nr--, data += 3)
 						glVertex3fv(data);
 					glEnd();
 
@@ -3750,7 +3749,7 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 				}
 				break;
 			case DL_POLY:
-				if (ob->type==OB_SURF) {
+				if (ob->type == OB_SURF) {
 					int nr;
 
 					glDisable(GL_LIGHTING);
@@ -3760,7 +3759,7 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 					//glDrawArrays(GL_LINE_LOOP, 0, dl->nr);
 
 					glBegin(GL_LINE_LOOP);
-					for (nr= dl->nr; nr; nr--, data+=3)
+					for (nr = dl->nr; nr; nr--, data += 3)
 						glVertex3fv(data);
 					glEnd();
 
@@ -3770,7 +3769,7 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 			case DL_SURF:
 
 				if (dl->index) {
-					GPU_enable_material(dl->col+1, (glsl)? &gattribs: NULL);
+					GPU_enable_material(dl->col + 1, (glsl) ? &gattribs : NULL);
 
 					if (dl->rt & CU_SMOOTH) glShadeModel(GL_SMOOTH);
 					else glShadeModel(GL_FLAT);
@@ -3778,13 +3777,13 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 					glEnableClientState(GL_NORMAL_ARRAY);
 					glVertexPointer(3, GL_FLOAT, 0, dl->verts);
 					glNormalPointer(GL_FLOAT, 0, dl->nors);
-					glDrawElements(GL_QUADS, 4*dl->totindex, GL_UNSIGNED_INT, dl->index);
+					glDrawElements(GL_QUADS, 4 * dl->totindex, GL_UNSIGNED_INT, dl->index);
 					glDisableClientState(GL_NORMAL_ARRAY);
 				}
 				break;
 
 			case DL_INDEX3:
-				GPU_enable_material(dl->col+1, (glsl)? &gattribs: NULL);
+				GPU_enable_material(dl->col + 1, (glsl) ? &gattribs : NULL);
 
 				glVertexPointer(3, GL_FLOAT, 0, dl->verts);
 
@@ -3796,7 +3795,7 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 				else
 					glNormal3fv(ndata);
 
-				glDrawElements(GL_TRIANGLES, 3*dl->parts, GL_UNSIGNED_INT, dl->index);
+				glDrawElements(GL_TRIANGLES, 3 * dl->parts, GL_UNSIGNED_INT, dl->index);
 
 				if (index3_nors_incr)
 					glDisableClientState(GL_NORMAL_ARRAY);
@@ -3804,17 +3803,17 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 				break;
 
 			case DL_INDEX4:
-				GPU_enable_material(dl->col+1, (glsl)? &gattribs: NULL);
+				GPU_enable_material(dl->col + 1, (glsl) ? &gattribs : NULL);
 
 				glEnableClientState(GL_NORMAL_ARRAY);
 				glVertexPointer(3, GL_FLOAT, 0, dl->verts);
 				glNormalPointer(GL_FLOAT, 0, dl->nors);
-				glDrawElements(GL_QUADS, 4*dl->parts, GL_UNSIGNED_INT, dl->index);
+				glDrawElements(GL_QUADS, 4 * dl->parts, GL_UNSIGNED_INT, dl->index);
 				glDisableClientState(GL_NORMAL_ARRAY);
 
 				break;
 		}
-		dl= dl->next;
+		dl = dl->next;
 	}
 
 	glDisableClientState(GL_VERTEX_ARRAY);
@@ -3826,20 +3825,20 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 static void drawCurveDMWired(Object *ob)
 {
 	DerivedMesh *dm = ob->derivedFinal;
-	dm->drawEdges (dm, 1, 0);
+	dm->drawEdges(dm, 1, 0);
 }
 
 /* return 1 when nothing was drawn */
 static int drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, int dt)
 {
-	Object *ob= base->object;
+	Object *ob = base->object;
 	DerivedMesh *dm = ob->derivedFinal;
 
 	if (!dm) {
 		return 1;
 	}
 
-	if (dt>OB_WIRE && dm->getNumTessFaces(dm)) {
+	if (dt > OB_WIRE && dm->getNumTessFaces(dm)) {
 		int glsl = draw_glsl_material(scene, ob, v3d, dt);
 		GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
 
@@ -3854,8 +3853,8 @@ static int drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d, B
 		GPU_end_object_materials();
 	}
 	else {
-		if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_SOLID)==0)
-			drawCurveDMWired (ob);
+		if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_SOLID) == 0)
+			drawCurveDMWired(ob);
 	}
 
 	return 0;
@@ -3864,37 +3863,37 @@ static int drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d, B
 /* returns 1 when nothing was drawn */
 static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, int dt)
 {
-	Object *ob= base->object;
-	ListBase *lb=NULL;
+	Object *ob = base->object;
+	ListBase *lb = NULL;
 	DispList *dl;
 	Curve *cu;
-	const short render_only= (v3d->flag2 & V3D_RENDER_OVERRIDE);
-	const short solid= (dt > OB_WIRE);
-	int retval= 0;
+	const short render_only = (v3d->flag2 & V3D_RENDER_OVERRIDE);
+	const short solid = (dt > OB_WIRE);
+	int retval = 0;
 
 	if (drawCurveDerivedMesh(scene, v3d, rv3d, base, dt) == 0) {
 		return 0;
 	}
 
-	switch(ob->type) {
+	switch (ob->type) {
 		case OB_FONT:
 		case OB_CURVE:
-			cu= ob->data;
+			cu = ob->data;
 
-			lb= &ob->disp;
+			lb = &ob->disp;
 
 			if (solid) {
-				dl= lb->first;
-				if (dl==NULL) return 1;
+				dl = lb->first;
+				if (dl == NULL) return 1;
 
-				if (dl->nors==NULL) addnormalsDispList(lb);
-				index3_nors_incr= 0;
+				if (dl->nors == NULL) addnormalsDispList(lb);
+				index3_nors_incr = 0;
 
-				if ( displist_has_faces(lb)==0) {
+				if (displist_has_faces(lb) == 0) {
 					if (!render_only) {
-						draw_index_wire= 0;
+						draw_index_wire = 0;
 						drawDispListwire(lb);
-						draw_index_wire= 1;
+						draw_index_wire = 1;
 					}
 				}
 				else {
@@ -3908,32 +3907,32 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
 						drawDispListsolid(lb, ob, 0);
 						GPU_end_object_materials();
 					}
-					if (cu->editnurb && cu->bevobj==NULL && cu->taperobj==NULL && cu->ext1 == 0.0f && cu->ext2 == 0.0f) {
+					if (cu->editnurb && cu->bevobj == NULL && cu->taperobj == NULL && cu->ext1 == 0.0f && cu->ext2 == 0.0f) {
 						cpack(0);
-						draw_index_wire= 0;
+						draw_index_wire = 0;
 						drawDispListwire(lb);
-						draw_index_wire= 1;
+						draw_index_wire = 1;
 					}
 				}
-				index3_nors_incr= 1;
+				index3_nors_incr = 1;
 			}
 			else {
 				if (!render_only || (render_only && displist_has_faces(lb))) {
-					draw_index_wire= 0;
-					retval= drawDispListwire(lb);
-					draw_index_wire= 1;
+					draw_index_wire = 0;
+					retval = drawDispListwire(lb);
+					draw_index_wire = 1;
 				}
 			}
 			break;
 		case OB_SURF:
 
-			lb= &ob->disp;
+			lb = &ob->disp;
 
 			if (solid) {
-				dl= lb->first;
-				if (dl==NULL) return 1;
+				dl = lb->first;
+				if (dl == NULL) return 1;
 
-				if (dl->nors==NULL) addnormalsDispList(lb);
+				if (dl->nors == NULL) addnormalsDispList(lb);
 
 				if (draw_glsl_material(scene, ob, v3d, dt)) {
 					GPU_begin_object_materials(v3d, rv3d, scene, ob, 1, NULL);
@@ -3947,15 +3946,15 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
 				}
 			}
 			else {
-				retval= drawDispListwire(lb);
+				retval = drawDispListwire(lb);
 			}
 			break;
 		case OB_MBALL:
 
-			if ( is_basis_mball(ob)) {
-				lb= &ob->disp;
-				if (lb->first==NULL) makeDispListMBall(scene, ob);
-				if (lb->first==NULL) return 1;
+			if (is_basis_mball(ob)) {
+				lb = &ob->disp;
+				if (lb->first == NULL) makeDispListMBall(scene, ob);
+				if (lb->first == NULL) return 1;
 
 				if (solid) {
 
@@ -3972,7 +3971,7 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
 				}
 				else {
 					/* MetaBalls use DL_INDEX4 type of DispList */
-					retval= drawDispListwire(lb);
+					retval = drawDispListwire(lb);
 				}
 			}
 			break;
@@ -3985,21 +3984,21 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
 static void draw_particle_arrays(int draw_as, int totpoint, int ob_dt, int select)
 {
 	/* draw created data arrays */
-	switch(draw_as) {
+	switch (draw_as) {
 		case PART_DRAW_AXIS:
 		case PART_DRAW_CROSS:
-			glDrawArrays(GL_LINES, 0, 6*totpoint);
+			glDrawArrays(GL_LINES, 0, 6 * totpoint);
 			break;
 		case PART_DRAW_LINE:
-			glDrawArrays(GL_LINES, 0, 2*totpoint);
+			glDrawArrays(GL_LINES, 0, 2 * totpoint);
 			break;
 		case PART_DRAW_BB:
-			if (ob_dt<=OB_WIRE || select)
-				glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
+			if (ob_dt <= OB_WIRE || select)
+				glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 			else
 				glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 
-			glDrawArrays(GL_QUADS, 0, 4*totpoint);
+			glDrawArrays(GL_QUADS, 0, 4 * totpoint);
 			break;
 		default:
 			glDrawArrays(GL_POINTS, 0, totpoint);
@@ -4012,7 +4011,7 @@ static void draw_particle(ParticleKey *state, int draw_as, short draw, float pix
 	float vec[3], vec2[3];
 	float *vd = NULL;
 	float *cd = NULL;
-	float ma_col[3]= {0.0f, 0.0f, 0.0f};
+	float ma_col[3] = {0.0f, 0.0f, 0.0f};
 
 	/* null only for PART_DRAW_CIRC */
 	if (pdd) {
@@ -4024,90 +4023,90 @@ static void draw_particle(ParticleKey *state, int draw_as, short draw, float pix
 		}
 	}
 
-	switch(draw_as) {
+	switch (draw_as) {
 		case PART_DRAW_DOT:
 		{
 			if (vd) {
-				copy_v3_v3(vd,state->co); pdd->vd+=3;
+				copy_v3_v3(vd, state->co); pdd->vd += 3;
 			}
 			if (cd) {
 				copy_v3_v3(cd, pdd->ma_col);
-				pdd->cd+=3;
+				pdd->cd += 3;
 			}
 			break;
 		}
 		case PART_DRAW_CROSS:
 		case PART_DRAW_AXIS:
 		{
-			vec[0]=2.0f*pixsize;
-			vec[1]=vec[2]=0.0;
-			mul_qt_v3(state->rot,vec);
-			if (draw_as==PART_DRAW_AXIS) {
+			vec[0] = 2.0f * pixsize;
+			vec[1] = vec[2] = 0.0;
+			mul_qt_v3(state->rot, vec);
+			if (draw_as == PART_DRAW_AXIS) {
 				if (cd) {
-					cd[1]=cd[2]=cd[4]=cd[5]=0.0;
-					cd[0]=cd[3]=1.0;
-					cd[6]=cd[8]=cd[9]=cd[11]=0.0;
-					cd[7]=cd[10]=1.0;
-					cd[13]=cd[12]=cd[15]=cd[16]=0.0;
-					cd[14]=cd[17]=1.0;
-					pdd->cd+=18;
+					cd[1] = cd[2] = cd[4] = cd[5] = 0.0;
+					cd[0] = cd[3] = 1.0;
+					cd[6] = cd[8] = cd[9] = cd[11] = 0.0;
+					cd[7] = cd[10] = 1.0;
+					cd[13] = cd[12] = cd[15] = cd[16] = 0.0;
+					cd[14] = cd[17] = 1.0;
+					pdd->cd += 18;
 				}
 
-				copy_v3_v3(vec2,state->co);
+				copy_v3_v3(vec2, state->co);
 			}
 			else {
 				if (cd) {
-					cd[0]=cd[3]=cd[6]=cd[ 9]=cd[12]=cd[15]= ma_col[0];
-					cd[1]=cd[4]=cd[7]=cd[10]=cd[13]=cd[16]= ma_col[1];
-					cd[2]=cd[5]=cd[8]=cd[11]=cd[14]=cd[17]= ma_col[2];
-					pdd->cd+=18;
+					cd[0] = cd[3] = cd[6] = cd[9] = cd[12] = cd[15] = ma_col[0];
+					cd[1] = cd[4] = cd[7] = cd[10] = cd[13] = cd[16] = ma_col[1];
+					cd[2] = cd[5] = cd[8] = cd[11] = cd[14] = cd[17] = ma_col[2];
+					pdd->cd += 18;
 				}
 				sub_v3_v3v3(vec2, state->co, vec);
 			}
 
 			add_v3_v3(vec, state->co);
-			copy_v3_v3(pdd->vd,vec); pdd->vd+=3;
-			copy_v3_v3(pdd->vd,vec2); pdd->vd+=3;
+			copy_v3_v3(pdd->vd, vec); pdd->vd += 3;
+			copy_v3_v3(pdd->vd, vec2); pdd->vd += 3;
 
-			vec[1]=2.0f*pixsize;
-			vec[0]=vec[2]=0.0;
-			mul_qt_v3(state->rot,vec);
-			if (draw_as==PART_DRAW_AXIS) {
-				copy_v3_v3(vec2,state->co);
+			vec[1] = 2.0f * pixsize;
+			vec[0] = vec[2] = 0.0;
+			mul_qt_v3(state->rot, vec);
+			if (draw_as == PART_DRAW_AXIS) {
+				copy_v3_v3(vec2, state->co);
 			}
 			else sub_v3_v3v3(vec2, state->co, vec);
 
 			add_v3_v3(vec, state->co);
-			copy_v3_v3(pdd->vd,vec); pdd->vd+=3;
-			copy_v3_v3(pdd->vd,vec2); pdd->vd+=3;
+			copy_v3_v3(pdd->vd, vec); pdd->vd += 3;
+			copy_v3_v3(pdd->vd, vec2); pdd->vd += 3;
 
-			vec[2]=2.0f*pixsize;
-			vec[0]=vec[1]=0.0;
-			mul_qt_v3(state->rot,vec);
-			if (draw_as==PART_DRAW_AXIS) {
-				copy_v3_v3(vec2,state->co);
+			vec[2] = 2.0f * pixsize;
+			vec[0] = vec[1] = 0.0;
+			mul_qt_v3(state->rot, vec);
+			if (draw_as == PART_DRAW_AXIS) {
+				copy_v3_v3(vec2, state->co);
 			}
 			else sub_v3_v3v3(vec2, state->co, vec);
 
 			add_v3_v3(vec, state->co);
 
-			copy_v3_v3(pdd->vd,vec); pdd->vd+=3;
-			copy_v3_v3(pdd->vd,vec2); pdd->vd+=3;
+			copy_v3_v3(pdd->vd, vec); pdd->vd += 3;
+			copy_v3_v3(pdd->vd, vec2); pdd->vd += 3;
 			break;
 		}
 		case PART_DRAW_LINE:
 		{
-			copy_v3_v3(vec,state->vel);
+			copy_v3_v3(vec, state->vel);
 			normalize_v3(vec);
 			if (draw & PART_DRAW_VEL_LENGTH)
-				mul_v3_fl(vec,len_v3(state->vel));
-			madd_v3_v3v3fl(pdd->vd, state->co, vec, -draw_line[0]); pdd->vd+=3;
-			madd_v3_v3v3fl(pdd->vd, state->co, vec,  draw_line[1]); pdd->vd+=3;
+				mul_v3_fl(vec, len_v3(state->vel));
+			madd_v3_v3v3fl(pdd->vd, state->co, vec, -draw_line[0]); pdd->vd += 3;
+			madd_v3_v3v3fl(pdd->vd, state->co, vec,  draw_line[1]); pdd->vd += 3;
 			if (cd) {
-				cd[0]=cd[3]= ma_col[0];
-				cd[1]=cd[4]= ma_col[1];
-				cd[2]=cd[5]= ma_col[2];
-				pdd->cd+=6;
+				cd[0] = cd[3] = ma_col[0];
+				cd[1] = cd[4] = ma_col[1];
+				cd[2] = cd[5] = ma_col[2];
+				pdd->cd += 6;
 			}
 			break;
 		}
@@ -4120,10 +4119,10 @@ static void draw_particle(ParticleKey *state, int draw_as, short draw, float pix
 		{
 			float xvec[3], yvec[3], zvec[3], bb_center[3];
 			if (cd) {
-				cd[0]=cd[3]=cd[6]=cd[ 9]= ma_col[0];
-				cd[1]=cd[4]=cd[7]=cd[10]= ma_col[1];
-				cd[2]=cd[5]=cd[8]=cd[11]= ma_col[2];
-				pdd->cd+=12;
+				cd[0] = cd[3] = cd[6] = cd[9] = ma_col[0];
+				cd[1] = cd[4] = cd[7] = cd[10] = ma_col[1];
+				cd[2] = cd[5] = cd[8] = cd[11] = ma_col[2];
+				pdd->cd += 12;
 			}
 
 
@@ -4133,21 +4132,21 @@ static void draw_particle(ParticleKey *state, int draw_as, short draw, float pix
 			psys_make_billboard(bb, xvec, yvec, zvec, bb_center);
 			
 			add_v3_v3v3(pdd->vd, bb_center, xvec);
-			add_v3_v3(pdd->vd, yvec); pdd->vd+=3;
+			add_v3_v3(pdd->vd, yvec); pdd->vd += 3;
 
 			sub_v3_v3v3(pdd->vd, bb_center, xvec);
-			add_v3_v3(pdd->vd, yvec); pdd->vd+=3;
+			add_v3_v3(pdd->vd, yvec); pdd->vd += 3;
 
 			sub_v3_v3v3(pdd->vd, bb_center, xvec);
-			sub_v3_v3v3(pdd->vd, pdd->vd,yvec); pdd->vd+=3;
+			sub_v3_v3v3(pdd->vd, pdd->vd, yvec); pdd->vd += 3;
 
 			add_v3_v3v3(pdd->vd, bb_center, xvec);
-			sub_v3_v3v3(pdd->vd, pdd->vd, yvec); pdd->vd+=3;
+			sub_v3_v3v3(pdd->vd, pdd->vd, yvec); pdd->vd += 3;
 
-			copy_v3_v3(pdd->nd, zvec); pdd->nd+=3;
-			copy_v3_v3(pdd->nd, zvec); pdd->nd+=3;
-			copy_v3_v3(pdd->nd, zvec); pdd->nd+=3;
-			copy_v3_v3(pdd->nd, zvec); pdd->nd+=3;
+			copy_v3_v3(pdd->nd, zvec); pdd->nd += 3;
+			copy_v3_v3(pdd->nd, zvec); pdd->nd += 3;
+			copy_v3_v3(pdd->nd, zvec); pdd->nd += 3;
+			copy_v3_v3(pdd->nd, zvec); pdd->nd += 3;
 			break;
 		}
 	}
@@ -4165,35 +4164,35 @@ static void draw_particle(ParticleKey *state, int draw_as, short draw, float pix
 static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv3d,
                                      Base *base, ParticleSystem *psys, int ob_dt)
 {
-	Object *ob=base->object;
+	Object *ob = base->object;
 	ParticleEditSettings *pset = PE_settings(scene);
 	ParticleSettings *part = psys->part;
 	ParticleData *pars = psys->particles;
 	ParticleData *pa;
-	ParticleKey state, *states=NULL;
+	ParticleKey state, *states = NULL;
 	ParticleBillboardData bb;
-	ParticleSimulationData sim= {NULL};
+	ParticleSimulationData sim = {NULL};
 	ParticleDrawData *pdd = psys->pdd;
 	Material *ma;
 	float vel[3], imat[4][4];
 	float timestep, pixsize_scale, pa_size, r_tilt, r_length;
 	float pa_time, pa_birthtime, pa_dietime, pa_health, intensity;
 	float cfra;
-	float ma_col[3]= {0.0f, 0.0f, 0.0f};
-	int a, totpart, totpoint=0, totve=0, drawn, draw_as, totchild=0;
-	int select=ob->flag&SELECT, create_cdata=0, need_v=0;
+	float ma_col[3] = {0.0f, 0.0f, 0.0f};
+	int a, totpart, totpoint = 0, totve = 0, drawn, draw_as, totchild = 0;
+	int select = ob->flag & SELECT, create_cdata = 0, need_v = 0;
 	GLint polygonmode[2];
 	char numstr[32];
-	unsigned char tcol[4]= {0, 0, 0, 255};
+	unsigned char tcol[4] = {0, 0, 0, 255};
 
 /* 1. */
-	if (part==NULL || !psys_check_enabled(ob, psys))
+	if (part == NULL || !psys_check_enabled(ob, psys))
 		return;
 
-	if (pars==NULL) return;
+	if (pars == NULL) return;
 
 	/* don't draw normal paths in edit mode */
-	if (psys_in_edit_mode(scene, psys) && (pset->flag & PE_DRAW_PART)==0)
+	if (psys_in_edit_mode(scene, psys) && (pset->flag & PE_DRAW_PART) == 0)
 		return;
 
 	if (part->draw_as == PART_DRAW_REND)
@@ -4205,33 +4204,33 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 		return;
 
 /* 2. */
-	sim.scene= scene;
-	sim.ob= ob;
-	sim.psys= psys;
-	sim.psmd = psys_get_modifier(ob,psys);
+	sim.scene = scene;
+	sim.ob = ob;
+	sim.psys = psys;
+	sim.psmd = psys_get_modifier(ob, psys);
 
-	if (part->phystype==PART_PHYS_KEYED) {
-		if (psys->flag&PSYS_KEYED) {
+	if (part->phystype == PART_PHYS_KEYED) {
+		if (psys->flag & PSYS_KEYED) {
 			psys_count_keyed_targets(&sim);
-			if (psys->totkeyed==0)
+			if (psys->totkeyed == 0)
 				return;
 		}
 	}
 
 	if (select) {
-		select=0;
-		if (psys_get_current(ob)==psys)
-			select=1;
+		select = 0;
+		if (psys_get_current(ob) == psys)
+			select = 1;
 	}
 
-	psys->flag|=PSYS_DRAWING;
+	psys->flag |= PSYS_DRAWING;
 
-	if (part->type==PART_HAIR && !psys->childcache)
-		totchild=0;
+	if (part->type == PART_HAIR && !psys->childcache)
+		totchild = 0;
 	else
-		totchild=psys->totchild*part->disp/100;
+		totchild = psys->totchild * part->disp / 100;
 
-	ma= give_current_material(ob,part->omat);
+	ma = give_current_material(ob, part->omat);
 
 	if (v3d->zbuf) glDepthMask(1);
 
@@ -4242,7 +4241,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 
 	glColor3ubv(tcol);
 
-	timestep= psys_get_timestep(&sim);
+	timestep = psys_get_timestep(&sim);
 
 	if ( (base->flag & OB_FROMDUPLI) && (ob->flag & OB_FROMGROUP) ) {
 		float mat[4][4];
@@ -4253,27 +4252,27 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 	/* needed for text display */
 	invert_m4_m4(ob->imat, ob->obmat);
 
-	totpart=psys->totpart;
+	totpart = psys->totpart;
 
-	cfra= BKE_curframe(scene);
+	cfra = BKE_curframe(scene);
 
-	if (draw_as==PART_DRAW_PATH && psys->pathcache==NULL && psys->childcache==NULL)
-		draw_as=PART_DRAW_DOT;
+	if (draw_as == PART_DRAW_PATH && psys->pathcache == NULL && psys->childcache == NULL)
+		draw_as = PART_DRAW_DOT;
 
 /* 3. */
-	switch(draw_as) {
+	switch (draw_as) {
 		case PART_DRAW_DOT:
 			if (part->draw_size)
 				glPointSize(part->draw_size);
 			else
-				glPointSize(2.0); /* default dot size */
+				glPointSize(2.0);  /* default dot size */
 			break;
 		case PART_DRAW_CIRC:
 			/* calculate view aligned matrix: */
 			copy_m4_m4(imat, rv3d->viewinv);
 			normalize_v3(imat[0]);
 			normalize_v3(imat[1]);
-			/* no break! */
+		/* no break! */
 		case PART_DRAW_CROSS:
 		case PART_DRAW_AXIS:
 			/* lets calculate the scale: */
@@ -4283,36 +4282,36 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 			else
 				pixsize_scale = part->draw_size;
 
-			if (draw_as==PART_DRAW_AXIS)
+			if (draw_as == PART_DRAW_AXIS)
 				create_cdata = 1;
 			break;
 		case PART_DRAW_OB:
-			if (part->dup_ob==NULL)
-				draw_as=PART_DRAW_DOT;
+			if (part->dup_ob == NULL)
+				draw_as = PART_DRAW_DOT;
 			else
-				draw_as=0;
+				draw_as = 0;
 			break;
 		case PART_DRAW_GR:
-			if (part->dup_group==NULL)
-				draw_as=PART_DRAW_DOT;
+			if (part->dup_group == NULL)
+				draw_as = PART_DRAW_DOT;
 			else
-				draw_as=0;
+				draw_as = 0;
 			break;
 		case PART_DRAW_BB:
-			if (v3d->camera==NULL && part->bb_ob==NULL) {
+			if (v3d->camera == NULL && part->bb_ob == NULL) {
 				printf("Billboards need an active camera or a target object!\n");
 
-				draw_as=part->draw_as=PART_DRAW_DOT;
+				draw_as = part->draw_as = PART_DRAW_DOT;
 
 				if (part->draw_size)
 					glPointSize(part->draw_size);
 				else
-					glPointSize(2.0); /* default dot size */
+					glPointSize(2.0);  /* default dot size */
 			}
 			else if (part->bb_ob)
-				bb.ob=part->bb_ob;
+				bb.ob = part->bb_ob;
 			else
-				bb.ob=v3d->camera;
+				bb.ob = v3d->camera;
 
 			bb.align = part->bb_align;
 			bb.anim = part->bb_anim;
@@ -4321,10 +4320,10 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 		case PART_DRAW_PATH:
 			break;
 		case PART_DRAW_LINE:
-			need_v=1;
+			need_v = 1;
 			break;
 	}
-	if (part->draw & PART_DRAW_SIZE && part->draw_as!=PART_DRAW_CIRC) {
+	if (part->draw & PART_DRAW_SIZE && part->draw_as != PART_DRAW_CIRC) {
 		copy_m4_m4(imat, rv3d->viewinv);
 		normalize_v3(imat[0]);
 		normalize_v3(imat[1]);
@@ -4342,7 +4341,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 	}
 
 /* 4. */
-	if (draw_as && ELEM(draw_as, PART_DRAW_PATH, PART_DRAW_CIRC)==0) {
+	if (draw_as && ELEM(draw_as, PART_DRAW_PATH, PART_DRAW_CIRC) == 0) {
 		int tot_vec_size = (totpart + totchild) * 3 * sizeof(float);
 		int create_ndata = 0;
 
@@ -4354,7 +4353,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 			psys_make_temp_pointcache(ob, psys);
 		}
 
-		switch(draw_as) {
+		switch (draw_as) {
 			case PART_DRAW_AXIS:
 			case PART_DRAW_CROSS:
 				tot_vec_size *= 6;
@@ -4389,14 +4388,14 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 		else if (pdd->vedata) {
 			/* velocity data not needed, so free it */
 			MEM_freeN(pdd->vedata);
-			pdd->vedata= NULL;
+			pdd->vedata = NULL;
 		}
 
-		pdd->vd= pdd->vdata;
-		pdd->ved= pdd->vedata;
-		pdd->cd= pdd->cdata;
-		pdd->nd= pdd->ndata;
-		pdd->tot_vec_size= tot_vec_size;
+		pdd->vd = pdd->vdata;
+		pdd->ved = pdd->vedata;
+		pdd->cd = pdd->cdata;
+		pdd->nd = pdd->ndata;
+		pdd->tot_vec_size = tot_vec_size;
 	}
 	else if (psys->pdd) {
 		psys_free_pdd(psys);
@@ -4405,62 +4404,62 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 	}
 
 	if (pdd) {
-		pdd->ma_col= ma_col;
+		pdd->ma_col = ma_col;
 	}
 
-	psys->lattice= psys_get_lattice(&sim);
+	psys->lattice = psys_get_lattice(&sim);
 
 	/* circles don't use drawdata, so have to add a special case here */
-	if ((pdd || draw_as==PART_DRAW_CIRC) && draw_as!=PART_DRAW_PATH) {
+	if ((pdd || draw_as == PART_DRAW_CIRC) && draw_as != PART_DRAW_PATH) {
 		/* 5. */
 		if (pdd && (pdd->flag & PARTICLE_DRAW_DATA_UPDATED) &&
-		    (pdd->vedata || part->draw & (PART_DRAW_SIZE|PART_DRAW_NUM|PART_DRAW_HEALTH))==0)
+		    (pdd->vedata || part->draw & (PART_DRAW_SIZE | PART_DRAW_NUM | PART_DRAW_HEALTH)) == 0)
 		{
 			totpoint = pdd->totpoint; /* draw data is up to date */
 		}
 		else {
-			for (a=0,pa=pars; a<totpart+totchild; a++, pa++) {
+			for (a = 0, pa = pars; a < totpart + totchild; a++, pa++) {
 				/* setup per particle individual stuff */
-				if (a<totpart) {
-					if (totchild && (part->draw&PART_DRAW_PARENT)==0) continue;
+				if (a < totpart) {
+					if (totchild && (part->draw & PART_DRAW_PARENT) == 0) continue;
 					if (pa->flag & PARS_NO_DISP || pa->flag & PARS_UNEXIST) continue;
 
-					pa_time=(cfra-pa->time)/pa->lifetime;
-					pa_birthtime=pa->time;
+					pa_time = (cfra - pa->time) / pa->lifetime;
+					pa_birthtime = pa->time;
 					pa_dietime = pa->dietime;
-					pa_size=pa->size;
-					if (part->phystype==PART_PHYS_BOIDS)
+					pa_size = pa->size;
+					if (part->phystype == PART_PHYS_BOIDS)
 						pa_health = pa->boid->data.health;
 					else
 						pa_health = -1.0;
 
-					r_tilt = 2.0f*(PSYS_FRAND(a + 21) - 0.5f);
+					r_tilt = 2.0f * (PSYS_FRAND(a + 21) - 0.5f);
 					r_length = PSYS_FRAND(a + 22);
 
 					if (part->draw_col > PART_DRAW_COL_MAT) {
-						switch(part->draw_col) {
+						switch (part->draw_col) {
 							case PART_DRAW_COL_VEL:
-								intensity = len_v3(pa->state.vel)/part->color_vec_max;
+								intensity = len_v3(pa->state.vel) / part->color_vec_max;
 								break;
 							case PART_DRAW_COL_ACC:
 								intensity = len_v3v3(pa->state.vel, pa->prev_state.vel) / ((pa->state.time - pa->prev_state.time) * part->color_vec_max);
 								break;
 							default:
-								intensity= 1.0f; /* should never happen */
+								intensity = 1.0f; /* should never happen */
 						}
 						CLAMP(intensity, 0.f, 1.f);
 						weight_to_rgb(ma_col, intensity);
 					}
 				}
 				else {
-					ChildParticle *cpa= &psys->child[a-totpart];
+					ChildParticle *cpa = &psys->child[a - totpart];
 
-					pa_time=psys_get_child_time(psys,cpa,cfra,&pa_birthtime,&pa_dietime);
-					pa_size=psys_get_child_size(psys,cpa,cfra,NULL);
+					pa_time = psys_get_child_time(psys, cpa, cfra, &pa_birthtime, &pa_dietime);
+					pa_size = psys_get_child_size(psys, cpa, cfra, NULL);
 
 					pa_health = -1.0;
 
-					r_tilt = 2.0f*(PSYS_FRAND(a + 21) - 0.5f);
+					r_tilt = 2.0f * (PSYS_FRAND(a + 21) - 0.5f);
 					r_length = PSYS_FRAND(a + 22);
 				}
 
@@ -4470,10 +4469,10 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 					int trail_count = part->trail_count * (1.0f - part->randlength * r_length);
 					float ct = ((part->draw & PART_ABS_PATH_TIME) ? cfra : pa_time) - length;
 					float dt = length / (trail_count ? (float)trail_count : 1.0f);
-					int i=0;
+					int i = 0;
 
-					ct+=dt;
-					for (i=0; i < trail_count; i++, ct += dt) {
+					ct += dt;
+					for (i = 0; i < trail_count; i++, ct += dt) {
 						float pixsize;
 
 						if (part->draw & PART_ABS_PATH_TIME) {
@@ -4484,7 +4483,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 							continue;
 
 						state.time = (part->draw & PART_ABS_PATH_TIME) ? -ct : -(pa_birthtime + ct * (pa_dietime - pa_birthtime));
-						psys_get_particle_on_path(&sim,a,&state,need_v);
+						psys_get_particle_on_path(&sim, a, &state, need_v);
 
 						if (psys->parent)
 							mul_m4_v3(psys->parent->obmat, state.co);
@@ -4494,14 +4493,14 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 							bb.offset[0] = part->bb_offset[0];
 							bb.offset[1] = part->bb_offset[1];
 							bb.size[0] = part->bb_size[0] * pa_size;
-							if (part->bb_align==PART_BB_VEL) {
+							if (part->bb_align == PART_BB_VEL) {
 								float pa_vel = len_v3(state.vel);
-								float head = part->bb_vel_head*pa_vel;
-								float tail = part->bb_vel_tail*pa_vel;
-								bb.size[1] = part->bb_size[1]*pa_size + head + tail;
+								float head = part->bb_vel_head * pa_vel;
+								float tail = part->bb_vel_tail * pa_vel;
+								bb.size[1] = part->bb_size[1] * pa_size + head + tail;
 								/* use offset to adjust the particle center. this is relative to size, so need to divide! */
 								if (bb.size[1] > 0.0f)
-									bb.offset[1] += (head-tail) / bb.size[1];
+									bb.offset[1] += (head - tail) / bb.size[1];
 							}
 							else
 								bb.size[1] = part->bb_size[1] * pa_size;
@@ -4518,8 +4517,8 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 					}
 				}
 				else {
-					state.time=cfra;
-					if (psys_get_particle_state(&sim,a,&state,0)) {
+					state.time = cfra;
+					if (psys_get_particle_state(&sim, a, &state, 0)) {
 						float pixsize;
 
 						if (psys->parent)
@@ -4530,14 +4529,14 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 							bb.offset[0] = part->bb_offset[0];
 							bb.offset[1] = part->bb_offset[1];
 							bb.size[0] = part->bb_size[0] * pa_size;
-							if (part->bb_align==PART_BB_VEL) {
+							if (part->bb_align == PART_BB_VEL) {
 								float pa_vel = len_v3(state.vel);
-								float head = part->bb_vel_head*pa_vel;
-								float tail = part->bb_vel_tail*pa_vel;
-								bb.size[1] = part->bb_size[1]*pa_size + head + tail;
+								float head = part->bb_vel_head * pa_vel;
+								float tail = part->bb_vel_tail * pa_vel;
+								bb.size[1] = part->bb_size[1] * pa_size + head + tail;
 								/* use offset to adjust the particle center. this is relative to size, so need to divide! */
 								if (bb.size[1] > 0.0f)
-									bb.offset[1] += (head-tail) / bb.size[1];
+									bb.offset[1] += (head - tail) / bb.size[1];
 							}
 							else
 								bb.size[1] = part->bb_size[1] * pa_size;
@@ -4558,11 +4557,11 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 					/* additional things to draw for each particle	*/
 					/* (velocity, size and number)					*/
 					if ((part->draw & PART_DRAW_VEL) && pdd && pdd->vedata) {
-						copy_v3_v3(pdd->ved,state.co);
+						copy_v3_v3(pdd->ved, state.co);
 						pdd->ved += 3;
 						mul_v3_v3fl(vel, state.vel, timestep);
 						add_v3_v3v3(pdd->ved, state.co, vel);
-						pdd->ved+=3;
+						pdd->ved += 3;
 
 						totve++;
 					}
@@ -4578,11 +4577,11 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 					    (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0)
 					{
 						float vec_txt[3];
-						char *val_pos= numstr;
-						numstr[0]= '\0';
+						char *val_pos = numstr;
+						numstr[0] = '\0';
 
-						if (part->draw&PART_DRAW_NUM) {
-							if (a < totpart && (part->draw & PART_DRAW_HEALTH) && (part->phystype==PART_PHYS_BOIDS)) {
+						if (part->draw & PART_DRAW_NUM) {
+							if (a < totpart && (part->draw & PART_DRAW_HEALTH) && (part->phystype == PART_PHYS_BOIDS)) {
 								sprintf(val_pos, "%d:%.2f", a, pa_health);
 							}
 							else {
@@ -4590,7 +4589,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 							}
 						}
 						else {
-							if (a < totpart && (part->draw & PART_DRAW_HEALTH) && (part->phystype==PART_PHYS_BOIDS)) {
+							if (a < totpart && (part->draw & PART_DRAW_HEALTH) && (part->phystype == PART_PHYS_BOIDS)) {
 								sprintf(val_pos, "%.2f", pa_health);
 							}
 						}
@@ -4598,7 +4597,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 						/* in path drawing state.co is the end point */
 						/* use worldspace beause object matrix is already applied */
 						mul_v3_m4v3(vec_txt, ob->imat, state.co);
-						view3d_cached_text_draw_add(vec_txt, numstr, 10, V3D_CACHE_TEXT_WORLDSPACE|V3D_CACHE_TEXT_ASCII, tcol);
+						view3d_cached_text_draw_add(vec_txt, numstr, 10, V3D_CACHE_TEXT_WORLDSPACE | V3D_CACHE_TEXT_ASCII, tcol);
 					}
 				}
 			}
@@ -4609,9 +4608,9 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 	glGetIntegerv(GL_POLYGON_MODE, polygonmode);
 	glEnableClientState(GL_VERTEX_ARRAY);
 
-	if (draw_as==PART_DRAW_PATH) {
+	if (draw_as == PART_DRAW_PATH) {
 		ParticleCacheKey **cache, *path;
-		float /* *cd2=NULL, */ /* UNUSED */ *cdata2=NULL;
+		float /* *cd2=NULL, */ /* UNUSED */ *cdata2 = NULL;
 
 		/* setup gl flags */
 		if (1) { //ob_dt > OB_WIRE) {
@@ -4634,15 +4633,15 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 		}
 #endif
 
-		if (totchild && (part->draw&PART_DRAW_PARENT)==0)
-			totpart=0;
-		else if (psys->pathcache==NULL)
-			totpart=0;
+		if (totchild && (part->draw & PART_DRAW_PARENT) == 0)
+			totpart = 0;
+		else if (psys->pathcache == NULL)
+			totpart = 0;
 
 		/* draw actual/parent particles */
-		cache=psys->pathcache;
-		for (a=0, pa=psys->particles; a<totpart; a++, pa++) {
-			path=cache[a];
+		cache = psys->pathcache;
+		for (a = 0, pa = psys->particles; a < totpart; a++, pa++) {
+			path = cache[a];
 			if (path->steps > 0) {
 				glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
 
@@ -4657,9 +4656,9 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 		}
 		
 		/* draw child particles */
-		cache=psys->childcache;
-		for (a=0; a<totchild; a++) {
-			path=cache[a];
+		cache = psys->childcache;
+		for (a = 0; a < totchild; a++) {
+			path = cache[a];
 			glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
 
 			if (1) { //ob_dt > OB_WIRE) {
@@ -4681,23 +4680,23 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 
 		if (cdata2)
 			MEM_freeN(cdata2);
-		/* cd2= */ /* UNUSED */ cdata2=NULL;
+		/* cd2= */ /* UNUSED */ cdata2 = NULL;
 
 		glLineWidth(1.0f);
 
-		if ((part->draw & PART_DRAW_NUM) && (v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
-			cache=psys->pathcache;
+		if ((part->draw & PART_DRAW_NUM) && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
+			cache = psys->pathcache;
 
-			for (a=0, pa=psys->particles; a<totpart; a++, pa++) {
+			for (a = 0, pa = psys->particles; a < totpart; a++, pa++) {
 				float vec_txt[3];
 				BLI_snprintf(numstr, sizeof(numstr), "%i", a);
 				/* use worldspace beause object matrix is already applied */
 				mul_v3_m4v3(vec_txt, ob->imat, cache[a]->co);
-				view3d_cached_text_draw_add(vec_txt, numstr, 10, V3D_CACHE_TEXT_WORLDSPACE|V3D_CACHE_TEXT_ASCII, tcol);
+				view3d_cached_text_draw_add(vec_txt, numstr, 10, V3D_CACHE_TEXT_WORLDSPACE | V3D_CACHE_TEXT_ASCII, tcol);
 			}
 		}
 	}
-	else if (pdd && ELEM(draw_as, 0, PART_DRAW_CIRC)==0) {
+	else if (pdd && ELEM(draw_as, 0, PART_DRAW_CIRC) == 0) {
 		glDisableClientState(GL_COLOR_ARRAY);
 
 		/* enable point data array */
@@ -4729,7 +4728,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 		/* enable other data arrays */
 
 		/* billboards are drawn this way */
-		if (pdd->ndata && ob_dt>OB_WIRE) {
+		if (pdd->ndata && ob_dt > OB_WIRE) {
 			glEnableClientState(GL_NORMAL_ARRAY);
 			glNormalPointer(GL_FLOAT, 0, pdd->ndata);
 			glEnable(GL_LIGHTING);
@@ -4756,7 +4755,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 		
 		glVertexPointer(3, GL_FLOAT, 0, pdd->vedata);
 		
-		glDrawArrays(GL_LINES, 0, 2*totve);
+		glDrawArrays(GL_LINES, 0, 2 * totve);
 	}
 
 	glPolygonMode(GL_FRONT, polygonmode[0]);
@@ -4782,12 +4781,12 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 
 	if (psys->lattice) {
 		end_latt_deform(psys->lattice);
-		psys->lattice= NULL;
+		psys->lattice = NULL;
 	}
 
 	if (pdd) {
 		/* drop references to stack memory */
-		pdd->ma_col= NULL;
+		pdd->ma_col = NULL;
 	}
 
 	if ( (base->flag & OB_FROMDUPLI) && (ob->flag & OB_FROMGROUP) ) {
@@ -4812,7 +4811,7 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit)
 	PTCacheEditKey *key;
 	ParticleEditSettings *pset = PE_settings(scene);
 	int i, k, totpoint = edit->totpoint, timed = pset->flag & PE_FADE_TIME ? pset->fade_frames : 0;
-	int steps=1;
+	int steps = 1;
 	float sel_col[3];
 	float nosel_col[3];
 	float *pathcol = NULL, *pcol;
@@ -4823,7 +4822,7 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit)
 	PE_hide_keys_time(scene, edit, CFRA);
 
 	/* opengl setup */
-	if ((v3d->flag & V3D_ZBUF_SELECT)==0)
+	if ((v3d->flag & V3D_ZBUF_SELECT) == 0)
 		glDisable(GL_DEPTH_TEST);
 
 	/* get selection theme colors */
@@ -4834,7 +4833,7 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit)
 	if (timed) {
 		glEnable(GL_BLEND);
 		steps = (*edit->pathcache)->steps + 1;
-		pathcol = MEM_callocN(steps*4*sizeof(float), "particle path color data");
+		pathcol = MEM_callocN(steps * 4 * sizeof(float), "particle path color data");
 	}
 
 	glEnableClientState(GL_VERTEX_ARRAY);
@@ -4849,18 +4848,18 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit)
 		glDisable(GL_LIGHTING);
 	}
 
-	cache=edit->pathcache;
-	for (i=0; i<totpoint; i++) {
+	cache = edit->pathcache;
+	for (i = 0; i < totpoint; i++) {
 		path = cache[i];
 		glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
 
 		if (timed) {
-			for (k=0, pcol=pathcol, pkey=path; k<steps; k++, pkey++, pcol+=4) {
+			for (k = 0, pcol = pathcol, pkey = path; k < steps; k++, pkey++, pcol += 4) {
 				copy_v3_v3(pcol, pkey->col);
-				pcol[3] = 1.0f - fabsf((float)(CFRA) - pkey->time)/(float)pset->fade_frames;
+				pcol[3] = 1.0f - fabsf((float)(CFRA) -pkey->time) / (float)pset->fade_frames;
 			}
 
-			glColorPointer(4, GL_FLOAT, 4*sizeof(float), pathcol);
+			glColorPointer(4, GL_FLOAT, 4 * sizeof(float), pathcol);
 		}
 		else
 			glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
@@ -4872,69 +4871,69 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit)
 
 
 	/* draw edit vertices */
-	if (pset->selectmode!=SCE_SELECT_PATH) {
+	if (pset->selectmode != SCE_SELECT_PATH) {
 		glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
 
-		if (pset->selectmode==SCE_SELECT_POINT) {
-			float *pd=NULL,*pdata=NULL;
-			float *cd=NULL,*cdata=NULL;
+		if (pset->selectmode == SCE_SELECT_POINT) {
+			float *pd = NULL, *pdata = NULL;
+			float *cd = NULL, *cdata = NULL;
 			int totkeys = 0;
 
-			for (i=0, point=edit->points; i<totpoint; i++, point++)
+			for (i = 0, point = edit->points; i < totpoint; i++, point++)
 				if (!(point->flag & PEP_HIDE))
 					totkeys += point->totkey;
 
 			if (edit->points && !(edit->points->keys->flag & PEK_USE_WCO))
-				pd=pdata=MEM_callocN(totkeys*3*sizeof(float), "particle edit point data");
-			cd=cdata=MEM_callocN(totkeys*(timed?4:3)*sizeof(float), "particle edit color data");
+				pd = pdata = MEM_callocN(totkeys * 3 * sizeof(float), "particle edit point data");
+			cd = cdata = MEM_callocN(totkeys * (timed ? 4 : 3) * sizeof(float), "particle edit color data");
 
-			for (i=0, point=edit->points; i<totpoint; i++, point++) {
+			for (i = 0, point = edit->points; i < totpoint; i++, point++) {
 				if (point->flag & PEP_HIDE)
 					continue;
 
-				for (k=0, key=point->keys; k<point->totkey; k++, key++) {
+				for (k = 0, key = point->keys; k < point->totkey; k++, key++) {
 					if (pd) {
 						copy_v3_v3(pd, key->co);
 						pd += 3;
 					}
 
-					if (key->flag&PEK_SELECT) {
-						copy_v3_v3(cd,sel_col);
+					if (key->flag & PEK_SELECT) {
+						copy_v3_v3(cd, sel_col);
 					}
 					else {
-						copy_v3_v3(cd,nosel_col);
+						copy_v3_v3(cd, nosel_col);
 					}
 
 					if (timed)
-						*(cd+3) = 1.0f - fabsf((float)CFRA - *key->time)/(float)pset->fade_frames;
+						*(cd + 3) = 1.0f - fabsf((float)CFRA - *key->time) / (float)pset->fade_frames;
 
-					cd += (timed?4:3);
+					cd += (timed ? 4 : 3);
 				}
 			}
-			cd=cdata;
-			pd=pdata;
-			for (i=0, point=edit->points; i<totpoint; i++, point++) {
+			cd = cdata;
+			pd = pdata;
+			for (i = 0, point = edit->points; i < totpoint; i++, point++) {
 				if (point->flag & PEP_HIDE || point->totkey == 0)
 					continue;
 
 				if (point->keys->flag & PEK_USE_WCO)
 					glVertexPointer(3, GL_FLOAT, sizeof(PTCacheEditKey), point->keys->world_co);
 				else
-					glVertexPointer(3, GL_FLOAT, 3*sizeof(float), pd);
+					glVertexPointer(3, GL_FLOAT, 3 * sizeof(float), pd);
 
-				glColorPointer((timed?4:3), GL_FLOAT, (timed?4:3)*sizeof(float), cd);
+				glColorPointer((timed ? 4 : 3), GL_FLOAT, (timed ? 4 : 3) * sizeof(float), cd);
 
 				glDrawArrays(GL_POINTS, 0, point->totkey);
 
 				pd += pd ? 3 * point->totkey : 0;
-				cd += (timed?4:3) * point->totkey;
+				cd += (timed ? 4 : 3) * point->totkey;
 			}
-			if (pdata) { MEM_freeN(pdata); pd=pdata=NULL; }
-			if (cdata) { MEM_freeN(cdata); cd=cdata=NULL; }
+			if (pdata) { MEM_freeN(pdata); pd = pdata = NULL; }
+			if (cdata) { MEM_freeN(cdata); cd = cdata = NULL; }
 		}
 		else if (pset->selectmode == SCE_SELECT_END) {
-			for (i=0, point=edit->points; i<totpoint; i++, point++) {
-				if ((point->flag & PEP_HIDE)==0 && point->totkey) {
+			for (i = 0, point = edit->points; i < totpoint; i++, point++) {
+				if ((point->flag & PEP_HIDE) == 0 && point->totkey) {
 					key = point->keys + point->totkey - 1;
 					if (key->flag & PEK_SELECT)
 						glColor3fv(sel_col);
@@ -4961,13 +4960,13 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit)
 	glPointSize(1.0);
 }
 //static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float tw,float th)
-static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float ith,float drw_size)
+static void ob_draw_RE_motion(float com[3], float rotscale[3][3], float itw, float ith, float drw_size)
 {
 	float tr[3][3];
-	float root[3],tip[3];
-	float tw,th;
+	float root[3], tip[3];
+	float tw, th;
 	/* take a copy for not spoiling original */
-	copy_m3_m3(tr,rotscale);
+	copy_m3_m3(tr, rotscale);
 	tw = itw * drw_size;
 	th = ith * drw_size;
 
@@ -4975,29 +4974,29 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
 	glBegin(GL_LINES);
 	root[1] = root[2] = 0.0f;
 	root[0] = -drw_size;
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	tip[1] = tip[2] = 0.0f;
 	tip[0] = drw_size;
-	mul_m3_v3(tr,tip);
+	mul_m3_v3(tr, tip);
 	add_v3_v3(tip, com);
 	glVertex3fv(tip);
 	glEnd();
 
-	root[1] =0.0f; root[2] = tw;
+	root[1] = 0.0f; root[2] = tw;
 	root[0] = th;
 	glBegin(GL_LINES);
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	glVertex3fv(tip);
 	glEnd();
 
-	root[1] =0.0f; root[2] = -tw;
+	root[1] = 0.0f; root[2] = -tw;
 	root[0] = th;
 	glBegin(GL_LINES);
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	glVertex3fv(tip);
@@ -5006,16 +5005,16 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
 	root[1] = tw; root[2] = 0.0f;
 	root[0] = th;
 	glBegin(GL_LINES);
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	glVertex3fv(tip);
 	glEnd();
 
-	root[1] =-tw; root[2] = 0.0f;
+	root[1] = -tw; root[2] = 0.0f;
 	root[0] = th;
 	glBegin(GL_LINES);
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	glVertex3fv(tip);
@@ -5026,20 +5025,20 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
 	glBegin(GL_LINES);
 	root[0] = root[2] = 0.0f;
 	root[1] = -drw_size;
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	tip[0] = tip[2] = 0.0f;
 	tip[1] = drw_size;
-	mul_m3_v3(tr,tip);
+	mul_m3_v3(tr, tip);
 	add_v3_v3(tip, com);
 	glVertex3fv(tip);
 	glEnd();
 
-	root[0] =0.0f; root[2] = tw;
+	root[0] = 0.0f; root[2] = tw;
 	root[1] = th;
 	glBegin(GL_LINES);
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	glVertex3fv(tip);
@@ -5048,7 +5047,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
 	root[0] = 0.0f; root[2] = -tw;
 	root[1] = th;
 	glBegin(GL_LINES);
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	glVertex3fv(tip);
@@ -5057,16 +5056,16 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
 	root[0] = tw; root[2] = 0.0f;
 	root[1] = th;
 	glBegin(GL_LINES);
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	glVertex3fv(tip);
 	glEnd();
 
-	root[0] =-tw; root[2] = 0.0f;
+	root[0] = -tw; root[2] = 0.0f;
 	root[1] = th;
 	glBegin(GL_LINES);
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	glVertex3fv(tip);
@@ -5076,29 +5075,29 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
 	glBegin(GL_LINES);
 	root[0] = root[1] = 0.0f;
 	root[2] = -drw_size;
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	tip[0] = tip[1] = 0.0f;
 	tip[2] = drw_size;
-	mul_m3_v3(tr,tip);
+	mul_m3_v3(tr, tip);
 	add_v3_v3(tip, com);
 	glVertex3fv(tip);
 	glEnd();
 
-	root[0] =0.0f; root[1] = tw;
+	root[0] = 0.0f; root[1] = tw;
 	root[2] = th;
 	glBegin(GL_LINES);
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	glVertex3fv(tip);
 	glEnd();
 
-	root[0] =0.0f; root[1] = -tw;
+	root[0] = 0.0f; root[1] = -tw;
 	root[2] = th;
 	glBegin(GL_LINES);
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	glVertex3fv(tip);
@@ -5107,7 +5106,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
 	root[0] = tw; root[1] = 0.0f;
 	root[2] = th;
 	glBegin(GL_LINES);
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	glVertex3fv(tip);
@@ -5116,7 +5115,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
 	root[0] = -tw; root[1] = 0.0f;
 	root[2] = th;
 	glBegin(GL_LINES);
-	mul_m3_v3(tr,root);
+	mul_m3_v3(tr, root);
 	add_v3_v3(root, com);
 	glVertex3fv(root);
 	glVertex3fv(tip);
@@ -5140,40 +5139,40 @@ static void tekenhandlesN(Nurb *nu, short sel, short hide_handles)
 #define TH_HANDLE_COL_TOT ((TH_HANDLE_SEL_FREE - TH_HANDLE_FREE) + 1)
 		/* use MIN2 when indexing to ensure newer files don't read outside the array */
 		unsigned char handle_cols[TH_HANDLE_COL_TOT][3];
-		const int basecol= sel ? TH_HANDLE_SEL_FREE : TH_HANDLE_FREE;
+		const int basecol = sel ? TH_HANDLE_SEL_FREE : TH_HANDLE_FREE;
 
-		for (a=0; a < TH_HANDLE_COL_TOT; a++) {
+		for (a = 0; a < TH_HANDLE_COL_TOT; a++) {
 			UI_GetThemeColor3ubv(basecol + a, handle_cols[a]);
 		}
 
-		bezt= nu->bezt;
-		a= nu->pntsu;
+		bezt = nu->bezt;
+		a = nu->pntsu;
 		while (a--) {
-			if (bezt->hide==0) {
-				if ( (bezt->f2 & SELECT)==sel) {
-					fp= bezt->vec[0];
+			if (bezt->hide == 0) {
+				if ( (bezt->f2 & SELECT) == sel) {
+					fp = bezt->vec[0];
 
-					glColor3ubv(handle_cols[MIN2(bezt->h1, TH_HANDLE_COL_TOT-1)]);
+					glColor3ubv(handle_cols[MIN2(bezt->h1, TH_HANDLE_COL_TOT - 1)]);
 					glVertex3fv(fp);
-					glVertex3fv(fp+3);
+					glVertex3fv(fp + 3);
 
-					glColor3ubv(handle_cols[MIN2(bezt->h2, TH_HANDLE_COL_TOT-1)]);
-					glVertex3fv(fp+3);
-					glVertex3fv(fp+6);
+					glColor3ubv(handle_cols[MIN2(bezt->h2, TH_HANDLE_COL_TOT - 1)]);
+					glVertex3fv(fp + 3);
+					glVertex3fv(fp + 6);
 				}
-				else if ( (bezt->f1 & SELECT)==sel) {
-					fp= bezt->vec[0];
+				else if ( (bezt->f1 & SELECT) == sel) {
+					fp = bezt->vec[0];
 
-					glColor3ubv(handle_cols[MIN2(bezt->h1, TH_HANDLE_COL_TOT-1)]);
+					glColor3ubv(handle_cols[MIN2(bezt->h1, TH_HANDLE_COL_TOT - 1)]);
 					glVertex3fv(fp);
-					glVertex3fv(fp+3);
+					glVertex3fv(fp + 3);
 				}
-				else if ( (bezt->f3 & SELECT)==sel) {
-					fp= bezt->vec[1];
+				else if ( (bezt->f3 & SELECT) == sel) {
+					fp = bezt->vec[1];
 
-					glColor3ubv(handle_cols[MIN2(bezt->h2, TH_HANDLE_COL_TOT-1)]);
+					glColor3ubv(handle_cols[MIN2(bezt->h2, TH_HANDLE_COL_TOT - 1)]);
 					glVertex3fv(fp);
-					glVertex3fv(fp+3);
+					glVertex3fv(fp + 3);
 				}
 			}
 			bezt++;
@@ -5199,24 +5198,24 @@ static void tekenhandlesN_active(Nurb *nu)
 	glBegin(GL_LINES);
 
 	if (nu->type == CU_BEZIER) {
-		bezt= nu->bezt;
-		a= nu->pntsu;
+		bezt = nu->bezt;
+		a = nu->pntsu;
 		while (a--) {
-			if (bezt->hide==0) {
-				fp= bezt->vec[0];
+			if (bezt->hide == 0) {
+				fp = bezt->vec[0];
 
 				glVertex3fv(fp);
-				glVertex3fv(fp+3);
+				glVertex3fv(fp + 3);
 
-				glVertex3fv(fp+3);
-				glVertex3fv(fp+6);
+				glVertex3fv(fp + 3);
+				glVertex3fv(fp + 6);
 			}
 			bezt++;
 		}
 	}
 	glEnd();
 
-	glColor3ub(0,0,0);
+	glColor3ub(0, 0, 0);
 	glLineWidth(1);
 }
 
@@ -5229,22 +5228,22 @@ static void tekenvertsN(Nurb *nu, short sel, short hide_handles, void *lastsel)
 
 	if (nu->hide) return;
 
-	if (sel) color= TH_VERTEX_SELECT;
-	else color= TH_VERTEX;
+	if (sel) color = TH_VERTEX_SELECT;
+	else color = TH_VERTEX;
 
 	UI_ThemeColor(color);
 
-	size= UI_GetThemeValuef(TH_VERTEX_SIZE);
+	size = UI_GetThemeValuef(TH_VERTEX_SIZE);
 	glPointSize(size);
 	
 	bglBegin(GL_POINTS);
 	
 	if (nu->type == CU_BEZIER) {
 
-		bezt= nu->bezt;
-		a= nu->pntsu;
+		bezt = nu->bezt;
+		a = nu->pntsu;
 		while (a--) {
-			if (bezt->hide==0) {
+			if (bezt->hide == 0) {
 				if (sel == 1 && bezt == lastsel) {
 					UI_ThemeColor(TH_LASTSEL_POINT);
 					bglVertex3fv(bezt->vec[1]);
@@ -5257,29 +5256,29 @@ static void tekenvertsN(Nurb *nu, short sel, short hide_handles, void *lastsel)
 					UI_ThemeColor(color);
 				}
 				else if (hide_handles) {
-					if ((bezt->f2 & SELECT)==sel) bglVertex3fv(bezt->vec[1]);
+					if ((bezt->f2 & SELECT) == sel) bglVertex3fv(bezt->vec[1]);
 				}
 				else {
-					if ((bezt->f1 & SELECT)==sel) bglVertex3fv(bezt->vec[0]);
-					if ((bezt->f2 & SELECT)==sel) bglVertex3fv(bezt->vec[1]);
-					if ((bezt->f3 & SELECT)==sel) bglVertex3fv(bezt->vec[2]);
+					if ((bezt->f1 & SELECT) == sel) bglVertex3fv(bezt->vec[0]);
+					if ((bezt->f2 & SELECT) == sel) bglVertex3fv(bezt->vec[1]);
+					if ((bezt->f3 & SELECT) == sel) bglVertex3fv(bezt->vec[2]);
 				}
 			}
 			bezt++;
 		}
 	}
 	else {
-		bp= nu->bp;
-		a= nu->pntsu*nu->pntsv;
+		bp = nu->bp;
+		a = nu->pntsu * nu->pntsv;
 		while (a--) {
-			if (bp->hide==0) {
+			if (bp->hide == 0) {
 				if (bp == lastsel) {
 					UI_ThemeColor(TH_LASTSEL_POINT);
 					bglVertex3fv(bp->vec);
 					UI_ThemeColor(color);
 				}
 				else {
-					if ((bp->f1 & SELECT)==sel) bglVertex3fv(bp->vec);
+					if ((bp->f1 & SELECT) == sel) bglVertex3fv(bp->vec);
 				}
 			}
 			bp++;
@@ -5298,19 +5297,19 @@ static void editnurb_draw_active_poly(Nurb *nu)
 	UI_ThemeColor(TH_ACTIVE_SPLINE);
 	glLineWidth(2);
 
-	bp= nu->bp;
-	for (b=0; b<nu->pntsv; b++) {
+	bp = nu->bp;
+	for (b = 0; b < nu->pntsv; b++) {
 		if (nu->flagu & 1) glBegin(GL_LINE_LOOP);
 		else glBegin(GL_LINE_STRIP);
 
-		for (a=0; a<nu->pntsu; a++, bp++) {
+		for (a = 0; a < nu->pntsu; a++, bp++) {
 			glVertex3fv(bp->vec);
 		}
 
 		glEnd();
 	}
 
-	glColor3ub(0,0,0);
+	glColor3ub(0, 0, 0);
 	glLineWidth(1);
 }
 
@@ -5323,39 +5322,39 @@ static void editnurb_draw_active_nurbs(Nurb *nu)
 	glLineWidth(2);
 
 	glBegin(GL_LINES);
-	bp= nu->bp;
-	for (b=0; b<nu->pntsv; b++) {
-		bp1= bp;
+	bp = nu->bp;
+	for (b = 0; b < nu->pntsv; b++) {
+		bp1 = bp;
 		bp++;
 
-		for (a=nu->pntsu-1; a>0; a--, bp++) {
-			if (bp->hide==0 && bp1->hide==0) {
+		for (a = nu->pntsu - 1; a > 0; a--, bp++) {
+			if (bp->hide == 0 && bp1->hide == 0) {
 				glVertex3fv(bp->vec);
 				glVertex3fv(bp1->vec);
 			}
-			bp1= bp;
+			bp1 = bp;
 		}
 	}
 
-	if (nu->pntsv > 1) {	/* surface */
+	if (nu->pntsv > 1) {    /* surface */
 
-		ofs= nu->pntsu;
-		for (b=0; b<nu->pntsu; b++) {
-			bp1= nu->bp+b;
-			bp= bp1+ofs;
-			for (a=nu->pntsv-1; a>0; a--, bp+=ofs) {
-				if (bp->hide==0 && bp1->hide==0) {
+		ofs = nu->pntsu;
+		for (b = 0; b < nu->pntsu; b++) {
+			bp1 = nu->bp + b;
+			bp = bp1 + ofs;
+			for (a = nu->pntsv - 1; a > 0; a--, bp += ofs) {
+				if (bp->hide == 0 && bp1->hide == 0) {
 					glVertex3fv(bp->vec);
 					glVertex3fv(bp1->vec);
 				}
-				bp1= bp;
+				bp1 = bp;
 			}
 		}
 	}
 
 	glEnd();
 
-	glColor3ub(0,0,0);
+	glColor3ub(0, 0, 0);
 	glLineWidth(1);
 }
 
@@ -5364,26 +5363,26 @@ static void draw_editnurb(Object *ob, Nurb *nurb, int sel)
 	Nurb *nu;
 	BPoint *bp, *bp1;
 	int a, b, ofs, index;
-	Curve *cu= (Curve*)ob->data;
+	Curve *cu = (Curve *)ob->data;
 
-	index= 0;
-	nu= nurb;
+	index = 0;
+	nu = nurb;
 	while (nu) {
-		if (nu->hide==0) {
-			switch(nu->type) {
+		if (nu->hide == 0) {
+			switch (nu->type) {
 				case CU_POLY:
-					if (!sel && index== cu->actnu) {
+					if (!sel && index == cu->actnu) {
 						/* we should draw active spline highlight below everything */
 						editnurb_draw_active_poly(nu);
 					}
 
 					UI_ThemeColor(TH_NURB_ULINE);
-					bp= nu->bp;
-					for (b=0; b<nu->pntsv; b++) {
+					bp = nu->bp;
+					for (b = 0; b < nu->pntsv; b++) {
 						if (nu->flagu & 1) glBegin(GL_LINE_LOOP);
 						else glBegin(GL_LINE_STRIP);
 
-						for (a=0; a<nu->pntsu; a++, bp++) {
+						for (a = 0; a < nu->pntsu; a++, bp++) {
 							glVertex3fv(bp->vec);
 						}
 
@@ -5391,19 +5390,19 @@ static void draw_editnurb(Object *ob, Nurb *nurb, int sel)
 					}
 					break;
 				case CU_NURBS:
-					if (!sel && index== cu->actnu) {
+					if (!sel && index == cu->actnu) {
 						/* we should draw active spline highlight below everything */
 						editnurb_draw_active_nurbs(nu);
 					}
 
-					bp= nu->bp;
-					for (b=0; b<nu->pntsv; b++) {
-						bp1= bp;
+					bp = nu->bp;
+					for (b = 0; b < nu->pntsv; b++) {
+						bp1 = bp;
 						bp++;
-						for (a=nu->pntsu-1; a>0; a--, bp++) {
-							if (bp->hide==0 && bp1->hide==0) {
+						for (a = nu->pntsu - 1; a > 0; a--, bp++) {
+							if (bp->hide == 0 && bp1->hide == 0) {
 								if (sel) {
-									if ( (bp->f1 & SELECT) && ( bp1->f1 & SELECT ) ) {
+									if ( (bp->f1 & SELECT) && (bp1->f1 & SELECT) ) {
 										UI_ThemeColor(TH_NURB_SEL_ULINE);
 
 										glBegin(GL_LINE_STRIP);
@@ -5426,19 +5425,19 @@ static void draw_editnurb(Object *ob, Nurb *nurb, int sel)
 									}
 								}
 							}
-							bp1= bp;
+							bp1 = bp;
 						}
 					}
-					if (nu->pntsv > 1) {	/* surface */
-
-						ofs= nu->pntsu;
-						for (b=0; b<nu->pntsu; b++) {
-							bp1= nu->bp+b;
-							bp= bp1+ofs;
-							for (a=nu->pntsv-1; a>0; a--, bp+=ofs) {
-								if (bp->hide==0 && bp1->hide==0) {
+					if (nu->pntsv > 1) {    /* surface */
+
+						ofs = nu->pntsu;
+						for (b = 0; b < nu->pntsu; b++) {
+							bp1 = nu->bp + b;
+							bp = bp1 + ofs;
+							for (a = nu->pntsv - 1; a > 0; a--, bp += ofs) {
+								if (bp->hide == 0 && bp1->hide == 0) {
 									if (sel) {
-										if ( (bp->f1 & SELECT) && ( bp1->f1 & SELECT) ) {
+										if ( (bp->f1 & SELECT) && (bp1->f1 & SELECT) ) {
 											UI_ThemeColor(TH_NURB_SEL_VLINE);
 
 											glBegin(GL_LINE_STRIP);
@@ -5461,7 +5460,7 @@ static void draw_editnurb(Object *ob, Nurb *nurb, int sel)
 										}
 									}
 								}
-								bp1= bp;
+								bp1 = bp;
 							}
 						}
 
@@ -5471,14 +5470,14 @@ static void draw_editnurb(Object *ob, Nurb *nurb, int sel)
 		}
 
 		++index;
-		nu= nu->next;
+		nu = nu->next;
 	}
 }
 
 static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, Nurb *nurb, int dt)
 {
-	ToolSettings *ts= scene->toolsettings;
-	Object *ob= base->object;
+	ToolSettings *ts = scene->toolsettings;
+	Object *ob = base->object;
 	Curve *cu = ob->data;
 	Nurb *nu;
 	BevList *bl;
@@ -5492,8 +5491,8 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
 	
 	/* first non-selected and active handles */
-	index= 0;
-	for (nu=nurb; nu; nu=nu->next) {
+	index = 0;
+	for (nu = nurb; nu; nu = nu->next) {
 		if (nu->type == CU_BEZIER) {
 			if (index == cu->actnu && !hide_handles)
 				tekenhandlesN_active(nu);
@@ -5504,8 +5503,8 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	draw_editnurb(ob, nurb, 0);
 	draw_editnurb(ob, nurb, 1);
 	/* selected handles */
-	for (nu=nurb; nu; nu=nu->next) {
-		if (nu->type == CU_BEZIER && (cu->drawflag & CU_HIDE_HANDLES)==0)
+	for (nu = nurb; nu; nu = nu->next) {
+		if (nu->type == CU_BEZIER && (cu->drawflag & CU_HIDE_HANDLES) == 0)
 			tekenhandlesN(nu, 1, hide_handles);
 		tekenvertsN(nu, 0, hide_handles, NULL);
 	}
@@ -5514,26 +5513,26 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 
 	/* direction vectors for 3d curve paths
 	 * when at its lowest, don't render normals */
-	if ((cu->flag & CU_3D) && (ts->normalsize > 0.0015f) && (cu->drawflag & CU_HIDE_NORMALS)==0) {
+	if ((cu->flag & CU_3D) && (ts->normalsize > 0.0015f) && (cu->drawflag & CU_HIDE_NORMALS) == 0) {
 
 		UI_ThemeColor(TH_WIRE);
-		for (bl=cu->bev.first,nu=nurb; nu && bl; bl=bl->next,nu=nu->next) {
-			BevPoint *bevp= (BevPoint *)(bl + 1);
-			int nr= bl->nr;
-			int skip= nu->resolu/16;
+		for (bl = cu->bev.first, nu = nurb; nu && bl; bl = bl->next, nu = nu->next) {
+			BevPoint *bevp = (BevPoint *)(bl + 1);
+			int nr = bl->nr;
+			int skip = nu->resolu / 16;
 			
-			while (nr-->0) { /* accounts for empty bevel lists */
-				const float fac= bevp->radius * ts->normalsize;
+			while (nr-- > 0) { /* accounts for empty bevel lists */
+				const float fac = bevp->radius * ts->normalsize;
 				float vec_a[3]; // Offset perpendicular to the curve
 				float vec_b[3]; // Delta along the curve
 
-				vec_a[0]= fac;
-				vec_a[1]= 0.0f;
-				vec_a[2]= 0.0f;
+				vec_a[0] = fac;
+				vec_a[1] = 0.0f;
+				vec_a[2] = 0.0f;
 
-				vec_b[0]= -fac;
-				vec_b[1]= 0.0f;
-				vec_b[2]= 0.0f;
+				vec_b[0] = -fac;
+				vec_b[1] = 0.0f;
+				vec_b[2] = 0.0f;
 				
 				mul_qt_v3(bevp->quat, vec_a);
 				mul_qt_v3(bevp->quat, vec_b);
@@ -5549,7 +5548,7 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 				glVertex3fv(vec_b);
 				glEnd();
 				
-				bevp += skip+1;
+				bevp += skip + 1;
 				nr -= skip;
 			}
 		}
@@ -5557,7 +5556,7 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 
 	if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
 	
-	for (nu=nurb; nu; nu=nu->next) {
+	for (nu = nurb; nu; nu = nu->next) {
 		tekenvertsN(nu, 1, hide_handles, cu->lastsel);
 	}
 	
@@ -5565,14 +5564,14 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 }
 
 /* draw a sphere for use as an empty drawtype */
-static void draw_empty_sphere (float size)
+static void draw_empty_sphere(float size)
 {
-	static GLuint displist=0;
+	static GLuint displist = 0;
 	
 	if (displist == 0) {
-		GLUquadricObj	*qobj;
+		GLUquadricObj   *qobj;
 		
-		displist= glGenLists(1);
+		displist = glGenLists(1);
 		glNewList(displist, GL_COMPILE);
 		
 		glPushMatrix();
@@ -5595,13 +5594,13 @@ static void draw_empty_sphere (float size)
 	
 	glScalef(size, size, size);
 	glCallList(displist);
-	glScalef(1.0f/size, 1.0f/size, 1.0f/size);
+	glScalef(1.0f / size, 1.0f / size, 1.0f / size);
 }
 
 /* draw a cone for use as an empty drawtype */
-static void draw_empty_cone (float size)
+static void draw_empty_cone(float size)
 {
-	float cent=0;
+	float cent = 0;
 	float radius;
 	GLUquadricObj *qobj = gluNewQuadric();
 	gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
@@ -5610,7 +5609,7 @@ static void draw_empty_cone (float size)
 	glPushMatrix();
 	
 	radius = size;
-	glTranslatef(cent,cent, cent);
+	glTranslatef(cent, cent, cent);
 	glScalef(radius, size * 2.0f, radius);
 	glRotatef(-90., 1.0, 0.0, 0.0);
 	gluCylinder(qobj, 1.0, 0.0, 1.0, 8, 1);
@@ -5624,25 +5623,25 @@ static void draw_empty_cone (float size)
 #if 0 // XXX old animation system stuff
 static void curve_draw_speed(Scene *scene, Object *ob)
 {
-	Curve *cu= ob->data;
+	Curve *cu = ob->data;
 	IpoCurve *icu;
 	BezTriple *bezt;
 	float loc[4], dir[3];
 	int a;
 	
-	if (cu->ipo==NULL)
+	if (cu->ipo == NULL)
 		return;
 	
-	icu= cu->ipo->curve.first;
-	if (icu==NULL || icu->totvert<2)
+	icu = cu->ipo->curve.first;
+	if (icu == NULL || icu->totvert < 2)
 		return;
 	
-	glPointSize( UI_GetThemeValuef(TH_VERTEX_SIZE) );
+	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE) );
 	bglBegin(GL_POINTS);
 
-	for (a=0, bezt= icu->bezt; a<icu->totvert; a++, bezt++) {
-		if ( where_on_path(ob, bezt->vec[1][1], loc, dir)) {
-			UI_ThemeColor((bezt->f2 & SELECT) && ob==OBACT?TH_VERTEX_SELECT:TH_VERTEX);
+	for (a = 0, bezt = icu->bezt; a < icu->totvert; a++, bezt++) {
+		if (where_on_path(ob, bezt->vec[1][1], loc, dir)) {
+			UI_ThemeColor((bezt->f2 & SELECT) && ob == OBACT ? TH_VERTEX_SELECT : TH_VERTEX);
 			bglVertex3fv(loc);
 		}
 	}
@@ -5670,14 +5669,14 @@ static void draw_textcurs(float textcurs[4][2])
 static void drawspiral(const float cent[3], float rad, float tmat[][4], int start)
 {
 	float vec[3], vx[3], vy[3];
-	const float tot_inv= (1.0f / (float)CIRCLE_RESOL);
+	const float tot_inv = (1.0f / (float)CIRCLE_RESOL);
 	int a;
-	char inverse= FALSE;
+	char inverse = FALSE;
 	float x, y, fac;
 
 	if (start < 0) {
 		inverse = TRUE;
-		start= -start;
+		start = -start;
 	}
 
 	mul_v3_v3fl(vx, tmat[0], rad);
@@ -5685,47 +5684,47 @@ static void drawspiral(const float cent[3], float rad, float tmat[][4], int star
 
 	glBegin(GL_LINE_STRIP);
 
-	if (inverse==0) {
+	if (inverse == 0) {
 		copy_v3_v3(vec, cent);
 		glVertex3fv(vec);
 
-		for (a=0; a<CIRCLE_RESOL; a++) {
-			if (a+start>=CIRCLE_RESOL)
-				start=-a + 1;
+		for (a = 0; a < CIRCLE_RESOL; a++) {
+			if (a + start >= CIRCLE_RESOL)
+				start = -a + 1;
 
-			fac= (float)a * tot_inv;
-			x= sinval[a+start] * fac;
-			y= cosval[a+start] * fac;
+			fac = (float)a * tot_inv;
+			x = sinval[a + start] * fac;
+			y = cosval[a + start] * fac;
 
-			vec[0]= cent[0] + (x * vx[0] + y * vy[0]);
-			vec[1]= cent[1] + (x * vx[1] + y * vy[1]);
-			vec[2]= cent[2] + (x * vx[2] + y * vy[2]);
+			vec[0] = cent[0] + (x * vx[0] + y * vy[0]);
+			vec[1] = cent[1] + (x * vx[1] + y * vy[1]);
+			vec[2] = cent[2] + (x * vx[2] + y * vy[2]);
 
 			glVertex3fv(vec);
 		}
 	}
 	else {
-		fac= (float)(CIRCLE_RESOL-1) * tot_inv;
-		x= sinval[start] * fac;
-		y= cosval[start] * fac;
+		fac = (float)(CIRCLE_RESOL - 1) * tot_inv;
+		x = sinval[start] * fac;
+		y = cosval[start] * fac;
 
-		vec[0]= cent[0] + (x * vx[0] + y * vy[0]);
-		vec[1]= cent[1] + (x * vx[1] + y * vy[1]);
-		vec[2]= cent[2] + (x * vx[2] + y * vy[2]);
+		vec[0] = cent[0] + (x * vx[0] + y * vy[0]);
+		vec[1] = cent[1] + (x * vx[1] + y * vy[1]);
+		vec[2] = cent[2] + (x * vx[2] + y * vy[2]);
 
 		glVertex3fv(vec);
 
-		for (a=0; a<CIRCLE_RESOL; a++) {
-			if (a+start>=CIRCLE_RESOL)
-				start=-a + 1;
+		for (a = 0; a < CIRCLE_RESOL; a++) {
+			if (a + start >= CIRCLE_RESOL)
+				start = -a + 1;
 
-			fac= (float)(-a+(CIRCLE_RESOL-1)) * tot_inv;
-			x= sinval[a+start] * fac;
-			y= cosval[a+start] * fac;
+			fac = (float)(-a + (CIRCLE_RESOL - 1)) * tot_inv;
+			x = sinval[a + start] * fac;
+			y = cosval[a + start] * fac;
 
-			vec[0]= cent[0] + (x * vx[0] + y * vy[0]);
-			vec[1]= cent[1] + (x * vx[1] + y * vy[1]);
-			vec[2]= cent[2] + (x * vx[2] + y * vy[2]);
+			vec[0] = cent[0] + (x * vx[0] + y * vy[0]);
+			vec[1] = cent[1] + (x * vx[1] + y * vy[1]);
+			vec[2] = cent[2] + (x * vx[2] + y * vy[2]);
 			glVertex3fv(vec);
 		}
 	}
@@ -5744,11 +5743,11 @@ static void drawcircle_size(float size)
 	glBegin(GL_LINE_LOOP);
 
 	/* coordinates are: cos(degrees*11.25)=x, sin(degrees*11.25)=y, 0.0f=z */
-	for (degrees=0; degrees<CIRCLE_RESOL; degrees++) {
-		x= cosval[degrees];
-		y= sinval[degrees];
+	for (degrees = 0; degrees < CIRCLE_RESOL; degrees++) {
+		x = cosval[degrees];
+		y = sinval[degrees];
 		
-		glVertex3f(x*size, 0.0f, y*size);
+		glVertex3f(x * size, 0.0f, y * size);
 	}
 	
 	glEnd();
@@ -5761,20 +5760,20 @@ static void drawtube(const float vec[3], float radius, float height, float tmat[
 	float cur[3];
 	drawcircball(GL_LINE_LOOP, vec, radius, tmat);
 
-	copy_v3_v3(cur,vec);
-	cur[2]+=height;
+	copy_v3_v3(cur, vec);
+	cur[2] += height;
 
 	drawcircball(GL_LINE_LOOP, cur, radius, tmat);
 
 	glBegin(GL_LINES);
-	glVertex3f(vec[0]+radius,vec[1],vec[2]);
-	glVertex3f(cur[0]+radius,cur[1],cur[2]);
-	glVertex3f(vec[0]-radius,vec[1],vec[2]);
-	glVertex3f(cur[0]-radius,cur[1],cur[2]);
-	glVertex3f(vec[0],vec[1]+radius,vec[2]);
-	glVertex3f(cur[0],cur[1]+radius,cur[2]);
-	glVertex3f(vec[0],vec[1]-radius,vec[2]);
-	glVertex3f(cur[0],cur[1]-radius,cur[2]);
+	glVertex3f(vec[0] + radius, vec[1], vec[2]);
+	glVertex3f(cur[0] + radius, cur[1], cur[2]);
+	glVertex3f(vec[0] - radius, vec[1], vec[2]);
+	glVertex3f(cur[0] - radius, cur[1], cur[2]);
+	glVertex3f(vec[0], vec[1] + radius, vec[2]);
+	glVertex3f(cur[0], cur[1] + radius, cur[2]);
+	glVertex3f(vec[0], vec[1] - radius, vec[2]);
+	glVertex3f(cur[0], cur[1] - radius, cur[2]);
 	glEnd();
 }
 /* needs fixing if non-identity matrice used */
@@ -5782,51 +5781,51 @@ static void drawcone(const float vec[3], float radius, float height, float tmat[
 {
 	float cur[3];
 
-	copy_v3_v3(cur,vec);
-	cur[2]+=height;
+	copy_v3_v3(cur, vec);
+	cur[2] += height;
 
 	drawcircball(GL_LINE_LOOP, cur, radius, tmat);
 
 	glBegin(GL_LINES);
-	glVertex3f(vec[0],vec[1],vec[2]);
-	glVertex3f(cur[0]+radius,cur[1],cur[2]);
-	glVertex3f(vec[0],vec[1],vec[2]);
-	glVertex3f(cur[0]-radius,cur[1],cur[2]);
-	glVertex3f(vec[0],vec[1],vec[2]);
-	glVertex3f(cur[0],cur[1]+radius,cur[2]);
-	glVertex3f(vec[0],vec[1],vec[2]);
-	glVertex3f(cur[0],cur[1]-radius,cur[2]);
+	glVertex3f(vec[0], vec[1], vec[2]);
+	glVertex3f(cur[0] + radius, cur[1], cur[2]);
+	glVertex3f(vec[0], vec[1], vec[2]);
+	glVertex3f(cur[0] - radius, cur[1], cur[2]);
+	glVertex3f(vec[0], vec[1], vec[2]);
+	glVertex3f(cur[0], cur[1] + radius, cur[2]);
+	glVertex3f(vec[0], vec[1], vec[2]);
+	glVertex3f(cur[0], cur[1] - radius, cur[2]);
 	glEnd();
 }
 /* return 1 if nothing was drawn */
 static int drawmball(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, int dt)
 {
-	Object *ob= base->object;
+	Object *ob = base->object;
 	MetaBall *mb;
 	MetaElem *ml;
 	float imat[4][4];
-	int code= 1;
+	int code = 1;
 	
-	mb= ob->data;
+	mb = ob->data;
 
 	if (mb->editelems) {
 		UI_ThemeColor(TH_WIRE);
-		if ((G.f & G_PICKSEL)==0 ) drawDispList(scene, v3d, rv3d, base, dt);
-		ml= mb->editelems->first;
+		if ((G.f & G_PICKSEL) == 0) drawDispList(scene, v3d, rv3d, base, dt);
+		ml = mb->editelems->first;
 	}
 	else {
-		if ((base->flag & OB_FROMDUPLI)==0)
+		if ((base->flag & OB_FROMDUPLI) == 0)
 			drawDispList(scene, v3d, rv3d, base, dt);
-		ml= mb->elems.first;
+		ml = mb->elems.first;
 	}
 
-	if (ml==NULL) return 1;
+	if (ml == NULL) return 1;
 
 	if (v3d->flag2 & V3D_RENDER_OVERRIDE) return 0;
 	
 	/* in case solid draw, reset wire colors */
 	if (ob->flag & SELECT) {
-		if (ob==OBACT) UI_ThemeColor(TH_ACTIVE);
+		if (ob == OBACT) UI_ThemeColor(TH_ACTIVE);
 		else UI_ThemeColor(TH_SELECT);
 	}
 	else UI_ThemeColor(TH_WIRE);
@@ -5843,7 +5842,7 @@ static int drawmball(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 			else cpack(0x3030A0);
 			
 			if (G.f & G_PICKSEL) {
-				ml->selcol1= code;
+				ml->selcol1 = code;
 				glLoadName(code++);
 			}
 		}
@@ -5855,31 +5854,31 @@ static int drawmball(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 			else cpack(0x30A030);
 			
 			if (G.f & G_PICKSEL) {
-				ml->selcol2= code;
+				ml->selcol2 = code;
 				glLoadName(code++);
 			}
-			drawcircball(GL_LINE_LOOP, &(ml->x), ml->rad*atanf(ml->s)/(float)M_PI_2, imat);
+			drawcircball(GL_LINE_LOOP, &(ml->x), ml->rad * atanf(ml->s) / (float)M_PI_2, imat);
 		}
 		
-		ml= ml->next;
+		ml = ml->next;
 	}
 	return 0;
 }
 
 static void draw_forcefield(Scene *scene, Object *ob, RegionView3D *rv3d)
 {
-	PartDeflect *pd= ob->pd;
+	PartDeflect *pd = ob->pd;
 	float imat[4][4], tmat[4][4];
-	float vec[3]= {0.0, 0.0, 0.0};
+	float vec[3] = {0.0, 0.0, 0.0};
 	int curcol;
 	float size;
 
 	/* XXX why? */
-	if (ob!=scene->obedit && (ob->flag & SELECT)) {
-		if (ob==OBACT) curcol= TH_ACTIVE;
-		else curcol= TH_SELECT;
+	if (ob != scene->obedit && (ob->flag & SELECT)) {
+		if (ob == OBACT) curcol = TH_ACTIVE;
+		else curcol = TH_SELECT;
 	}
-	else curcol= TH_EMPTY;
+	else curcol = TH_EMPTY;
 	
 	/* scale size of circle etc with the empty drawsize */
 	if (ob->type == OB_EMPTY) size = ob->empty_drawsize;
@@ -5904,11 +5903,11 @@ static void draw_forcefield(Scene *scene, Object *ob, RegionView3D *rv3d)
 		}
 		force_val *= 0.1f;
 		drawcircball(GL_LINE_LOOP, vec, size, tmat);
-		vec[2]= 0.5f * force_val;
+		vec[2] = 0.5f * force_val;
 		drawcircball(GL_LINE_LOOP, vec, size, tmat);
-		vec[2]= 1.0f * force_val;
+		vec[2] = 1.0f * force_val;
 		drawcircball(GL_LINE_LOOP, vec, size, tmat);
-		vec[2]= 1.5f * force_val;
+		vec[2] = 1.5f * force_val;
 		drawcircball(GL_LINE_LOOP, vec, size, tmat);
 		vec[2] = 0.0f; /* reset vec for max dist circle */
 		
@@ -5928,7 +5927,7 @@ static void draw_forcefield(Scene *scene, Object *ob, RegionView3D *rv3d)
 		UI_ThemeColorBlend(curcol, TH_BACK, 0.9f - 0.4f / powf(1.5f, ffall_val));
 		drawcircball(GL_LINE_LOOP, vec, size * 1.5f, imat);
 		UI_ThemeColorBlend(curcol, TH_BACK, 0.9f - 0.4f / powf(2.0f, ffall_val));
-		drawcircball(GL_LINE_LOOP, vec, size*2.0f, imat);
+		drawcircball(GL_LINE_LOOP, vec, size * 2.0f, imat);
 	}
 	else if (pd->forcefield == PFIELD_VORTEX) {
 		float /*ffall_val,*/ force_val;
@@ -5956,8 +5955,8 @@ static void draw_forcefield(Scene *scene, Object *ob, RegionView3D *rv3d)
 			drawspiral(vec, size, tmat, -16);
 		}
 	}
-	else if (pd->forcefield == PFIELD_GUIDE && ob->type==OB_CURVE) {
-		Curve *cu= ob->data;
+	else if (pd->forcefield == PFIELD_GUIDE && ob->type == OB_CURVE) {
+		Curve *cu = ob->data;
 		if ((cu->flag & CU_PATH) && cu->path && cu->path->data) {
 			float mindist, guidevec1[4], guidevec2[3];
 
@@ -5980,14 +5979,14 @@ static void draw_forcefield(Scene *scene, Object *ob, RegionView3D *rv3d)
 			UI_ThemeColorBlend(curcol, TH_BACK, 0.5);
 			drawcircball(GL_LINE_LOOP, guidevec1, mindist, imat);
 			
-			copy_v3_v3(vec, guidevec1);	/* max center */
+			copy_v3_v3(vec, guidevec1); /* max center */
 		}
 	}
 
 	setlinestyle(3);
 	UI_ThemeColorBlend(curcol, TH_BACK, 0.5);
 
-	if (pd->falloff==PFIELD_FALL_SPHERE) {
+	if (pd->falloff == PFIELD_FALL_SPHERE) {
 		/* as last, guide curve alters it */
 		if (pd->flag & PFIELD_USEMAX)
 			drawcircball(GL_LINE_LOOP, vec, pd->maxdist, imat);
@@ -5995,48 +5994,48 @@ static void draw_forcefield(Scene *scene, Object *ob, RegionView3D *rv3d)
 		if (pd->flag & PFIELD_USEMIN)
 			drawcircball(GL_LINE_LOOP, vec, pd->mindist, imat);
 	}
-	else if (pd->falloff==PFIELD_FALL_TUBE) {
-		float radius,distance;
+	else if (pd->falloff == PFIELD_FALL_TUBE) {
+		float radius, distance;
 
 		unit_m4(tmat);
 
-		vec[0]=vec[1]=0.0f;
-		radius=(pd->flag&PFIELD_USEMAXR)?pd->maxrad:1.0f;
-		distance=(pd->flag&PFIELD_USEMAX)?pd->maxdist:0.0f;
-		vec[2]=distance;
-		distance=(pd->flag&PFIELD_POSZ)?-distance:-2.0f*distance;
+		vec[0] = vec[1] = 0.0f;
+		radius = (pd->flag & PFIELD_USEMAXR) ? pd->maxrad : 1.0f;
+		distance = (pd->flag & PFIELD_USEMAX) ? pd->maxdist : 0.0f;
+		vec[2] = distance;
+		distance = (pd->flag & PFIELD_POSZ) ? -distance : -2.0f * distance;
 
-		if (pd->flag & (PFIELD_USEMAX|PFIELD_USEMAXR))
-			drawtube(vec,radius,distance,tmat);
+		if (pd->flag & (PFIELD_USEMAX | PFIELD_USEMAXR))
+			drawtube(vec, radius, distance, tmat);
 
-		radius=(pd->flag&PFIELD_USEMINR)?pd->minrad:1.0f;
-		distance=(pd->flag&PFIELD_USEMIN)?pd->mindist:0.0f;
-		vec[2]=distance;
-		distance=(pd->flag&PFIELD_POSZ)?-distance:-2.0f*distance;
+		radius = (pd->flag & PFIELD_USEMINR) ? pd->minrad : 1.0f;
+		distance = (pd->flag & PFIELD_USEMIN) ? pd->mindist : 0.0f;
+		vec[2] = distance;
+		distance = (pd->flag & PFIELD_POSZ) ? -distance : -2.0f * distance;
 
-		if (pd->flag & (PFIELD_USEMIN|PFIELD_USEMINR))
-			drawtube(vec,radius,distance,tmat);
+		if (pd->flag & (PFIELD_USEMIN | PFIELD_USEMINR))
+			drawtube(vec, radius, distance, tmat);
 	}
-	else if (pd->falloff==PFIELD_FALL_CONE) {
-		float radius,distance;
+	else if (pd->falloff == PFIELD_FALL_CONE) {
+		float radius, distance;
 
 		unit_m4(tmat);
 
-		radius= DEG2RADF((pd->flag&PFIELD_USEMAXR) ? pd->maxrad : 1.0f);
-		distance=(pd->flag&PFIELD_USEMAX)?pd->maxdist:0.0f;
+		radius = DEG2RADF((pd->flag & PFIELD_USEMAXR) ? pd->maxrad : 1.0f);
+		distance = (pd->flag & PFIELD_USEMAX) ? pd->maxdist : 0.0f;
 
-		if (pd->flag & (PFIELD_USEMAX|PFIELD_USEMAXR)) {
-			drawcone(vec, distance * sinf(radius),distance * cosf(radius), tmat);
-			if ((pd->flag & PFIELD_POSZ)==0)
-				drawcone(vec, distance * sinf(radius),-distance * cosf(radius),tmat);
+		if (pd->flag & (PFIELD_USEMAX | PFIELD_USEMAXR)) {
+			drawcone(vec, distance * sinf(radius), distance * cosf(radius), tmat);
+			if ((pd->flag & PFIELD_POSZ) == 0)
+				drawcone(vec, distance * sinf(radius), -distance * cosf(radius), tmat);
 		}
 
-		radius= DEG2RADF((pd->flag&PFIELD_USEMINR) ? pd->minrad : 1.0f);
-		distance=(pd->flag&PFIELD_USEMIN)?pd->mindist:0.0f;
+		radius = DEG2RADF((pd->flag & PFIELD_USEMINR) ? pd->minrad : 1.0f);
+		distance = (pd->flag & PFIELD_USEMIN) ? pd->mindist : 0.0f;
 
-		if (pd->flag & (PFIELD_USEMIN|PFIELD_USEMINR)) {
-			drawcone(vec,distance*sinf(radius),distance*cosf(radius),tmat);
-			if ((pd->flag & PFIELD_POSZ)==0)
+		if (pd->flag & (PFIELD_USEMIN | PFIELD_USEMINR)) {
+			drawcone(vec, distance * sinf(radius), distance * cosf(radius), tmat);
+			if ((pd->flag & PFIELD_POSZ) == 0)
 				drawcone(vec, distance * sinf(radius), -distance * cosf(radius), tmat);
 		}
 	}
@@ -6046,8 +6045,8 @@ static void draw_forcefield(Scene *scene, Object *ob, RegionView3D *rv3d)
 static void draw_box(float vec[8][3])
 {
 	glBegin(GL_LINE_STRIP);
-	glVertex3fv(vec[0]); glVertex3fv(vec[1]);glVertex3fv(vec[2]); glVertex3fv(vec[3]);
-	glVertex3fv(vec[0]); glVertex3fv(vec[4]);glVertex3fv(vec[5]); glVertex3fv(vec[6]);
+	glVertex3fv(vec[0]); glVertex3fv(vec[1]); glVertex3fv(vec[2]); glVertex3fv(vec[3]);
+	glVertex3fv(vec[0]); glVertex3fv(vec[4]); glVertex3fv(vec[5]); glVertex3fv(vec[6]);
 	glVertex3fv(vec[7]); glVertex3fv(vec[4]);
 	glEnd();
 
@@ -6062,20 +6061,20 @@ static void draw_box(float vec[8][3])
 #if 0
 static void get_local_bounds(Object *ob, float center[3], float size[3])
 {
-	BoundBox *bb= object_get_boundbox(ob);
+	BoundBox *bb = object_get_boundbox(ob);
 	
-	if (bb==NULL) {
+	if (bb == NULL) {
 		zero_v3(center);
 		copy_v3_v3(size, ob->size);
 	}
 	else {
-		size[0]= 0.5*fabs(bb->vec[0][0] - bb->vec[4][0]);
-		size[1]= 0.5*fabs(bb->vec[0][1] - bb->vec[2][1]);
-		size[2]= 0.5*fabs(bb->vec[0][2] - bb->vec[1][2]);
-		
-		center[0]= (bb->vec[0][0] + bb->vec[4][0])/2.0;
-		center[1]= (bb->vec[0][1] + bb->vec[2][1])/2.0;
-		center[2]= (bb->vec[0][2] + bb->vec[1][2])/2.0;
+		size[0] = 0.5 * fabs(bb->vec[0][0] - bb->vec[4][0]);
+		size[1] = 0.5 * fabs(bb->vec[0][1] - bb->vec[2][1]);
+		size[2] = 0.5 * fabs(bb->vec[0][2] - bb->vec[1][2]);
+
+		center[0] = (bb->vec[0][0] + bb->vec[4][0]) / 2.0;
+		center[1] = (bb->vec[0][1] + bb->vec[2][1]) / 2.0;
+		center[2] = (bb->vec[0][2] + bb->vec[1][2]) / 2.0;
 	}
 }
 #endif
@@ -6087,29 +6086,29 @@ static void draw_bb_quadric(BoundBox *bb, char type)
 	
 	gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
 	
-	size[0]= 0.5f*fabsf(bb->vec[0][0] - bb->vec[4][0]);
-	size[1]= 0.5f*fabsf(bb->vec[0][1] - bb->vec[2][1]);
-	size[2]= 0.5f*fabsf(bb->vec[0][2] - bb->vec[1][2]);
-	
-	cent[0]= 0.5f*(bb->vec[0][0] + bb->vec[4][0]);
-	cent[1]= 0.5f*(bb->vec[0][1] + bb->vec[2][1]);
-	cent[2]= 0.5f*(bb->vec[0][2] + bb->vec[1][2]);
+	size[0] = 0.5f * fabsf(bb->vec[0][0] - bb->vec[4][0]);
+	size[1] = 0.5f * fabsf(bb->vec[0][1] - bb->vec[2][1]);
+	size[2] = 0.5f * fabsf(bb->vec[0][2] - bb->vec[1][2]);
+
+	cent[0] = 0.5f * (bb->vec[0][0] + bb->vec[4][0]);
+	cent[1] = 0.5f * (bb->vec[0][1] + bb->vec[2][1]);
+	cent[2] = 0.5f * (bb->vec[0][2] + bb->vec[1][2]);
 	
 	glPushMatrix();
-	if (type==OB_BOUND_SPHERE) {
+	if (type == OB_BOUND_SPHERE) {
 		glTranslatef(cent[0], cent[1], cent[2]);
 		glScalef(size[0], size[1], size[2]);
 		gluSphere(qobj, 1.0, 8, 5);
 	}
-	else if (type==OB_BOUND_CYLINDER) {
+	else if (type == OB_BOUND_CYLINDER) {
 		float radius = size[0] > size[1] ? size[0] : size[1];
-		glTranslatef(cent[0], cent[1], cent[2]-size[2]);
+		glTranslatef(cent[0], cent[1], cent[2] - size[2]);
 		glScalef(radius, radius, 2.0f * size[2]);
 		gluCylinder(qobj, 1.0, 1.0, 1.0, 8, 1);
 	}
-	else if (type==OB_BOUND_CONE) {
+	else if (type == OB_BOUND_CONE) {
 		float radius = size[0] > size[1] ? size[0] : size[1];
-		glTranslatef(cent[0], cent[1], cent[2]-size[2]);
+		glTranslatef(cent[0], cent[1], cent[2] - size[2]);
 		glScalef(radius, radius, 2.0f * size[2]);
 		gluCylinder(qobj, 1.0, 0.0, 1.0, 8, 1);
 	}
@@ -6120,20 +6119,20 @@ static void draw_bb_quadric(BoundBox *bb, char type)
 
 static void draw_bounding_volume(Scene *scene, Object *ob, char type)
 {
-	BoundBox *bb= NULL;
+	BoundBox *bb = NULL;
 	
-	if (ob->type==OB_MESH) {
-		bb= mesh_get_bb(ob);
+	if (ob->type == OB_MESH) {
+		bb = mesh_get_bb(ob);
 	}
 	else if (ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
-		bb= ob->bb ? ob->bb : ( (Curve *)ob->data )->bb;
+		bb = ob->bb ? ob->bb : ( (Curve *)ob->data)->bb;
 	}
-	else if (ob->type==OB_MBALL) {
+	else if (ob->type == OB_MBALL) {
 		if (is_basis_mball(ob)) {
-			bb= ob->bb;
-			if (bb==NULL) {
+			bb = ob->bb;
+			if (bb == NULL) {
 				makeDispListMBall(scene, ob);
-				bb= ob->bb;
+				bb = ob->bb;
 			}
 		}
 	}
@@ -6145,9 +6144,9 @@ static void draw_bounding_volume(Scene *scene, Object *ob, char type)
 		return;
 	}
 	
-	if (bb==NULL) return;
+	if (bb == NULL) return;
 	
-	if (type==OB_BOUND_BOX) draw_box(bb->vec);
+	if (type == OB_BOUND_BOX) draw_box(bb->vec);
 	else draw_bb_quadric(bb, type);
 	
 }
@@ -6156,29 +6155,29 @@ static void drawtexspace(Object *ob)
 {
 	float vec[8][3], loc[3], size[3];
 	
-	if (ob->type==OB_MESH) {
+	if (ob->type == OB_MESH) {
 		mesh_get_texspace(ob->data, loc, NULL, size);
 	}
 	else if (ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
-		Curve *cu= ob->data;
+		Curve *cu = ob->data;
 		copy_v3_v3(size, cu->size);
 		copy_v3_v3(loc, cu->loc);
 	}
-	else if (ob->type==OB_MBALL) {
-		MetaBall *mb= ob->data;
+	else if (ob->type == OB_MBALL) {
+		MetaBall *mb = ob->data;
 		copy_v3_v3(size, mb->size);
 		copy_v3_v3(loc, mb->loc);
 	}
 	else return;
 	
-	vec[0][0]=vec[1][0]=vec[2][0]=vec[3][0]= loc[0]-size[0];
-	vec[4][0]=vec[5][0]=vec[6][0]=vec[7][0]= loc[0]+size[0];
+	vec[0][0] = vec[1][0] = vec[2][0] = vec[3][0] = loc[0] - size[0];
+	vec[4][0] = vec[5][0] = vec[6][0] = vec[7][0] = loc[0] + size[0];
 	
-	vec[0][1]=vec[1][1]=vec[4][1]=vec[5][1]= loc[1]-size[1];
-	vec[2][1]=vec[3][1]=vec[6][1]=vec[7][1]= loc[1]+size[1];
+	vec[0][1] = vec[1][1] = vec[4][1] = vec[5][1] = loc[1] - size[1];
+	vec[2][1] = vec[3][1] = vec[6][1] = vec[7][1] = loc[1] + size[1];
 
-	vec[0][2]=vec[3][2]=vec[4][2]=vec[7][2]= loc[2]-size[2];
-	vec[1][2]=vec[2][2]=vec[5][2]=vec[6][2]= loc[2]+size[2];
+	vec[0][2] = vec[3][2] = vec[4][2] = vec[7][2] = loc[2] - size[2];
+	vec[1][2] = vec[2][2] = vec[5][2] = vec[6][2] = loc[2] + size[2];
 	
 	setlinestyle(2);
 
@@ -6190,42 +6189,42 @@ static void drawtexspace(Object *ob)
 /* draws wire outline */
 static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
 {
-	RegionView3D *rv3d= ar->regiondata;
-	Object *ob= base->object;
+	RegionView3D *rv3d = ar->regiondata;
+	Object *ob = base->object;
 	
 	glLineWidth(2.0);
 	glDepthMask(0);
 	
-	if (ELEM3(ob->type, OB_FONT,OB_CURVE, OB_SURF)) {
+	if (ELEM3(ob->type, OB_FONT, OB_CURVE, OB_SURF)) {
 		Curve *cu = ob->data;
 		DerivedMesh *dm = ob->derivedFinal;
-		int hasfaces= 0;
+		int hasfaces = 0;
 
 		if (dm) {
-			hasfaces= dm->getNumTessFaces(dm);
+			hasfaces = dm->getNumTessFaces(dm);
 		}
 		else {
-			hasfaces= displist_has_faces(&ob->disp);
+			hasfaces = displist_has_faces(&ob->disp);
 		}
 
 		if (hasfaces && ED_view3d_boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
-			draw_index_wire= 0;
+			draw_index_wire = 0;
 			if (dm) {
 				draw_mesh_object_outline(v3d, ob, dm);
 			}
 			else {
 				drawDispListwire(&ob->disp);
 			}
-			draw_index_wire= 1;
+			draw_index_wire = 1;
 		}
 	}
-	else if (ob->type==OB_MBALL) {
+	else if (ob->type == OB_MBALL) {
 		if (is_basis_mball(ob)) {
-			if ((base->flag & OB_FROMDUPLI)==0)
+			if ((base->flag & OB_FROMDUPLI) == 0)
 				drawDispListwire(&ob->disp);
 		}
 	}
-	else if (ob->type==OB_ARMATURE) {
+	else if (ob->type == OB_ARMATURE) {
 		if (!(ob->mode & OB_MODE_POSE && base == scene->basact))
 			draw_armature(scene, v3d, ar, base, OB_WIRE, FALSE, TRUE);
 	}
@@ -6236,8 +6235,8 @@ static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
 
 static void drawWireExtra(Scene *scene, RegionView3D *rv3d, Object *ob) 
 {
-	if (ob!=scene->obedit && (ob->flag & SELECT)) {
-		if (ob==OBACT) {
+	if (ob != scene->obedit && (ob->flag & SELECT)) {
+		if (ob == OBACT) {
 			if (ob->flag & OB_FROMGROUP) UI_ThemeColor(TH_GROUP_ACTIVE);
 			else UI_ThemeColor(TH_ACTIVE);
 		}
@@ -6251,7 +6250,7 @@ static void drawWireExtra(Scene *scene, RegionView3D *rv3d, Object *ob)
 			UI_ThemeColor(TH_GROUP);
 		else {
 			if (ob->dtx & OB_DRAWWIRE) {
-				glColor3ub(80,80,80);
+				glColor3ub(80, 80, 80);
 			}
 			else {
 				UI_ThemeColor(TH_WIRE);
@@ -6260,13 +6259,13 @@ static void drawWireExtra(Scene *scene, RegionView3D *rv3d, Object *ob)
 	}
 	
 	bglPolygonOffset(rv3d->dist, 1.0);
-	glDepthMask(0);	// disable write in zbuffer, selected edge wires show better
+	glDepthMask(0); // disable write in zbuffer, selected edge wires show better
 	
 	if (ELEM3(ob->type, OB_FONT, OB_CURVE, OB_SURF)) {
 		Curve *cu = ob->data;
 		if (ED_view3d_boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
-			if (ob->type==OB_CURVE)
-				draw_index_wire= 0;
+			if (ob->type == OB_CURVE)
+				draw_index_wire = 0;
 
 			if (ob->derivedFinal) {
 				drawCurveDMWired(ob);
@@ -6275,11 +6274,11 @@ static void drawWireExtra(Scene *scene, RegionView3D *rv3d, Object *ob)
 				drawDispListwire(&ob->disp);
 			}
 
-			if (ob->type==OB_CURVE)
-				draw_index_wire= 1;
+			if (ob->type == OB_CURVE)
+				draw_index_wire = 1;
 		}
 	}
-	else if (ob->type==OB_MBALL) {
+	else if (ob->type == OB_MBALL) {
 		if (is_basis_mball(ob)) {
 			drawDispListwire(&ob->disp);
 		}
@@ -6295,9 +6294,9 @@ static void draw_hooks(Object *ob)
 	ModifierData *md;
 	float vec[3];
 	
-	for (md=ob->modifiers.first; md; md=md->next) {
-		if (md->type==eModifierType_Hook) {
-			HookModifierData *hmd = (HookModifierData*) md;
+	for (md = ob->modifiers.first; md; md = md->next) {
+		if (md->type == eModifierType_Hook) {
+			HookModifierData *hmd = (HookModifierData *) md;
 
 			mul_v3_m4v3(vec, ob->obmat, hmd->cent);
 
@@ -6331,20 +6330,20 @@ static void drawRBpivot(bRigidBodyJointConstraint *data)
 
 	glGetFloatv(GL_CURRENT_COLOR, curcol);
 	rgb_float_to_uchar(tcol, curcol);
-	tcol[3]= 255;
+	tcol[3] = 255;
 
-	eul_to_mat4(mat,&data->axX);
-	glLineWidth (4.0f);
+	eul_to_mat4(mat, &data->axX);
+	glLineWidth(4.0f);
 	setlinestyle(2);
-	for (axis=0; axis<3; axis++) {
-		float dir[3] = {0,0,0};
+	for (axis = 0; axis < 3; axis++) {
+		float dir[3] = {0, 0, 0};
 		float v[3];
 
 		copy_v3_v3(v, &data->pivX);
 
 		dir[axis] = 1.f;
 		glBegin(GL_LINES);
-		mul_m4_v3(mat,dir);
+		mul_m4_v3(mat, dir);
 		add_v3_v3(v, dir);
 		glVertex3fv(&data->pivX);
 		glVertex3fv(v);
@@ -6352,29 +6351,29 @@ static void drawRBpivot(bRigidBodyJointConstraint *data)
 
 		view3d_cached_text_draw_add(v, axis_str[axis], 0, V3D_CACHE_TEXT_ASCII, tcol);
 	}
-	glLineWidth (1.0f);
+	glLineWidth(1.0f);
 	setlinestyle(0);
 }
 
 /* flag can be DRAW_PICKING	and/or DRAW_CONSTCOLOR, DRAW_SCENESET */
 void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 {
-	static int warning_recursive= 0;
+	static int warning_recursive = 0;
 	ModifierData *md = NULL;
-	Object *ob= base->object;
+	Object *ob = base->object;
 	Curve *cu;
-	RegionView3D *rv3d= ar->regiondata;
+	RegionView3D *rv3d = ar->regiondata;
 	float vec1[3], vec2[3];
-	unsigned int col=0;
-	int /*sel, drawtype,*/ colindex= 0;
-	int i, selstart, selend, empty_object=0;
-	short dt, dtx, zbufoff= 0;
-	const short is_obact= (ob == OBACT);
+	unsigned int col = 0;
+	int /*sel, drawtype,*/ colindex = 0;
+	int i, selstart, selend, empty_object = 0;
+	short dt, dtx, zbufoff = 0;
+	const short is_obact = (ob == OBACT);
 
 	/* only once set now, will be removed too, should become a global standard */
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-	if (ob!=scene->obedit) {
+	if (ob != scene->obedit) {
 		if (ob->restrictflag & OB_RESTRICT_VIEW) {
 			return;
 		}
@@ -6390,7 +6389,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 		return;
 
 	/* xray delay? */
-	if ((flag & DRAW_PICKING)==0 && (base->flag & OB_FROMDUPLI)==0) {
+	if ((flag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0) {
 		/* don't do xray in particle mode, need the z-buffer */
 		if (!(ob->mode & OB_MODE_PARTICLE_EDIT)) {
 			/* xray and transp are set when it is drawing the 2nd/3rd pass */
@@ -6408,8 +6407,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	/* if ( ((int)ob->ctime) != F_(scene->r.cfra)) where_is_object(scene, ob); */
 	
 	/* draw motion paths (in view space) */
-	if (ob->mpath && (v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
-		bAnimVizSettings *avs= &ob->avs;
+	if (ob->mpath && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
+		bAnimVizSettings *avs = &ob->avs;
 		
 		/* setup drawing environment for paths */
 		draw_motion_paths_init(v3d, ar);
@@ -6431,25 +6430,25 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 		 * 'colortab[colindex]' and 'theme_id', colindex overrides theme_id.
 		 *
 		 * note: no theme yet for 'colindex' */
-		int theme_id= TH_WIRE;
-		int theme_shade= 0;
+		int theme_id = TH_WIRE;
+		int theme_shade = 0;
 
 		project_short(ar, ob->obmat[3], &base->sx);
 
 		if ((scene->obedit == NULL) &&
 		    (G.moving & G_TRANSFORM_OBJ) &&
-		    (base->flag & (SELECT+BA_WAS_SEL)))
+		    (base->flag & (SELECT + BA_WAS_SEL)))
 		{
-			theme_id= TH_TRANSFORM;
+			theme_id = TH_TRANSFORM;
 		}
 		else {
 			/* Sets the 'colindex' */
 			if (ob->id.lib) {
-				colindex= (base->flag & (SELECT+BA_WAS_SEL)) ? 4 : 3;
+				colindex = (base->flag & (SELECT + BA_WAS_SEL)) ? 4 : 3;
 			}
-			else if (warning_recursive==1) {
-				if (base->flag & (SELECT+BA_WAS_SEL)) {
-					colindex= (scene->basact==base) ? 8 : 7;
+			else if (warning_recursive == 1) {
+				if (base->flag & (SELECT + BA_WAS_SEL)) {
+					colindex = (scene->basact == base) ? 8 : 7;
 				}
 				else {
 					colindex = 6;
@@ -6458,27 +6457,27 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 			/* Sets the 'theme_id' or fallback to wire */
 			else {
 				if (ob->flag & OB_FROMGROUP) {
-					if (base->flag & (SELECT+BA_WAS_SEL)) {
+					if (base->flag & (SELECT + BA_WAS_SEL)) {
 						/* uses darker active color for non-active + selected*/
-						theme_id= TH_GROUP_ACTIVE;
+						theme_id = TH_GROUP_ACTIVE;
 						
 						if (scene->basact != base) {
-							theme_shade= -16;
+							theme_shade = -16;
 						}
 					}
 					else {
-						theme_id= TH_GROUP;
+						theme_id = TH_GROUP;
 					}
 				}
 				else {
-					if (base->flag & (SELECT+BA_WAS_SEL)) {
-						theme_id= scene->basact == base ? TH_ACTIVE : TH_SELECT;
+					if (base->flag & (SELECT + BA_WAS_SEL)) {
+						theme_id = scene->basact == base ? TH_ACTIVE : TH_SELECT;
 					}
 					else {
-						if (ob->type==OB_LAMP) theme_id= TH_LAMP;
-						else if (ob->type==OB_SPEAKER) theme_id= TH_SPEAKER;
-						else if (ob->type==OB_CAMERA) theme_id= TH_CAMERA;
-						else if (ob->type==OB_EMPTY) theme_id= TH_EMPTY;
+						if (ob->type == OB_LAMP) theme_id = TH_LAMP;
+						else if (ob->type == OB_SPEAKER) theme_id = TH_SPEAKER;
+						else if (ob->type == OB_CAMERA) theme_id = TH_CAMERA;
+						else if (ob->type == OB_EMPTY) theme_id = TH_EMPTY;
 						/* fallback to TH_WIRE */
 					}
 				}
@@ -6488,56 +6487,56 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 		/* finally set the color */
 		if (colindex == 0) {
 			if (theme_shade == 0) UI_ThemeColor(theme_id);
-			else                 UI_ThemeColorShade(theme_id, theme_shade);
+			else UI_ThemeColorShade(theme_id, theme_shade);
 		}
 		else {
-			col= colortab[colindex];
+			col = colortab[colindex];
 			cpack(col);
 		}
 	}
 
 	/* maximum drawtype */
-	dt= v3d->drawtype;
-	if (dt==OB_RENDER) dt= OB_SOLID;
-	dt= MIN2(dt, ob->dt);
-	if (v3d->zbuf==0 && dt>OB_WIRE) dt= OB_WIRE;
-	dtx= 0;
+	dt = v3d->drawtype;
+	if (dt == OB_RENDER) dt = OB_SOLID;
+	dt = MIN2(dt, ob->dt);
+	if (v3d->zbuf == 0 && dt > OB_WIRE) dt = OB_WIRE;
+	dtx = 0;
 
 	/* faceselect exception: also draw solid when dt==wire, except in editmode */
-	if (is_obact && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))) {
-		if (ob->type==OB_MESH) {
+	if (is_obact && (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))) {
+		if (ob->type == OB_MESH) {
 
 			if (ob->mode & OB_MODE_EDIT) {
 				/* pass */
 			}
 			else {
-				if (dt<OB_SOLID) {
-					zbufoff= 1;
-					dt= OB_SOLID;
+				if (dt < OB_SOLID) {
+					zbufoff = 1;
+					dt = OB_SOLID;
 				}
 				else {
-					dt= OB_PAINT;
+					dt = OB_PAINT;
 				}
 
 				glEnable(GL_DEPTH_TEST);
 			}
 		}
 		else {
-			if (dt<OB_SOLID) {
-				dt= OB_SOLID;
+			if (dt < OB_SOLID) {
+				dt = OB_SOLID;
 				glEnable(GL_DEPTH_TEST);
-				zbufoff= 1;
+				zbufoff = 1;
 			}
 		}
 	}
 	
 	/* draw-extra supported for boundbox drawmode too */
-	if (dt>=OB_BOUNDBOX ) {
+	if (dt >= OB_BOUNDBOX) {
 
-		dtx= ob->dtx;
+		dtx = ob->dtx;
 		if (ob->mode & OB_MODE_EDIT) {
 			// the only 2 extra drawtypes alowed in editmode
-			dtx= dtx & (OB_DRAWWIRE|OB_TEXSPACE);
+			dtx = dtx & (OB_DRAWWIRE | OB_TEXSPACE);
 		}
 
 	}
@@ -6545,27 +6544,27 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	/* bad exception, solve this! otherwise outline shows too late */
 	if (ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
 		/* still needed for curves hidden in other layers. depgraph doesnt handle that yet */
-		if (ob->disp.first==NULL) makeDispListCurveTypes(scene, ob, 0);
+		if (ob->disp.first == NULL) makeDispListCurveTypes(scene, ob, 0);
 	}
 	
 	/* draw outline for selected objects, mesh does itself */
-	if ((v3d->flag & V3D_SELECT_OUTLINE) && ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) && ob->type!=OB_MESH) {
-		if (dt>OB_WIRE && (ob->mode & OB_MODE_EDIT)==0 && (flag & DRAW_SCENESET)==0) {
-			if (!(ob->dtx&OB_DRAWWIRE) && (ob->flag&SELECT) && !(flag&DRAW_PICKING)) {
+	if ((v3d->flag & V3D_SELECT_OUTLINE) && ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) && ob->type != OB_MESH) {
+		if (dt > OB_WIRE && (ob->mode & OB_MODE_EDIT) == 0 && (flag & DRAW_SCENESET) == 0) {
+			if (!(ob->dtx & OB_DRAWWIRE) && (ob->flag & SELECT) && !(flag & DRAW_PICKING)) {
 				
 				drawObjectSelect(scene, v3d, ar, base);
 			}
 		}
 	}
 
-	switch( ob->type) {
+	switch (ob->type) {
 		case OB_MESH:
-			empty_object= draw_mesh_object(scene, ar, v3d, rv3d, base, dt, flag);
-			if (flag!=DRAW_CONSTCOLOR) dtx &= ~OB_DRAWWIRE; // mesh draws wire itself
+			empty_object = draw_mesh_object(scene, ar, v3d, rv3d, base, dt, flag);
+			if (flag != DRAW_CONSTCOLOR) dtx &= ~OB_DRAWWIRE;  // mesh draws wire itself
 
 			break;
 		case OB_FONT:
-			cu= ob->data;
+			cu = ob->data;
 			if (cu->editfont) {
 				draw_textcurs(cu->editfont->textcurs);
 
@@ -6596,9 +6595,9 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 				}
 
 				setlinestyle(3);
-				for (i=0; i<cu->totbox; i++) {
+				for (i = 0; i < cu->totbox; i++) {
 					if (cu->tb[i].w != 0.0f) {
-						UI_ThemeColor(i == (cu->actbox-1) ? TH_ACTIVE : TH_WIRE);
+						UI_ThemeColor(i == (cu->actbox - 1) ? TH_ACTIVE : TH_WIRE);
 						vec1[0] = (cu->xof * cu->fsize) + cu->tb[i].x;
 						vec1[1] = (cu->yof * cu->fsize) + cu->tb[i].y + cu->fsize;
 						vec1[2] = 0.001;
@@ -6623,75 +6622,75 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 
 					cpack(0xffffff);
 					set_inverted_drawing(1);
-					for (i=0; i<(selend-selstart+1); i++) {
+					for (i = 0; i < (selend - selstart + 1); i++) {
 						SelBox *sb = &(cu->selboxes[i]);
 
-						if (i<(selend-selstart)) {
-							if (cu->selboxes[i+1].y == sb->y)
-								selboxw= cu->selboxes[i+1].x - sb->x;
+						if (i < (selend - selstart)) {
+							if (cu->selboxes[i + 1].y == sb->y)
+								selboxw = cu->selboxes[i + 1].x - sb->x;
 							else
-								selboxw= sb->w;
+								selboxw = sb->w;
 						}
 						else {
-							selboxw= sb->w;
+							selboxw = sb->w;
 						}
 						glBegin(GL_QUADS);
 						glVertex3f(sb->x, sb->y, 0.001);
-						glVertex3f(sb->x+selboxw, sb->y, 0.001);
-						glVertex3f(sb->x+selboxw, sb->y+sb->h, 0.001);
-						glVertex3f(sb->x, sb->y+sb->h, 0.001);
+						glVertex3f(sb->x + selboxw, sb->y, 0.001);
+						glVertex3f(sb->x + selboxw, sb->y + sb->h, 0.001);
+						glVertex3f(sb->x, sb->y + sb->h, 0.001);
 						glEnd();
 					}
 					set_inverted_drawing(0);
 				}
 			}
-			else if (dt==OB_BOUNDBOX) {
+			else if (dt == OB_BOUNDBOX) {
 				if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_WIRE) == 0) {
 					draw_bounding_volume(scene, ob, ob->boundtype);
 				}
 			}
 			else if (ED_view3d_boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
-				empty_object= drawDispList(scene, v3d, rv3d, base, dt);
+				empty_object = drawDispList(scene, v3d, rv3d, base, dt);
 			}
 
 			break;
 		case OB_CURVE:
 		case OB_SURF:
-			cu= ob->data;
+			cu = ob->data;
 
 			if (cu->editnurb) {
-				ListBase *nurbs= curve_editnurbs(cu);
+				ListBase *nurbs = curve_editnurbs(cu);
 				drawnurb(scene, v3d, rv3d, base, nurbs->first, dt);
 			}
-			else if (dt==OB_BOUNDBOX) {
+			else if (dt == OB_BOUNDBOX) {
 				if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && (v3d->drawtype >= OB_WIRE)) == 0) {
 					draw_bounding_volume(scene, ob, ob->boundtype);
 				}
 			}
 			else if (ED_view3d_boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
-				empty_object= drawDispList(scene, v3d, rv3d, base, dt);
+				empty_object = drawDispList(scene, v3d, rv3d, base, dt);
 
 //XXX old animsys				if (cu->path)
-//               					curve_draw_speed(scene, ob);
+//                                  curve_draw_speed(scene, ob);
 			}
 			break;
 		case OB_MBALL:
 		{
-			MetaBall *mb= ob->data;
+			MetaBall *mb = ob->data;
 			
 			if (mb->editelems)
 				drawmball(scene, v3d, rv3d, base, dt);
-			else if (dt==OB_BOUNDBOX) {
+			else if (dt == OB_BOUNDBOX) {
 				if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && (v3d->drawtype >= OB_WIRE)) == 0) {
 					draw_bounding_volume(scene, ob, ob->boundtype);
 				}
 			}
 			else
-				empty_object= drawmball(scene, v3d, rv3d, base, dt);
+				empty_object = drawmball(scene, v3d, rv3d, base, dt);
 			break;
 		}
 		case OB_EMPTY:
-			if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
+			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 				if (ob->empty_drawtype == OB_EMPTY_IMAGE) {
 					draw_empty_image(ob);
 				}
@@ -6701,24 +6700,24 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 			}
 			break;
 		case OB_LAMP:
-			if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
+			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 				drawlamp(scene, v3d, rv3d, base, dt, flag);
 				if (dtx || (base->flag & SELECT)) glMultMatrixf(ob->obmat);
 			}
 			break;
 		case OB_CAMERA:
-			if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0 ||
-			    (rv3d->persp==RV3D_CAMOB && v3d->camera==ob)) /* special exception for active camera */
+			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0 ||
+			    (rv3d->persp == RV3D_CAMOB && v3d->camera == ob)) /* special exception for active camera */
 			{
 				drawcamera(scene, v3d, rv3d, base, flag);
 				break;
 			}
 		case OB_SPEAKER:
-			if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
+			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0)
 				drawspeaker(scene, v3d, rv3d, ob, flag);
 			break;
 		case OB_LATTICE:
-			if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
+			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 				drawlattice(scene, v3d, ob);
 			}
 			break;
@@ -6731,16 +6730,16 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 					draw_bounding_volume(scene, ob, ob->boundtype);
 				}
 				else {
-					if (dt>OB_WIRE)
-						GPU_enable_material(0, NULL); /* we use default material */
+					if (dt > OB_WIRE)
+						GPU_enable_material(0, NULL);  /* we use default material */
 					empty_object = draw_armature(scene, v3d, ar, base, dt, flag, FALSE);
-					if (dt>OB_WIRE)
+					if (dt > OB_WIRE)
 						GPU_disable_material();
 				}
 			}
 			break;
 		default:
-			if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
+			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 				drawaxes(1.0, OB_ARROWS);
 			}
 	}
@@ -6748,17 +6747,17 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 
 		if (ob->soft /*&& flag & OB_SBMOTION*/) {
-			float mrt[3][3],msc[3][3],mtr[3][3];
-			SoftBody *sb= NULL;
-			float tipw = 0.5f, tiph = 0.5f,drawsize = 4.0f;
-			if ((sb= ob->soft)) {
+			float mrt[3][3], msc[3][3], mtr[3][3];
+			SoftBody *sb = NULL;
+			float tipw = 0.5f, tiph = 0.5f, drawsize = 4.0f;
+			if ((sb = ob->soft)) {
 				if (sb->solverflags & SBSO_ESTIMATEIPO) {
 
 					glLoadMatrixf(rv3d->viewmat);
-					copy_m3_m3(msc,sb->lscale);
-					copy_m3_m3(mrt,sb->lrot);
-					mul_m3_m3m3(mtr,mrt,msc);
-					ob_draw_RE_motion(sb->lcom,mtr,tipw,tiph,drawsize);
+					copy_m3_m3(msc, sb->lscale);
+					copy_m3_m3(mrt, sb->lrot);
+					mul_m3_m3m3(mtr, mrt, msc);
+					ob_draw_RE_motion(sb->lcom, mtr, tipw, tiph, drawsize);
 					glMultMatrixf(ob->obmat);
 				}
 			}
@@ -6770,22 +6769,22 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	}
 
 	/* code for new particle system */
-	if ((warning_recursive==0) &&
+	if ((warning_recursive == 0) &&
 	    (ob->particlesystem.first) &&
-	    (flag & DRAW_PICKING)==0 &&
-	    (ob!=scene->obedit)
+	    (flag & DRAW_PICKING) == 0 &&
+	    (ob != scene->obedit)
 	    )
 	{
 		ParticleSystem *psys;
 
-		if (col || (ob->flag & SELECT)) cpack(0xFFFFFF);	/* for visibility, also while wpaint */
+		if (col || (ob->flag & SELECT)) cpack(0xFFFFFF);    /* for visibility, also while wpaint */
 		//glDepthMask(GL_FALSE);
 
 		glLoadMatrixf(rv3d->viewmat);
 		
 		view3d_cached_text_draw_begin();
 
-		for (psys=ob->particlesystem.first; psys; psys=psys->next) {
+		for (psys = ob->particlesystem.first; psys; psys = psys->next) {
 			/* run this so that possible child particles get cached */
 			if (ob->mode & OB_MODE_PARTICLE_EDIT && is_obact) {
 				PTCacheEdit *edit = PE_create_current(scene, ob);
@@ -6805,8 +6804,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	}
 
 	/* draw edit particles last so that they can draw over child particles */
-	if ( (warning_recursive==0) &&
-	     (flag & DRAW_PICKING)==0 &&
+	if ( (warning_recursive == 0) &&
+	     (flag & DRAW_PICKING) == 0 &&
 	     (!scene->obedit))
 	{
 
@@ -6844,7 +6843,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 
 				for (i = 0; i < scs->numpoints; i++)
 				{
-					bglVertex3fv(&scs->points[3*i]);
+					bglVertex3fv(&scs->points[3 * i]);
 				}
 
 				bglEnd();
@@ -6930,19 +6929,19 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 		}
 	}
 
-	if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
+	if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 		bConstraint *con;
 
-		for (con=ob->constraints.first; con; con= con->next) {
-			if (con->type==CONSTRAINT_TYPE_RIGIDBODYJOINT) {
-				bRigidBodyJointConstraint *data = (bRigidBodyJointConstraint*)con->data;
-				if (data->flag&CONSTRAINT_DRAW_PIVOT)
+		for (con = ob->constraints.first; con; con = con->next) {
+			if (con->type == CONSTRAINT_TYPE_RIGIDBODYJOINT) {
+				bRigidBodyJointConstraint *data = (bRigidBodyJointConstraint *)con->data;
+				if (data->flag & CONSTRAINT_DRAW_PIVOT)
 					drawRBpivot(data);
 			}
 		}
 
 		if (ob->gameflag & OB_BOUNDS) {
-			if (ob->boundtype!=ob->collision_boundtype || (dtx & OB_BOUNDBOX)==0) {
+			if (ob->boundtype != ob->collision_boundtype || (dtx & OB_BOUNDBOX) == 0) {
 				setlinestyle(2);
 				draw_bounding_volume(scene, ob, ob->collision_boundtype);
 				setlinestyle(0);
@@ -6950,7 +6949,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 		}
 
 		/* draw extra: after normal draw because of makeDispList */
-		if (dtx && (G.f & G_RENDER_OGL)==0) {
+		if (dtx && (G.f & G_RENDER_OGL) == 0) {
 
 			if (dtx & OB_AXIS) {
 				drawaxes(1.0f, OB_ARROWS);
@@ -6965,27 +6964,27 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 				/* patch for several 3d cards (IBM mostly) that crash on glSelect with text drawing */
 				/* but, we also don't draw names for sets or duplicators */
 				if (flag == 0) {
-					float zero[3]= {0,0,0};
+					float zero[3] = {0, 0, 0};
 					float curcol[4];
 					unsigned char tcol[4];
 					glGetFloatv(GL_CURRENT_COLOR, curcol);
 					rgb_float_to_uchar(tcol, curcol);
-					tcol[3]= 255;
-					view3d_cached_text_draw_add(zero, ob->id.name+2, 10, 0, tcol);
+					tcol[3] = 255;
+					view3d_cached_text_draw_add(zero, ob->id.name + 2, 10, 0, tcol);
 				}
 			}
 			/*if (dtx & OB_DRAWIMAGE) drawDispListwire(&ob->disp);*/
-			if ((dtx & OB_DRAWWIRE) && dt>=OB_SOLID) {
+			if ((dtx & OB_DRAWWIRE) && dt >= OB_SOLID) {
 				drawWireExtra(scene, rv3d, ob);
 			}
 		}
 	}
 
-	if (dt<=OB_SOLID && (v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
+	if (dt <= OB_SOLID && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 		if ((ob->gameflag & OB_DYNAMIC) ||
 		    ((ob->gameflag & OB_BOUNDS) && (ob->boundtype == OB_BOUND_SPHERE)))
 		{
-			float imat[4][4], vec[3]= {0.0f, 0.0f, 0.0f};
+			float imat[4][4], vec[3] = {0.0f, 0.0f, 0.0f};
 
 			invert_m4_m4(imat, rv3d->viewmatob);
 
@@ -7013,18 +7012,18 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	}
 
 	/* object centers, need to be drawn in viewmat space for speed, but OK for picking select */
-	if (!is_obact || !(ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))) {
-		int do_draw_center= -1;	/* defines below are zero or positive... */
+	if (!is_obact || !(ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))) {
+		int do_draw_center = -1; /* defines below are zero or positive... */
 
 		if (v3d->flag2 & V3D_RENDER_OVERRIDE) {
 			/* don't draw */
 		}
-		else if ((scene->basact)==base)
-			do_draw_center= ACTIVE;
+		else if ((scene->basact) == base)
+			do_draw_center = ACTIVE;
 		else if (base->flag & SELECT)
-			do_draw_center= SELECT;
+			do_draw_center = SELECT;
 		else if (empty_object || (v3d->flag & V3D_DRAW_CENTERS))
-			do_draw_center= DESELECT;
+			do_draw_center = DESELECT;
 
 		if (do_draw_center != -1) {
 			if (flag & DRAW_PICKING) {
@@ -7033,25 +7032,25 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 				glVertex3fv(ob->obmat[3]);
 				glEnd();
 			}
-			else if ((flag & DRAW_CONSTCOLOR)==0) {
+			else if ((flag & DRAW_CONSTCOLOR) == 0) {
 				/* we don't draw centers for duplicators and sets */
 				if (U.obcenter_dia > 0) {
 					/* check > 0 otherwise grease pencil can draw into the circle select which is annoying. */
-					drawcentercircle(v3d, rv3d, ob->obmat[3], do_draw_center, ob->id.lib || ob->id.us>1);
+					drawcentercircle(v3d, rv3d, ob->obmat[3], do_draw_center, ob->id.lib || ob->id.us > 1);
 				}
 			}
 		}
 	}
 
 	/* not for sets, duplicators or picking */
-	if (flag==0 && (v3d->flag & V3D_HIDE_HELPLINES)== 0 && (v3d->flag2 & V3D_RENDER_OVERRIDE)== 0) {
+	if (flag == 0 && (v3d->flag & V3D_HIDE_HELPLINES) == 0 && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 		ListBase *list;
 		
 		/* draw hook center and offset line */
-		if (ob!=scene->obedit) draw_hooks(ob);
+		if (ob != scene->obedit) draw_hooks(ob);
 		
 		/* help lines and so */
-		if (ob!=scene->obedit && ob->parent && (ob->parent->lay & v3d->lay)) {
+		if (ob != scene->obedit && ob->parent && (ob->parent->lay & v3d->lay)) {
 			setlinestyle(3);
 			glBegin(GL_LINES);
 			glVertex3fv(ob->obmat[3]);
@@ -7072,10 +7071,10 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 			UI_make_axis_color(col1, col2, 'Z');
 			glColor3ubv(col2);
 			
-			cob= constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT);
+			cob = constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT);
 			
-			for (curcon = list->first; curcon; curcon=curcon->next) {
-				bConstraintTypeInfo *cti= constraint_get_typeinfo(curcon);
+			for (curcon = list->first; curcon; curcon = curcon->next) {
+				bConstraintTypeInfo *cti = constraint_get_typeinfo(curcon);
 				ListBase targets = {NULL, NULL};
 				bConstraintTarget *ct;
 				
@@ -7084,17 +7083,17 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 					 * constraint targets properly (design limitation -- scene is needed for their target
 					 * but it can't be accessed from get_targets callvack) */
 
-					Object *camob= NULL;
+					Object *camob = NULL;
 
-					if (cti->type==CONSTRAINT_TYPE_FOLLOWTRACK) {
-						bFollowTrackConstraint *data= (bFollowTrackConstraint *)curcon->data;
+					if (cti->type == CONSTRAINT_TYPE_FOLLOWTRACK) {
+						bFollowTrackConstraint *data = (bFollowTrackConstraint *)curcon->data;
 
-						camob= data->camera ? data->camera : scene->camera;
+						camob = data->camera ? data->camera : scene->camera;
 					}
-					else if (cti->type==CONSTRAINT_TYPE_OBJECTSOLVER) {
-						bObjectSolverConstraint *data= (bObjectSolverConstraint *)curcon->data;
+					else if (cti->type == CONSTRAINT_TYPE_OBJECTSOLVER) {
+						bObjectSolverConstraint *data = (bObjectSolverConstraint *)curcon->data;
 
-						camob= data->camera ? data->camera : scene->camera;
+						camob = data->camera ? data->camera : scene->camera;
 					}
 
 					if (camob) {
@@ -7109,7 +7108,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 				else if ((curcon->flag & CONSTRAINT_EXPAND) && (cti) && (cti->get_constraint_targets)) {
 					cti->get_constraint_targets(curcon, &targets);
 					
-					for (ct= targets.first; ct; ct= ct->next) {
+					for (ct = targets.first; ct; ct = ct->next) {
 						/* calculate target's matrix */
 						if (cti->get_target_matrix)
 							cti->get_target_matrix(curcon, cob, ct, BKE_curframe(scene));
@@ -7145,7 +7144,7 @@ static void bbs_obmode_mesh_verts__mapFunc(void *userData, int index, float *co,
 	int offset = (intptr_t) data->offset;
 
 	if (!(mv->flag & ME_HIDE)) {
-		WM_set_framebuffer_index_color(offset+index);
+		WM_set_framebuffer_index_color(offset + index);
 		bglVertex3fv(co);
 	}
 }
@@ -7156,8 +7155,8 @@ static void bbs_obmode_mesh_verts(Object *ob, DerivedMesh *dm, int offset)
 	Mesh *me = ob->data;
 	MVert *mvert = me->mvert;
 	data.mvert = mvert;
-	data.offset = (void*)(intptr_t) offset;
-	glPointSize( UI_GetThemeValuef(TH_VERTEX_SIZE) );
+	data.offset = (void *)(intptr_t) offset;
+	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE) );
 	bglBegin(GL_POINTS);
 	dm->foreachMappedVert(dm, bbs_obmode_mesh_verts__mapFunc, &data);
 	bglEnd();
@@ -7171,15 +7170,15 @@ static void bbs_mesh_verts__mapFunc(void *userData, int index, float *co, float
 	BMVert *eve = EDBM_get_vert_for_index(ptrs[1], index);
 
 	if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
-		WM_set_framebuffer_index_color(offset+index);
+		WM_set_framebuffer_index_color(offset + index);
 		bglVertex3fv(co);
 	}
 }
 static void bbs_mesh_verts(BMEditMesh *em, DerivedMesh *dm, int offset)
 {
-	void *ptrs[2] = {(void*)(intptr_t) offset, em};
+	void *ptrs[2] = {(void *)(intptr_t) offset, em};
 
-	glPointSize( UI_GetThemeValuef(TH_VERTEX_SIZE) );
+	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE) );
 	bglBegin(GL_POINTS);
 	dm->foreachMappedVert(dm, bbs_mesh_verts__mapFunc, ptrs);
 	bglEnd();
@@ -7193,7 +7192,7 @@ static DMDrawOption bbs_mesh_wire__setDrawOptions(void *userData, int index)
 	BMEdge *eed = EDBM_get_edge_for_index(ptrs[1], index);
 
 	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-		WM_set_framebuffer_index_color(offset+index);
+		WM_set_framebuffer_index_color(offset + index);
 		return DM_DRAW_OPTION_NORMAL;
 	}
 	else {
@@ -7202,17 +7201,17 @@ static DMDrawOption bbs_mesh_wire__setDrawOptions(void *userData, int index)
 }
 static void bbs_mesh_wire(BMEditMesh *em, DerivedMesh *dm, int offset)
 {
-	void *ptrs[2] = {(void*)(intptr_t) offset, em};
+	void *ptrs[2] = {(void *)(intptr_t) offset, em};
 	dm->drawMappedEdges(dm, bbs_mesh_wire__setDrawOptions, ptrs);
 }		
 
 static DMDrawOption bbs_mesh_solid__setSolidDrawOptions(void *userData, int index)
 {
-	BMFace *efa = EDBM_get_face_for_index(((void**)userData)[0], index);
+	BMFace *efa = EDBM_get_face_for_index(((void **)userData)[0], index);
 	
 	if (efa && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		if (((void**)userData)[1]) {
-			WM_set_framebuffer_index_color(index+1);
+		if (((void **)userData)[1]) {
+			WM_set_framebuffer_index_color(index + 1);
 		}
 		return DM_DRAW_OPTION_NORMAL;
 	}
@@ -7223,10 +7222,10 @@ static DMDrawOption bbs_mesh_solid__setSolidDrawOptions(void *userData, int inde
 
 static void bbs_mesh_solid__drawCenter(void *userData, int index, float *cent, float *UNUSED(no))
 {
-	BMFace *efa = EDBM_get_face_for_index(((void**)userData)[0], index);
+	BMFace *efa = EDBM_get_face_for_index(((void **)userData)[0], index);
 
 	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		WM_set_framebuffer_index_color(index+1);
+		WM_set_framebuffer_index_color(index + 1);
 
 		bglVertex3fv(cent);
 	}
@@ -7240,7 +7239,7 @@ static void bbs_mesh_solid_EM(BMEditMesh *em, Scene *scene, View3D *v3d,
 	cpack(0);
 
 	if (facecol) {
-		ptrs[1] = (void*)(intptr_t) 1;
+		ptrs[1] = (void *)(intptr_t) 1;
 		dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, GPU_enable_material, NULL, ptrs, 0);
 
 		if (check_ob_drawface_dot(scene, v3d, ob->dt)) {
@@ -7259,7 +7258,7 @@ static void bbs_mesh_solid_EM(BMEditMesh *em, Scene *scene, View3D *v3d,
 
 static DMDrawOption bbs_mesh_solid__setDrawOpts(void *UNUSED(userData), int index)
 {
-	WM_set_framebuffer_index_color(index+1);
+	WM_set_framebuffer_index_color(index + 1);
 	return DM_DRAW_OPTION_NORMAL;
 }
 
@@ -7267,8 +7266,8 @@ static DMDrawOption bbs_mesh_solid_hide__setDrawOpts(void *userData, int index)
 {
 	Mesh *me = userData;
 
-	if (!(me->mpoly[index].flag&ME_HIDE)) {
-		WM_set_framebuffer_index_color(index+1);
+	if (!(me->mpoly[index].flag & ME_HIDE)) {
+		WM_set_framebuffer_index_color(index + 1);
 		return DM_DRAW_OPTION_NORMAL;
 	}
 	else {
@@ -7291,7 +7290,7 @@ static DMDrawOption bbs_mesh_solid_hide2__setDrawOpts(void *userData, int index)
 static void bbs_mesh_solid(Scene *scene, Object *ob)
 {
 	DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);
-	Mesh *me = (Mesh*)ob->data;
+	Mesh *me = (Mesh *)ob->data;
 	
 	glColor3ub(0, 0, 0);
 
@@ -7305,18 +7304,18 @@ static void bbs_mesh_solid(Scene *scene, Object *ob)
 
 void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob)
 {
-	ToolSettings *ts= scene->toolsettings;
+	ToolSettings *ts = scene->toolsettings;
 
 	glMultMatrixf(ob->obmat);
 
 	glClearDepth(1.0); glClear(GL_DEPTH_BUFFER_BIT);
 	glEnable(GL_DEPTH_TEST);
 
-	switch( ob->type) {
+	switch (ob->type) {
 		case OB_MESH:
 			if (ob->mode & OB_MODE_EDIT) {
-				Mesh *me= ob->data;
-				BMEditMesh *em= me->edit_btmesh;
+				Mesh *me = ob->data;
+				BMEditMesh *em = me->edit_btmesh;
 
 				DerivedMesh *dm = editbmesh_get_derived_cage(scene, ob, em, CD_MASK_BAREMESH);
 
@@ -7324,22 +7323,24 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
 
 				bbs_mesh_solid_EM(em, scene, v3d, ob, dm, ts->selectmode & SCE_SELECT_FACE);
 				if (ts->selectmode & SCE_SELECT_FACE)
-					bm_solidoffs = 1+em->bm->totface;
+					bm_solidoffs = 1 + em->bm->totface;
 				else
-					bm_solidoffs= 1;
+					bm_solidoffs = 1;
 
 				bglPolygonOffset(rv3d->dist, 1.0);
 
 				// we draw edges always, for loop (select) tools
 				bbs_mesh_wire(em, dm, bm_solidoffs);
-				bm_wireoffs= bm_solidoffs + em->bm->totedge;
+				bm_wireoffs = bm_solidoffs + em->bm->totedge;
 
 				// we draw verts if vert select mode or if in transform (for snap).
 				if ((ts->selectmode & SCE_SELECT_VERTEX) || (G.moving & G_TRANSFORM_EDIT)) {
 					bbs_mesh_verts(em, dm, bm_wireoffs);
-					bm_vertoffs= bm_wireoffs + em->bm->totvert;
+					bm_vertoffs = bm_wireoffs + em->bm->totvert;
+				}
+				else {
+					bm_vertoffs = bm_wireoffs;
 				}
-				else bm_vertoffs= bm_wireoffs;
 
 				bglPolygonOffset(rv3d->dist, 0.0);
 
@@ -7348,10 +7349,10 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
 				EDBM_free_index_arrays(em);
 			}
 			else {
-				Mesh *me= ob->data;
-				if (     (me->editflag & ME_EDIT_VERT_SEL) &&
-				         /* currently vertex select only supports weight paint */
-				         (ob->mode & OB_MODE_WEIGHT_PAINT))
+				Mesh *me = ob->data;
+				if ((me->editflag & ME_EDIT_VERT_SEL) &&
+				    /* currently vertex select only supports weight paint */
+				    (ob->mode & OB_MODE_WEIGHT_PAINT))
 				{
 					DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);
 					glColor3ub(0, 0, 0);
@@ -7360,7 +7361,7 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
 
 
 					bbs_obmode_mesh_verts(ob, dm, 1);
-					bm_vertoffs = me->totvert+1;
+					bm_vertoffs = me->totvert + 1;
 					dm->release(dm);
 				}
 				else {
@@ -7384,16 +7385,16 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
 static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, 
                                       Object *ob, int dt, int outline)
 {
-	Mesh *me= ob->data;
-	DerivedMesh *dm=NULL, *edm=NULL;
+	Mesh *me = ob->data;
+	DerivedMesh *dm = NULL, *edm = NULL;
 	int glsl;
 	
 	if (ob->mode & OB_MODE_EDIT)
-		edm= editbmesh_get_derived_base(ob, me->edit_btmesh);
+		edm = editbmesh_get_derived_base(ob, me->edit_btmesh);
 	else
 		dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH);
 
-	if (dt<=OB_WIRE) {
+	if (dt <= OB_WIRE) {
 		if (dm)
 			dm->drawEdges(dm, 1, 0);
 		else if (edm)
@@ -7401,7 +7402,7 @@ static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *r
 	}
 	else {
 		if (outline)
-			draw_mesh_object_outline(v3d, ob, dm?dm:edm);
+			draw_mesh_object_outline(v3d, ob, dm ? dm : edm);
 
 		if (dm) {
 			glsl = draw_glsl_material(scene, ob, v3d, dt);
@@ -7413,7 +7414,7 @@ static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *r
 			glDisable(GL_COLOR_MATERIAL);
 		}
 		
-		glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
+		glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
 		glEnable(GL_LIGHTING);
 		
 		if (dm) {