Merged changes in the trunk up to revision 45308.

Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c

1 files changed, 641 insertions, 641 deletions

diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index b15dc6ab3c7..5646570a623 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -88,18 +88,18 @@
 #include "UI_interface.h"
 #include "UI_resources.h"
 
-#include "view3d_intern.h"	// own include
+#include "view3d_intern.h"  // own include
 
 // TODO: should return whether there is valid context to continue
 void view3d_set_viewcontext(bContext *C, ViewContext *vc)
 {
 	memset(vc, 0, sizeof(ViewContext));
-	vc->ar= CTX_wm_region(C);
-	vc->scene= CTX_data_scene(C);
-	vc->v3d= CTX_wm_view3d(C);
-	vc->rv3d= CTX_wm_region_view3d(C);
-	vc->obact= CTX_data_active_object(C);
-	vc->obedit= CTX_data_edit_object(C); 
+	vc->ar = CTX_wm_region(C);
+	vc->scene = CTX_data_scene(C);
+	vc->v3d = CTX_wm_view3d(C);
+	vc->rv3d = CTX_wm_region_view3d(C);
+	vc->obact = CTX_data_active_object(C);
+	vc->obedit = CTX_data_edit_object(C);
 }
 
 int view3d_get_view_aligned_coordinate(ViewContext *vc, float fp[3], const int mval[2], const short do_fallback)
@@ -107,14 +107,14 @@ int view3d_get_view_aligned_coordinate(ViewContext *vc, float fp[3], const int m
 	float dvec[3];
 	int mval_cpy[2];
 
-	mval_cpy[0]= mval[0];
-	mval_cpy[1]= mval[1];
+	mval_cpy[0] = mval[0];
+	mval_cpy[1] = mval[1];
 
 	project_int_noclip(vc->ar, fp, mval_cpy);
 
 	initgrabz(vc->rv3d, fp[0], fp[1], fp[2]);
 
-	if (mval_cpy[0]!=IS_CLIPPED) {
+	if (mval_cpy[0] != IS_CLIPPED) {
 		float mval_f[2];
 		VECSUB2D(mval_f, mval_cpy, mval);
 		ED_view3d_win_to_delta(vc->ar, mval_f, dvec);
@@ -151,8 +151,8 @@ void view3d_get_transformation(const ARegion *ar, RegionView3D *rv3d, Object *ob
 
 	for (i = 0; i < 4; ++i) {
 		for (j = 0; j < 4; ++j) {
-			mats->projection[i*4+j] = rv3d->winmat[i][j];
-			mats->modelview[i*4+j] = cpy[i][j];
+			mats->projection[i * 4 + j] = rv3d->winmat[i][j];
+			mats->modelview[i * 4 + j] = cpy[i][j];
 		}
 	}
 
@@ -166,48 +166,48 @@ void view3d_get_transformation(const ARegion *ar, RegionView3D *rv3d, Object *ob
 
 /* local prototypes */
 
-static void EDBM_backbuf_checkAndSelectVerts(BMEditMesh *em, int select)
+static void edbm_backbuf_check_and_select_verts(BMEditMesh *em, int select)
 {
 	BMVert *eve;
 	BMIter iter;
-	int index= bm_wireoffs;
+	int index = bm_wireoffs;
 
 	eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL);
-	for ( ; eve; eve=BM_iter_step(&iter), index++) {
+	for (; eve; eve = BM_iter_step(&iter), index++) {
 		if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
-			if (EDBM_check_backbuf(index)) {
+			if (EDBM_backbuf_check(index)) {
 				BM_vert_select_set(em->bm, eve, select);
 			}
 		}
 	}
 }
 
-static void EDBM_backbuf_checkAndSelectEdges(BMEditMesh *em, int select)
+static void edbm_backbuf_check_and_select_edges(BMEditMesh *em, int select)
 {
 	BMEdge *eed;
 	BMIter iter;
-	int index= bm_solidoffs;
+	int index = bm_solidoffs;
 
 	eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL);
-	for ( ; eed; eed=BM_iter_step(&iter), index++) {
+	for (; eed; eed = BM_iter_step(&iter), index++) {
 		if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-			if (EDBM_check_backbuf(index)) {
+			if (EDBM_backbuf_check(index)) {
 				BM_edge_select_set(em->bm, eed, select);
 			}
 		}
 	}
 }
 
-static void EDBM_backbuf_checkAndSelectFaces(BMEditMesh *em, int select)
+static void edbm_backbuf_check_and_select_faces(BMEditMesh *em, int select)
 {
 	BMFace *efa;
 	BMIter iter;
-	int index= 1;
+	int index = 1;
 
 	efa = BM_iter_new(&iter, em->bm, BM_FACES_OF_MESH, NULL);
-	for ( ; efa; efa=BM_iter_step(&iter), index++) {
+	for (; efa; efa = BM_iter_step(&iter), index++) {
 		if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-			if (EDBM_check_backbuf(index)) {
+			if (EDBM_backbuf_check(index)) {
 				BM_face_select_set(em->bm, efa, select);
 			}
 		}
@@ -216,16 +216,16 @@ static void EDBM_backbuf_checkAndSelectFaces(BMEditMesh *em, int select)
 
 
 /* object mode, EM_ prefix is confusing here, rename? */
-static void EDBM_backbuf_checkAndSelectVerts_obmode(Mesh *me, int select)
+static void edbm_backbuf_check_and_select_verts_obmode(Mesh *me, int select)
 {
 	MVert *mv = me->mvert;
 	int a;
 
 	if (mv) {
-		for (a=1; a<=me->totvert; a++, mv++) {
-			if (EDBM_check_backbuf(a)) {
+		for (a = 1; a <= me->totvert; a++, mv++) {
+			if (EDBM_backbuf_check(a)) {
 				if (!(mv->flag & ME_HIDE)) {
-					mv->flag = select?(mv->flag|SELECT):(mv->flag&~SELECT);
+					mv->flag = select ? (mv->flag | SELECT) : (mv->flag & ~SELECT);
 				}
 			}
 		}
@@ -233,15 +233,15 @@ static void EDBM_backbuf_checkAndSelectVerts_obmode(Mesh *me, int select)
 }
 /* object mode, EM_ prefix is confusing here, rename? */
 
-static void EDBM_backbuf_checkAndSelectTFaces(Mesh *me, int select)
+static void edbm_backbuf_check_and_select_tfaces(Mesh *me, int select)
 {
 	MPoly *mpoly = me->mpoly;
 	int a;
 
 	if (mpoly) {
-		for (a=1; a<=me->totpoly; a++, mpoly++) {
-			if (EDBM_check_backbuf(a)) {
-				mpoly->flag = select?(mpoly->flag|ME_FACE_SEL):(mpoly->flag&~ME_FACE_SEL);
+		for (a = 1; a <= me->totpoly; a++, mpoly++) {
+			if (EDBM_backbuf_check(a)) {
+				mpoly->flag = select ? (mpoly->flag | ME_FACE_SEL) : (mpoly->flag & ~ME_FACE_SEL);
 			}
 		}
 	}
@@ -272,7 +272,7 @@ static int view3d_selectable_data(bContext *C)
 			if (ob->mode & OB_MODE_SCULPT) {
 				return 0;
 			}
-			if ((ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)) &&
+			if ((ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)) &&
 			    !paint_facesel_test(ob) && !paint_vertsel_test(ob))
 			{
 				return 0;
@@ -298,19 +298,19 @@ static int edge_inside_rect(rcti *rect, short x1, short y1, short x2, short y2)
 	if (edge_fully_inside_rect(rect, x1, y1, x2, y2)) return 1;
 	
 	/* check points completely out rect */
-	if (x1<rect->xmin && x2<rect->xmin) return 0;
-	if (x1>rect->xmax && x2>rect->xmax) return 0;
-	if (y1<rect->ymin && y2<rect->ymin) return 0;
-	if (y1>rect->ymax && y2>rect->ymax) return 0;
+	if (x1 < rect->xmin && x2 < rect->xmin) return 0;
+	if (x1 > rect->xmax && x2 > rect->xmax) return 0;
+	if (y1 < rect->ymin && y2 < rect->ymin) return 0;
+	if (y1 > rect->ymax && y2 > rect->ymax) return 0;
 	
 	/* simple check lines intersecting. */
-	d1= (y1-y2)*(x1- rect->xmin ) + (x2-x1)*(y1- rect->ymin );
-	d2= (y1-y2)*(x1- rect->xmin ) + (x2-x1)*(y1- rect->ymax );
-	d3= (y1-y2)*(x1- rect->xmax ) + (x2-x1)*(y1- rect->ymax );
-	d4= (y1-y2)*(x1- rect->xmax ) + (x2-x1)*(y1- rect->ymin );
+	d1 = (y1 - y2) * (x1 - rect->xmin) + (x2 - x1) * (y1 - rect->ymin);
+	d2 = (y1 - y2) * (x1 - rect->xmin) + (x2 - x1) * (y1 - rect->ymax);
+	d3 = (y1 - y2) * (x1 - rect->xmax) + (x2 - x1) * (y1 - rect->ymax);
+	d4 = (y1 - y2) * (x1 - rect->xmax) + (x2 - x1) * (y1 - rect->ymin);
 	
-	if (d1<0 && d2<0 && d3<0 && d4<0) return 0;
-	if (d1>0 && d2>0 && d3>0 && d4>0) return 0;
+	if (d1 < 0 && d2 < 0 && d3 < 0 && d4 < 0) return 0;
+	if (d1 > 0 && d2 > 0 && d3 > 0 && d4 > 0) return 0;
 	
 	return 1;
 }
@@ -322,47 +322,47 @@ static int edge_inside_rect(rcti *rect, short x1, short y1, short x2, short y2)
 int lasso_inside(int mcords[][2], short moves, int sx, int sy)
 {
 	/* we do the angle rule, define that all added angles should be about zero or 2*PI */
-	float angletot=0.0, len, dot, ang, cross, fp1[2], fp2[2];
+	float angletot = 0.0, len, dot, ang, cross, fp1[2], fp2[2];
 	int a;
 	int *p1, *p2;
 	
-	if (sx==IS_CLIPPED)
+	if (sx == IS_CLIPPED)
 		return 0;
 	
-	p1= mcords[moves-1];
-	p2= mcords[0];
+	p1 = mcords[moves - 1];
+	p2 = mcords[0];
 	
 	/* first vector */
-	fp1[0]= (float)(p1[0]-sx);
-	fp1[1]= (float)(p1[1]-sy);
-	len= sqrt(fp1[0]*fp1[0] + fp1[1]*fp1[1]);
-	fp1[0]/= len;
-	fp1[1]/= len;
+	fp1[0] = (float)(p1[0] - sx);
+	fp1[1] = (float)(p1[1] - sy);
+	len = sqrt(fp1[0] * fp1[0] + fp1[1] * fp1[1]);
+	fp1[0] /= len;
+	fp1[1] /= len;
 	
-	for (a=0; a<moves; a++) {
+	for (a = 0; a < moves; a++) {
 		/* second vector */
-		fp2[0]= (float)(p2[0]-sx);
-		fp2[1]= (float)(p2[1]-sy);
-		len= sqrt(fp2[0]*fp2[0] + fp2[1]*fp2[1]);
-		fp2[0]/= len;
-		fp2[1]/= len;
+		fp2[0] = (float)(p2[0] - sx);
+		fp2[1] = (float)(p2[1] - sy);
+		len = sqrt(fp2[0] * fp2[0] + fp2[1] * fp2[1]);
+		fp2[0] /= len;
+		fp2[1] /= len;
 		
 		/* dot and angle and cross */
-		dot= fp1[0]*fp2[0] + fp1[1]*fp2[1];
-		ang= fabs(saacos(dot));
+		dot = fp1[0] * fp2[0] + fp1[1] * fp2[1];
+		ang = fabs(saacos(dot));
 
-		cross= (float)((p1[1]-p2[1])*(p1[0]-sx) + (p2[0]-p1[0])*(p1[1]-sy));
+		cross = (float)((p1[1] - p2[1]) * (p1[0] - sx) + (p2[0] - p1[0]) * (p1[1] - sy));
 		
-		if (cross<0.0f) angletot-= ang;
-		else angletot+= ang;
+		if (cross < 0.0f) angletot -= ang;
+		else angletot += ang;
 		
 		/* circulate */
-		fp1[0]= fp2[0]; fp1[1]= fp2[1];
-		p1= p2;
-		p2= mcords[a+1];
+		fp1[0] = fp2[0]; fp1[1] = fp2[1];
+		p1 = p2;
+		p2 = mcords[a + 1];
 	}
 	
-	if ( fabs(angletot) > 4.0 ) return 1;
+	if (fabs(angletot) > 4.0) return 1;
 	return 0;
 }
 
@@ -372,7 +372,7 @@ int lasso_inside_edge(int mcords[][2], short moves, int x0, int y0, int x1, int
 	int v1[2], v2[2];
 	int a;
 
-	if (x0==IS_CLIPPED || x1==IS_CLIPPED)
+	if (x0 == IS_CLIPPED || x1 == IS_CLIPPED)
 		return 0;
 	
 	v1[0] = x0, v1[1] = y0;
@@ -384,9 +384,9 @@ int lasso_inside_edge(int mcords[][2], short moves, int x0, int y0, int x1, int
 	
 	/* no points in lasso, so we have to intersect with lasso edge */
 	
-	if ( isect_line_line_v2_int(mcords[0], mcords[moves-1], v1, v2) > 0) return 1;
-	for (a=0; a<moves-1; a++) {
-		if ( isect_line_line_v2_int(mcords[a], mcords[a+1], v1, v2) > 0) return 1;
+	if (isect_line_line_v2_int(mcords[0], mcords[moves - 1], v1, v2) > 0) return 1;
+	for (a = 0; a < moves - 1; a++) {
+		if (isect_line_line_v2_int(mcords[a], mcords[a + 1], v1, v2) > 0) return 1;
 	}
 	
 	return 0;
@@ -401,12 +401,12 @@ static void do_lasso_select_pose(ViewContext *vc, Object *ob, int mcords[][2], s
 	bPoseChannel *pchan;
 	float vec[3];
 	int sco1[2], sco2[2];
-	bArmature *arm= ob->data;
+	bArmature *arm = ob->data;
 	
-	if (ob->type!=OB_ARMATURE || ob->pose==NULL) return;
+	if (ob->type != OB_ARMATURE || ob->pose == NULL) return;
 
-	for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
-		if (PBONE_VISIBLE(arm, pchan->bone) && (pchan->bone->flag & BONE_UNSELECTABLE)==0) {
+	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+		if (PBONE_VISIBLE(arm, pchan->bone) && (pchan->bone->flag & BONE_UNSELECTABLE) == 0) {
 			mul_v3_m4v3(vec, ob->obmat, pchan->pose_head);
 			project_int(vc->ar, vec, sco1);
 			mul_v3_m4v3(vec, ob->obmat, pchan->pose_tail);
@@ -424,7 +424,7 @@ static void object_deselect_all_visible(Scene *scene, View3D *v3d)
 {
 	Base *base;
 
-	for (base= scene->base.first; base; base= base->next) {
+	for (base = scene->base.first; base; base = base->next) {
 		if (BASE_SELECTABLE(v3d, base)) {
 			ED_base_object_select(base, BA_DESELECT);
 		}
@@ -438,14 +438,14 @@ static void do_lasso_select_objects(ViewContext *vc, int mcords[][2], short move
 	if (extend == 0 && select)
 		object_deselect_all_visible(vc->scene, vc->v3d);
 
-	for (base= vc->scene->base.first; base; base= base->next) {
+	for (base = vc->scene->base.first; base; base = base->next) {
 		if (BASE_SELECTABLE(vc->v3d, base)) { /* use this to avoid un-needed lasso lookups */
 			project_short(vc->ar, base->object->obmat[3], &base->sx);
 			if (lasso_inside(mcords, moves, base->sx, base->sy)) {
 				
 				if (select) ED_base_object_select(base, BA_SELECT);
 				else ED_base_object_select(base, BA_DESELECT);
-				base->object->flag= base->flag;
+				base->object->flag = base->flag;
 			}
 			if (base->object->mode & OB_MODE_POSE) {
 				do_lasso_select_pose(vc, base->object, mcords, moves, select);
@@ -461,11 +461,11 @@ static void lasso_select_boundbox(rcti *rect, int mcords[][2], short moves)
 	rect->xmin = rect->xmax = mcords[0][0];
 	rect->ymin = rect->ymax = mcords[0][1];
 	
-	for (a=1; a<moves; a++) {
-		if (mcords[a][0]<rect->xmin) rect->xmin = mcords[a][0];
-		else if (mcords[a][0]>rect->xmax) rect->xmax = mcords[a][0];
-		if (mcords[a][1]<rect->ymin) rect->ymin = mcords[a][1];
-		else if (mcords[a][1]>rect->ymax) rect->ymax = mcords[a][1];
+	for (a = 1; a < moves; a++) {
+		if (mcords[a][0] < rect->xmin) rect->xmin = mcords[a][0];
+		else if (mcords[a][0] > rect->xmax) rect->xmax = mcords[a][0];
+		if (mcords[a][1] < rect->ymin) rect->ymin = mcords[a][1];
+		else if (mcords[a][1] > rect->ymax) rect->ymax = mcords[a][1];
 	}
 }
 
@@ -481,11 +481,11 @@ static void do_lasso_select_mesh__doSelectEdge(void *userData, BMEdge *eed, int
 {
 	LassoSelectUserData *data = userData;
 
-	if (EDBM_check_backbuf(bm_solidoffs+index)) {
-		if (data->pass==0) {
-			if (	edge_fully_inside_rect(data->rect, x0, y0, x1, y1)  &&
-					lasso_inside(data->mcords, data->moves, x0, y0) &&
-					lasso_inside(data->mcords, data->moves, x1, y1)) {
+	if (EDBM_backbuf_check(bm_solidoffs + index)) {
+		if (data->pass == 0) {
+			if (edge_fully_inside_rect(data->rect, x0, y0, x1, y1)  &&
+			    lasso_inside(data->mcords, data->moves, x0, y0) &&
+			    lasso_inside(data->mcords, data->moves, x1, y1)) {
 				BM_elem_select_set(data->vc->em->bm, eed, data->select);
 				data->done = 1;
 			}
@@ -509,7 +509,7 @@ static void do_lasso_select_mesh__doSelectFace(void *userData, BMFace *efa, int
 static void do_lasso_select_mesh(ViewContext *vc, int mcords[][2], short moves, short extend, short select)
 {
 	LassoSelectUserData data;
-	ToolSettings *ts= vc->scene->toolsettings;
+	ToolSettings *ts = vc->scene->toolsettings;
 	rcti rect;
 	int bbsel;
 	
@@ -518,7 +518,7 @@ static void do_lasso_select_mesh(ViewContext *vc, int mcords[][2], short moves,
 	/* set editmesh */
 	vc->em = BMEdit_FromObject(vc->obedit);
 
-	data.vc= vc;
+	data.vc = vc;
 	data.rect = &rect;
 	data.mcords = mcords;
 	data.moves = moves;
@@ -529,15 +529,15 @@ static void do_lasso_select_mesh(ViewContext *vc, int mcords[][2], short moves,
 	if (extend == 0 && select)
 		EDBM_flag_disable_all(vc->em, BM_ELEM_SELECT);
 
-	 /* for non zbuf projections, don't change the GL state */
+	/* for non zbuf projections, don't change the GL state */
 	ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d);
 
 	glLoadMatrixf(vc->rv3d->viewmat);
-	bbsel= EDBM_mask_init_backbuf_border(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
+	bbsel = EDBM_backbuf_border_mask_init(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
 	
 	if (ts->selectmode & SCE_SELECT_VERTEX) {
 		if (bbsel) {
-			EDBM_backbuf_checkAndSelectVerts(vc->em, select);
+			edbm_backbuf_check_and_select_verts(vc->em, select);
 		}
 		else {
 			mesh_foreachScreenVert(vc, do_lasso_select_mesh__doSelectVert, &data, V3D_CLIP_TEST_RV3D_CLIPPING);
@@ -548,7 +548,7 @@ static void do_lasso_select_mesh(ViewContext *vc, int mcords[][2], short moves,
 		data.pass = 0;
 		mesh_foreachScreenEdge(vc, do_lasso_select_mesh__doSelectEdge, &data, V3D_CLIP_TEST_OFF);
 
-		if (data.done==0) {
+		if (data.done == 0) {
 			data.pass = 1;
 			mesh_foreachScreenEdge(vc, do_lasso_select_mesh__doSelectEdge, &data, V3D_CLIP_TEST_OFF);
 		}
@@ -556,14 +556,14 @@ static void do_lasso_select_mesh(ViewContext *vc, int mcords[][2], short moves,
 	
 	if (ts->selectmode & SCE_SELECT_FACE) {
 		if (bbsel) {
-			EDBM_backbuf_checkAndSelectFaces(vc->em, select);
+			edbm_backbuf_check_and_select_faces(vc->em, select);
 		}
 		else {
 			mesh_foreachScreenFace(vc, do_lasso_select_mesh__doSelectFace, &data);
 		}
 	}
 	
-	EDBM_free_backbuf();
+	EDBM_backbuf_free();
 	EDBM_selectmode_flush(vc->em);
 }
 
@@ -582,7 +582,7 @@ static void do_lasso_select_mesh_uv(int mcords[][2], short moves, short select)
 	if (draw_uvs_face_check()) { /* Face Center Sel */
 		float cent[2];
 		ok = 0;
-		for (efa= em->faces.first; efa; efa= efa->next) {
+		for (efa = em->faces.first; efa; efa = efa->next) {
 			/* assume not touched */
 			efa->tmp.l = 0;
 			tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
@@ -600,11 +600,11 @@ static void do_lasso_select_mesh_uv(int mcords[][2], short moves, short select)
 		
 	}
 	else { /* Vert Sel*/
-		for (efa= em->faces.first; efa; efa= efa->next) {
+		for (efa = em->faces.first; efa; efa = efa->next) {
 			tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
 			if (uvedit_face_visible(scene, ima, efa, tf)) {		
-				nverts= efa->v4? 4: 3;
-				for (i=0; i<nverts; i++) {
+				nverts = efa->v4 ? 4 : 3;
+				for (i = 0; i < nverts; i++) {
 					if ((select) != (simaUVSel_Check(efa, tf, i))) {
 						uvco_to_areaco_noclip(tf->uv[i], screenUV);
 						if (BLI_in_rcti(&rect, screenUV[0], screenUV[1]) && lasso_inside(mcords, moves, screenUV[0], screenUV[1])) {
@@ -622,7 +622,7 @@ static void do_lasso_select_mesh_uv(int mcords[][2], short moves, short select)
 	}
 	if (ok && G.sima->flag & SI_SYNC_UVSEL) {
 		if (select) EM_select_flush(vc->em);
-		else		EM_deselect_flush(vc->em);
+		else EM_deselect_flush(vc->em);
 	}
 }
 #endif
@@ -630,28 +630,28 @@ static void do_lasso_select_mesh_uv(int mcords[][2], short moves, short select)
 static void do_lasso_select_curve__doSelect(void *userData, Nurb *UNUSED(nu), BPoint *bp, BezTriple *bezt, int beztindex, int x, int y)
 {
 	LassoSelectUserData *data = userData;
-	Object *obedit= data->vc->obedit;
-	Curve *cu= (Curve*)obedit->data;
+	Object *obedit = data->vc->obedit;
+	Curve *cu = (Curve *)obedit->data;
 
 	if (lasso_inside(data->mcords, data->moves, x, y)) {
 		if (bp) {
-			bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT);
+			bp->f1 = data->select ? (bp->f1 | SELECT) : (bp->f1 & ~SELECT);
 			if (bp == cu->lastsel && !(bp->f1 & 1)) cu->lastsel = NULL;
 		}
 		else {
 			if (cu->drawflag & CU_HIDE_HANDLES) {
 				/* can only be beztindex==0 here since handles are hidden */
-				bezt->f1 = bezt->f2 = bezt->f3 = data->select?(bezt->f2|SELECT):(bezt->f2&~SELECT);
+				bezt->f1 = bezt->f2 = bezt->f3 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT);
 			}
 			else {
-				if (beztindex==0) {
-					bezt->f1 = data->select?(bezt->f1|SELECT):(bezt->f1&~SELECT);
+				if (beztindex == 0) {
+					bezt->f1 = data->select ? (bezt->f1 | SELECT) : (bezt->f1 & ~SELECT);
 				}
-				else if (beztindex==1) {
-					bezt->f2 = data->select?(bezt->f2|SELECT):(bezt->f2&~SELECT);
+				else if (beztindex == 1) {
+					bezt->f2 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT);
 				}
 				else {
-					bezt->f3 = data->select?(bezt->f3|SELECT):(bezt->f3&~SELECT);
+					bezt->f3 = data->select ? (bezt->f3 | SELECT) : (bezt->f3 & ~SELECT);
 				}
 			}
 
@@ -682,7 +682,7 @@ static void do_lasso_select_lattice__doSelect(void *userData, BPoint *bp, int x,
 	LassoSelectUserData *data = userData;
 
 	if (lasso_inside(data->mcords, data->moves, x, y)) {
-		bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT);
+		bp->f1 = data->select ? (bp->f1 | SELECT) : (bp->f1 & ~SELECT);
 	}
 }
 static void do_lasso_select_lattice(ViewContext *vc, int mcords[][2], short moves, short extend, short select)
@@ -703,42 +703,42 @@ static void do_lasso_select_lattice(ViewContext *vc, int mcords[][2], short move
 
 static void do_lasso_select_armature(ViewContext *vc, int mcords[][2], short moves, short extend, short select)
 {
-	bArmature *arm= vc->obedit->data;
+	bArmature *arm = vc->obedit->data;
 	EditBone *ebone;
 	float vec[3];
 	short sco1[2], sco2[2], didpoint;
-	int change= FALSE;
+	int change = FALSE;
 
-	if (extend==0 && select)
+	if (extend == 0 && select)
 		ED_armature_deselect_all_visible(vc->obedit);
 
 	/* set editdata in vc */
 	
-	for (ebone= arm->edbo->first; ebone; ebone=ebone->next) {
-		if (EBONE_VISIBLE(arm, ebone) && (ebone->flag & BONE_UNSELECTABLE)==0) {
+	for (ebone = arm->edbo->first; ebone; ebone = ebone->next) {
+		if (EBONE_VISIBLE(arm, ebone) && (ebone->flag & BONE_UNSELECTABLE) == 0) {
 			mul_v3_m4v3(vec, vc->obedit->obmat, ebone->head);
 			project_short(vc->ar, vec, sco1);
 			mul_v3_m4v3(vec, vc->obedit->obmat, ebone->tail);
 			project_short(vc->ar, vec, sco2);
 			
-			didpoint= 0;
+			didpoint = 0;
 			if (lasso_inside(mcords, moves, sco1[0], sco1[1])) {
 				if (select) ebone->flag |= BONE_ROOTSEL;
 				else ebone->flag &= ~BONE_ROOTSEL;
-				didpoint= 1;
-				change= TRUE;
+				didpoint = 1;
+				change = TRUE;
 			}
 			if (lasso_inside(mcords, moves, sco2[0], sco2[1])) {
 				if (select) ebone->flag |= BONE_TIPSEL;
 				else ebone->flag &= ~BONE_TIPSEL;
-				didpoint= 1;
-				change= TRUE;
+				didpoint = 1;
+				change = TRUE;
 			}
 			/* if one of points selected, we skip the bone itself */
-			if (didpoint==0 && lasso_inside_edge(mcords, moves, sco1[0], sco1[1], sco2[0], sco2[1])) {
-				if (select) ebone->flag |= BONE_TIPSEL|BONE_ROOTSEL|BONE_SELECTED;
-				else ebone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
-				change= TRUE;
+			if (didpoint == 0 && lasso_inside_edge(mcords, moves, sco1[0], sco1[1], sco2[0], sco2[1])) {
+				if (select) ebone->flag |= BONE_TIPSEL | BONE_ROOTSEL | BONE_SELECTED;
+				else ebone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
+				change = TRUE;
 			}
 		}
 	}
@@ -746,7 +746,7 @@ static void do_lasso_select_armature(ViewContext *vc, int mcords[][2], short mov
 	if (change) {
 		ED_armature_sync_selection(arm->edbo);
 		ED_armature_validate_active(arm);
-		WM_main_add_notifier(NC_OBJECT|ND_BONE_SELECT, vc->obedit);
+		WM_main_add_notifier(NC_OBJECT | ND_BONE_SELECT, vc->obedit);
 	}
 }
 
@@ -755,25 +755,25 @@ static void do_lasso_select_armature(ViewContext *vc, int mcords[][2], short mov
 
 static void do_lasso_select_meta(ViewContext *vc, int mcords[][2], short moves, short extend, short select)
 {
-	MetaBall *mb = (MetaBall*)vc->obedit->data;
+	MetaBall *mb = (MetaBall *)vc->obedit->data;
 	MetaElem *ml;
 	float vec[3];
 	short sco[2];
 
 	if (extend == 0 && select) {
-		for (ml= mb->editelems->first; ml; ml= ml->next) {
+		for (ml = mb->editelems->first; ml; ml = ml->next) {
 			ml->flag &= ~SELECT;
 		}
 	}
 
-	for (ml= mb->editelems->first; ml; ml= ml->next) {
+	for (ml = mb->editelems->first; ml; ml = ml->next) {
 		
 		mul_v3_m4v3(vec, vc->obedit->obmat, &ml->x);
 		project_short(vc->ar, vec, sco);
 
 		if (lasso_inside(mcords, moves, sco[0], sco[1])) {
-			if (select)	ml->flag |= SELECT;
-			else		ml->flag &= ~SELECT;
+			if (select) ml->flag |= SELECT;
+			else ml->flag &= ~SELECT;
 		}
 	}
 }
@@ -786,36 +786,36 @@ int do_paintvert_box_select(ViewContext *vc, rcti *rect, int select, int extend)
 	unsigned int *rt;
 	int a, index;
 	char *selar;
-	int sx= rect->xmax-rect->xmin+1;
-	int sy= rect->ymax-rect->ymin+1;
+	int sx = rect->xmax - rect->xmin + 1;
+	int sy = rect->ymax - rect->ymin + 1;
 
-	me= vc->obact->data;
+	me = vc->obact->data;
 
-	if (me==NULL || me->totvert==0 || sx*sy <= 0)
+	if (me == NULL || me->totvert == 0 || sx * sy <= 0)
 		return OPERATOR_CANCELLED;
 
-	selar= MEM_callocN(me->totvert+1, "selar");
+	selar = MEM_callocN(me->totvert + 1, "selar");
 
 	if (extend == 0 && select)
 		paintvert_deselect_all_visible(vc->obact, SEL_DESELECT, FALSE);
 
 	view3d_validate_backbuf(vc);
 
-	ibuf = IMB_allocImBuf(sx,sy,32,IB_rect);
+	ibuf = IMB_allocImBuf(sx, sy, 32, IB_rect);
 	rt = ibuf->rect;
-	glReadPixels(rect->xmin+vc->ar->winrct.xmin,  rect->ymin+vc->ar->winrct.ymin, sx, sy, GL_RGBA, GL_UNSIGNED_BYTE,  ibuf->rect);
-	if (ENDIAN_ORDER==B_ENDIAN) IMB_convert_rgba_to_abgr(ibuf);
+	glReadPixels(rect->xmin + vc->ar->winrct.xmin,  rect->ymin + vc->ar->winrct.ymin, sx, sy, GL_RGBA, GL_UNSIGNED_BYTE,  ibuf->rect);
+	if (ENDIAN_ORDER == B_ENDIAN) IMB_convert_rgba_to_abgr(ibuf);
 
-	a= sx*sy;
+	a = sx * sy;
 	while (a--) {
 		if (*rt) {
-			index= WM_framebuffer_to_index(*rt);
-			if (index<=me->totvert) selar[index]= 1;
+			index = WM_framebuffer_to_index(*rt);
+			if (index <= me->totvert) selar[index] = 1;
 		}
 		rt++;
 	}
 
-	mvert= me->mvert;
+	mvert = me->mvert;
 	for (a = 1; a <= me->totvert; a++, mvert++) {
 		if (selar[a]) {
 			if ((mvert->flag & ME_HIDE) == 0) {
@@ -839,46 +839,46 @@ int do_paintvert_box_select(ViewContext *vc, rcti *rect, int select, int extend)
 
 static void do_lasso_select_paintvert(ViewContext *vc, int mcords[][2], short moves, short extend, short select)
 {
-	Object *ob= vc->obact;
-	Mesh *me= ob?ob->data:NULL;
+	Object *ob = vc->obact;
+	Mesh *me = ob ? ob->data : NULL;
 	rcti rect;
 
-	if (me==NULL || me->totvert==0)
+	if (me == NULL || me->totvert == 0)
 		return;
 
-	if (extend==0 && select)
-		paintvert_deselect_all_visible(ob, SEL_DESELECT, FALSE); /* flush selection at the end */
-	bm_vertoffs= me->totvert+1;	/* max index array */
+	if (extend == 0 && select)
+		paintvert_deselect_all_visible(ob, SEL_DESELECT, FALSE);  /* flush selection at the end */
+	bm_vertoffs = me->totvert + 1; /* max index array */
 
 	lasso_select_boundbox(&rect, mcords, moves);
-	EDBM_mask_init_backbuf_border(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
+	EDBM_backbuf_border_mask_init(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
 
-	EDBM_backbuf_checkAndSelectVerts_obmode(me, select);
+	edbm_backbuf_check_and_select_verts_obmode(me, select);
 
-	EDBM_free_backbuf();
+	EDBM_backbuf_free();
 
 	paintvert_flush_flags(ob);
 }
 static void do_lasso_select_paintface(ViewContext *vc, int mcords[][2], short moves, short extend, short select)
 {
-	Object *ob= vc->obact;
-	Mesh *me= ob?ob->data:NULL;
+	Object *ob = vc->obact;
+	Mesh *me = ob ? ob->data : NULL;
 	rcti rect;
 
-	if (me==NULL || me->totpoly==0)
+	if (me == NULL || me->totpoly == 0)
 		return;
 
-	if (extend==0 && select)
-		paintface_deselect_all_visible(ob, SEL_DESELECT, FALSE); /* flush selection at the end */
+	if (extend == 0 && select)
+		paintface_deselect_all_visible(ob, SEL_DESELECT, FALSE);  /* flush selection at the end */
 
-	bm_vertoffs= me->totpoly+1;	/* max index array */
+	bm_vertoffs = me->totpoly + 1; /* max index array */
 
 	lasso_select_boundbox(&rect, mcords, moves);
-	EDBM_mask_init_backbuf_border(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
+	EDBM_backbuf_border_mask_init(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
 	
-	EDBM_backbuf_checkAndSelectTFaces(me, select);
+	edbm_backbuf_check_and_select_tfaces(me, select);
 
-	EDBM_free_backbuf();
+	EDBM_backbuf_free();
 
 	paintface_flush_flags(ob);
 }
@@ -896,10 +896,10 @@ static void do_lasso_select_node(int mcords[][2], short moves, short select)
 	lasso_select_boundbox(&rect, mcords, moves);
 	
 	/* store selection in temp test flag */
-	for (node= snode->edittree->nodes.first; node; node= node->next) {
+	for (node = snode->edittree->nodes.first; node; node = node->next) {
 		
-		node_centf[0] = (node->totr.xmin+node->totr.xmax)/2;
-		node_centf[1] = (node->totr.ymin+node->totr.ymax)/2;
+		node_centf[0] = (node->totr.xmin + node->totr.xmax) / 2;
+		node_centf[1] = (node->totr.ymin + node->totr.ymax) / 2;
 		
 		ipoco_to_areaco_noclip(G.v2d, node_centf, node_cent);
 		if (BLI_in_rcti(&rect, node_cent[0], node_cent[1]) && lasso_inside(mcords, moves, node_cent[0], node_cent[1])) {
@@ -919,43 +919,43 @@ static void view3d_lasso_select(bContext *C, ViewContext *vc, int mcords[][2], s
 {
 	Object *ob = CTX_data_active_object(C);
 
-	if (vc->obedit==NULL) { /* Object Mode */
+	if (vc->obedit == NULL) { /* Object Mode */
 		if (paint_facesel_test(ob))
 			do_lasso_select_paintface(vc, mcords, moves, extend, select);
 		else if (paint_vertsel_test(ob))
 			do_lasso_select_paintvert(vc, mcords, moves, extend, select);
-		else if (ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))
+		else if (ob && ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))
 			;
 		else if (ob && ob->mode & OB_MODE_PARTICLE_EDIT)
 			PE_lasso_select(C, mcords, moves, extend, select);
 		else {
 			do_lasso_select_objects(vc, mcords, moves, extend, select);
-			WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, vc->scene);
+			WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, vc->scene);
 		}
 	}
 	else { /* Edit Mode */
-		switch(vc->obedit->type) {
-		case OB_MESH:
-			do_lasso_select_mesh(vc, mcords, moves, extend, select);
-			break;
-		case OB_CURVE:
-		case OB_SURF:
-			do_lasso_select_curve(vc, mcords, moves, extend, select);
-			break;
-		case OB_LATTICE:
-			do_lasso_select_lattice(vc, mcords, moves, extend, select);
-			break;
-		case OB_ARMATURE:
-			do_lasso_select_armature(vc, mcords, moves, extend, select);
-			break;
-		case OB_MBALL:
-			do_lasso_select_meta(vc, mcords, moves, extend, select);
-			break;
-		default:
-			assert(!"lasso select on incorrect object type");
+		switch (vc->obedit->type) {
+			case OB_MESH:
+				do_lasso_select_mesh(vc, mcords, moves, extend, select);
+				break;
+			case OB_CURVE:
+			case OB_SURF:
+				do_lasso_select_curve(vc, mcords, moves, extend, select);
+				break;
+			case OB_LATTICE:
+				do_lasso_select_lattice(vc, mcords, moves, extend, select);
+				break;
+			case OB_ARMATURE:
+				do_lasso_select_armature(vc, mcords, moves, extend, select);
+				break;
+			case OB_MBALL:
+				do_lasso_select_meta(vc, mcords, moves, extend, select);
+				break;
+			default:
+				assert(!"lasso select on incorrect object type");
 		}
 
-		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc->obedit->data);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc->obedit->data);
 	}
 }
 
@@ -965,29 +965,29 @@ static void view3d_lasso_select(bContext *C, ViewContext *vc, int mcords[][2], s
 static int view3d_lasso_select_exec(bContext *C, wmOperator *op)
 {
 	ViewContext vc;
-	int i= 0;
+	int i = 0;
 	int mcords[1024][2];
 
 	RNA_BEGIN(op->ptr, itemptr, "path") {
 		float loc[2];
 		
 		RNA_float_get_array(&itemptr, "loc", loc);
-		mcords[i][0]= (int)loc[0];
-		mcords[i][1]= (int)loc[1];
+		mcords[i][0] = (int)loc[0];
+		mcords[i][1] = (int)loc[1];
 		i++;
-		if (i>=1024) break;
+		if (i >= 1024) break;
 	}
 	RNA_END;
 	
-	if (i>1) {
+	if (i > 1) {
 		short extend, select;
 		view3d_operator_needs_opengl(C);
 		
 		/* setup view context for argument to callbacks */
 		view3d_set_viewcontext(C, &vc);
 		
-		extend= RNA_boolean_get(op->ptr, "extend");
-		select= !RNA_boolean_get(op->ptr, "deselect");
+		extend = RNA_boolean_get(op->ptr, "extend");
+		select = !RNA_boolean_get(op->ptr, "deselect");
 		view3d_lasso_select(C, &vc, mcords, i, extend, select);
 		
 		return OPERATOR_FINISHED;
@@ -1023,41 +1023,41 @@ void VIEW3D_OT_select_lasso(wmOperatorType *ot)
 static unsigned int samplerect(unsigned int *buf, int size, unsigned int dontdo)
 {
 	Base *base;
-	unsigned int *bufmin,*bufmax;
-	int a,b,rc,tel,len,dirvec[4][2],maxob;
-	unsigned int retval=0;
+	unsigned int *bufmin, *bufmax;
+	int a, b, rc, tel, len, dirvec[4][2], maxob;
+	unsigned int retval = 0;
 	
-	base= LASTBASE;
-	if (base==0) return 0;
-	maxob= base->selcol;
+	base = LASTBASE;
+	if (base == 0) return 0;
+	maxob = base->selcol;
 
-	len= (size-1)/2;
-	rc= 0;
+	len = (size - 1) / 2;
+	rc = 0;
 
-	dirvec[0][0]= 1;
-	dirvec[0][1]= 0;
-	dirvec[1][0]= 0;
-	dirvec[1][1]= -size;
-	dirvec[2][0]= -1;
-	dirvec[2][1]= 0;
-	dirvec[3][0]= 0;
-	dirvec[3][1]= size;
+	dirvec[0][0] = 1;
+	dirvec[0][1] = 0;
+	dirvec[1][0] = 0;
+	dirvec[1][1] = -size;
+	dirvec[2][0] = -1;
+	dirvec[2][1] = 0;
+	dirvec[3][0] = 0;
+	dirvec[3][1] = size;
 
-	bufmin= buf;
-	bufmax= buf+ size*size;
-	buf+= len*size+ len;
+	bufmin = buf;
+	bufmax = buf + size * size;
+	buf += len * size + len;
 
-	for (tel=1;tel<=size;tel++) {
+	for (tel = 1; tel <= size; tel++) {
 
-		for (a=0;a<2;a++) {
-			for (b=0;b<tel;b++) {
+		for (a = 0; a < 2; a++) {
+			for (b = 0; b < tel; b++) {
 
-				if (*buf && *buf<=maxob && *buf!=dontdo) return *buf;
-				if ( *buf==dontdo ) retval= dontdo;	/* if only color dontdo is available, still return dontdo */
+				if (*buf && *buf <= maxob && *buf != dontdo) return *buf;
+				if (*buf == dontdo) retval = dontdo;  /* if only color dontdo is available, still return dontdo */
 				
-				buf+= (dirvec[rc][0]+dirvec[rc][1]);
+				buf += (dirvec[rc][0] + dirvec[rc][1]);
 
-				if (buf<bufmin || buf>=bufmax) return retval;
+				if (buf < bufmin || buf >= bufmax) return retval;
 			}
 			rc++;
 			rc &= 3;
@@ -1072,19 +1072,19 @@ static unsigned int samplerect(unsigned int *buf, int size, unsigned int dontdo)
 
 /* The max number of menu items in an object select menu */
 typedef struct SelMenuItemF {
-	char idname[MAX_ID_NAME-2];
+	char idname[MAX_ID_NAME - 2];
 	int icon;
 } SelMenuItemF;
 
-#define SEL_MENU_SIZE	22
+#define SEL_MENU_SIZE   22
 static SelMenuItemF object_mouse_select_menu_data[SEL_MENU_SIZE];
 
 /* special (crappy) operator only for menu select */
 static EnumPropertyItem *object_select_menu_enum_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), int *free)
 {
-	EnumPropertyItem *item= NULL, item_tmp= {0};
-	int totitem= 0;
-	int i= 0;
+	EnumPropertyItem *item = NULL, item_tmp = {0};
+	int totitem = 0;
+	int i = 0;
 
 	/* don't need context but avoid docgen using this */
 	if (C == NULL || object_mouse_select_menu_data[i].idname[0] == '\0') {
@@ -1092,42 +1092,42 @@ static EnumPropertyItem *object_select_menu_enum_itemf(bContext *C, PointerRNA *
 	}
 
 	for (; i < SEL_MENU_SIZE && object_mouse_select_menu_data[i].idname[0] != '\0'; i++) {
-		item_tmp.name= object_mouse_select_menu_data[i].idname;
-		item_tmp.identifier= object_mouse_select_menu_data[i].idname;
-		item_tmp.value= i;
-		item_tmp.icon= object_mouse_select_menu_data[i].icon;
+		item_tmp.name = object_mouse_select_menu_data[i].idname;
+		item_tmp.identifier = object_mouse_select_menu_data[i].idname;
+		item_tmp.value = i;
+		item_tmp.icon = object_mouse_select_menu_data[i].icon;
 		RNA_enum_item_add(&item, &totitem, &item_tmp);
 	}
 
 	RNA_enum_item_end(&item, &totitem);
-	*free= 1;
+	*free = 1;
 
 	return item;
 }
 
 static int object_select_menu_exec(bContext *C, wmOperator *op)
 {
-	int name_index= RNA_enum_get(op->ptr, "name");
-	short extend= RNA_boolean_get(op->ptr, "extend");
+	int name_index = RNA_enum_get(op->ptr, "name");
+	short extend = RNA_boolean_get(op->ptr, "extend");
 	short changed = 0;
-	const char *name= object_mouse_select_menu_data[name_index].idname;
+	const char *name = object_mouse_select_menu_data[name_index].idname;
 
 	if (!extend) {
-		CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+		CTX_DATA_BEGIN(C, Base *, base, selectable_bases) {
 			if (base->flag & SELECT) {
 				ED_base_object_select(base, BA_DESELECT);
-				changed= 1;
+				changed = 1;
 			}
 		}
 		CTX_DATA_END;
 	}
 
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
+	CTX_DATA_BEGIN(C, Base *, base, selectable_bases) {
 		/* this is a bit dodjy, there should only be ONE object with this name, but library objects can mess this up */
-		if (strcmp(name, base->object->id.name+2)==0) {
+		if (strcmp(name, base->object->id.name + 2) == 0) {
 			ED_base_object_activate(C, base);
 			ED_base_object_select(base, BA_SELECT);
-			changed= 1;
+			changed = 1;
 		}
 	}
 	CTX_DATA_END;
@@ -1137,7 +1137,7 @@ static int object_select_menu_exec(bContext *C, wmOperator *op)
 
 	/* undo? */
 	if (changed) {
-		WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, CTX_data_scene(C));
 		return OPERATOR_FINISHED;
 	}
 	else {
@@ -1159,10 +1159,10 @@ void VIEW3D_OT_select_menu(wmOperatorType *ot)
 	ot->exec = object_select_menu_exec;
 
 	/* flags */
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* keyingset to use (dynamic enum) */
-	prop= RNA_def_enum(ot->srna, "name", DummyRNA_NULL_items, 0, "Object Name", "");
+	prop = RNA_def_enum(ot->srna, "name", DummyRNA_NULL_items, 0, "Object Name", "");
 	RNA_def_enum_funcs(prop, object_select_menu_enum_itemf);
 	RNA_def_property_flag(prop, PROP_HIDDEN);
 	ot->prop = prop;
@@ -1174,9 +1174,9 @@ static void deselectall_except(Scene *scene, Base *b)   /* deselect all except b
 {
 	Base *base;
 	
-	for (base= FIRSTBASE; base; base= base->next) {
+	for (base = FIRSTBASE; base; base = base->next) {
 		if (base->flag & SELECT) {
-			if (b!=base) {
+			if (b != base) {
 				ED_base_object_select(base, BA_DESELECT);
 			}
 		}
@@ -1187,45 +1187,45 @@ static Base *object_mouse_select_menu(bContext *C, ViewContext *vc, unsigned int
 {
 	short baseCount = 0;
 	short ok;
-	LinkNode *linklist= NULL;
+	LinkNode *linklist = NULL;
 	
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
-		ok= FALSE;
+	CTX_DATA_BEGIN(C, Base *, base, selectable_bases) {
+		ok = FALSE;
 
 		/* two selection methods, the CTRL select uses max dist of 15 */
 		if (buffer) {
 			int a;
-			for (a=0; a<hits; a++) {
+			for (a = 0; a < hits; a++) {
 				/* index was converted */
-				if (base->selcol==buffer[ (4 * a) + 3 ])
-					ok= TRUE;
+				if (base->selcol == buffer[(4 * a) + 3])
+					ok = TRUE;
 			}
 		}
 		else {
-			int temp, dist=15;
+			int temp, dist = 15;
 
 			project_short(vc->ar, base->object->obmat[3], &base->sx);
 			
-			temp= abs(base->sx -mval[0]) + abs(base->sy -mval[1]);
+			temp = abs(base->sx - mval[0]) + abs(base->sy - mval[1]);
 			if (temp < dist)
-				ok= TRUE;
+				ok = TRUE;
 		}
 
 		if (ok) {
 			baseCount++;
 			BLI_linklist_prepend(&linklist, base);
 
-			if (baseCount==SEL_MENU_SIZE)
+			if (baseCount == SEL_MENU_SIZE)
 				break;
 		}
 	}
 	CTX_DATA_END;
 
-	if (baseCount==0) {
+	if (baseCount == 0) {
 		return NULL;
 	}
 	if (baseCount == 1) {
-		Base *base= (Base *)linklist->link;
+		Base *base = (Base *)linklist->link;
 		BLI_linklist_free(linklist, NULL);
 		return base;
 	}
@@ -1236,12 +1236,12 @@ static Base *object_mouse_select_menu(bContext *C, ViewContext *vc, unsigned int
 
 		memset(object_mouse_select_menu_data, 0, sizeof(object_mouse_select_menu_data));
 
-		for (node = linklist, i = 0; node; node= node->next, i++) {
-			Base *base=node->link;
-			Object *ob= base->object;
-			char *name= ob->id.name+2;
+		for (node = linklist, i = 0; node; node = node->next, i++) {
+			Base *base = node->link;
+			Object *ob = base->object;
+			char *name = ob->id.name + 2;
 
-			BLI_strncpy(object_mouse_select_menu_data[i].idname, name, MAX_ID_NAME-2);
+			BLI_strncpy(object_mouse_select_menu_data[i].idname, name, MAX_ID_NAME - 2);
 			object_mouse_select_menu_data[i].icon = uiIconFromID(&ob->id);
 		}
 
@@ -1265,50 +1265,50 @@ static short mixed_bones_object_selectbuffer(ViewContext *vc, unsigned int *buff
 {
 	rcti rect;
 	int offs;
-	short a, hits15, hits9=0, hits5=0;
-	short has_bones15=0, has_bones9=0, has_bones5=0;
-	
-	BLI_init_rcti(&rect, mval[0]-14, mval[0]+14, mval[1]-14, mval[1]+14);
-	hits15= view3d_opengl_select(vc, buffer, MAXPICKBUF, &rect);
-	if (hits15>0) {
-		for (a=0; a<hits15; a++) if (buffer[4*a+3] & 0xFFFF0000) has_bones15= 1;
-		
-		offs= 4*hits15;
-		BLI_init_rcti(&rect, mval[0]-9, mval[0]+9, mval[1]-9, mval[1]+9);
-		hits9= view3d_opengl_select(vc, buffer+offs, MAXPICKBUF-offs, &rect);
-		if (hits9>0) {
-			for (a=0; a<hits9; a++) if (buffer[offs+4*a+3] & 0xFFFF0000) has_bones9= 1;
-			
-			offs+= 4*hits9;
-			BLI_init_rcti(&rect, mval[0]-5, mval[0]+5, mval[1]-5, mval[1]+5);
-			hits5= view3d_opengl_select(vc, buffer+offs, MAXPICKBUF-offs, &rect);
-			if (hits5>0) {
-				for (a=0; a<hits5; a++) if (buffer[offs+4*a+3] & 0xFFFF0000) has_bones5= 1;
+	short a, hits15, hits9 = 0, hits5 = 0;
+	short has_bones15 = 0, has_bones9 = 0, has_bones5 = 0;
+	
+	BLI_init_rcti(&rect, mval[0] - 14, mval[0] + 14, mval[1] - 14, mval[1] + 14);
+	hits15 = view3d_opengl_select(vc, buffer, MAXPICKBUF, &rect);
+	if (hits15 > 0) {
+		for (a = 0; a < hits15; a++) if (buffer[4 * a + 3] & 0xFFFF0000) has_bones15 = 1;
+
+		offs = 4 * hits15;
+		BLI_init_rcti(&rect, mval[0] - 9, mval[0] + 9, mval[1] - 9, mval[1] + 9);
+		hits9 = view3d_opengl_select(vc, buffer + offs, MAXPICKBUF - offs, &rect);
+		if (hits9 > 0) {
+			for (a = 0; a < hits9; a++) if (buffer[offs + 4 * a + 3] & 0xFFFF0000) has_bones9 = 1;
+
+			offs += 4 * hits9;
+			BLI_init_rcti(&rect, mval[0] - 5, mval[0] + 5, mval[1] - 5, mval[1] + 5);
+			hits5 = view3d_opengl_select(vc, buffer + offs, MAXPICKBUF - offs, &rect);
+			if (hits5 > 0) {
+				for (a = 0; a < hits5; a++) if (buffer[offs + 4 * a + 3] & 0xFFFF0000) has_bones5 = 1;
 			}
 		}
 		
 		if (has_bones5) {
-			offs= 4*hits15 + 4*hits9;
-			memcpy(buffer, buffer+offs, 4*offs);
+			offs = 4 * hits15 + 4 * hits9;
+			memcpy(buffer, buffer + offs, 4 * offs);
 			return hits5;
 		}
 		if (has_bones9) {
-			offs= 4*hits15;
-			memcpy(buffer, buffer+offs, 4*offs);
+			offs = 4 * hits15;
+			memcpy(buffer, buffer + offs, 4 * offs);
 			return hits9;
 		}
 		if (has_bones15) {
 			return hits15;
 		}
 		
-		if (hits5>0) {
-			offs= 4*hits15 + 4*hits9;
-			memcpy(buffer, buffer+offs, 4*offs);
+		if (hits5 > 0) {
+			offs = 4 * hits15 + 4 * hits9;
+			memcpy(buffer, buffer + offs, 4 * offs);
 			return hits5;
 		}
-		if (hits9>0) {
-			offs= 4*hits15;
-			memcpy(buffer, buffer+offs, 4*offs);
+		if (hits9 > 0) {
+			offs = 4 * hits15;
+			memcpy(buffer, buffer + offs, 4 * offs);
 			return hits9;
 		}
 		return hits15;
@@ -1320,90 +1320,90 @@ static short mixed_bones_object_selectbuffer(ViewContext *vc, unsigned int *buff
 /* returns basact */
 static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer, int hits, const int mval[2], Base *startbase, int has_bones)
 {
-	Scene *scene= vc->scene;
-	View3D *v3d= vc->v3d;
-	Base *base, *basact= NULL;
-	static int lastmval[2]={-100, -100};
-	int a, donearest= 0;
+	Scene *scene = vc->scene;
+	View3D *v3d = vc->v3d;
+	Base *base, *basact = NULL;
+	static int lastmval[2] = {-100, -100};
+	int a, donearest = 0;
 	
 	/* define if we use solid nearest select or not */
-	if (v3d->drawtype>OB_WIRE) {
-		donearest= 1;
-		if ( ABS(mval[0]-lastmval[0])<3 && ABS(mval[1]-lastmval[1])<3) {
-			if (!has_bones)	/* hrms, if theres bones we always do nearest */
-				donearest= 0;
+	if (v3d->drawtype > OB_WIRE) {
+		donearest = 1;
+		if (ABS(mval[0] - lastmval[0]) < 3 && ABS(mval[1] - lastmval[1]) < 3) {
+			if (!has_bones) /* hrms, if theres bones we always do nearest */
+				donearest = 0;
 		}
 	}
-	lastmval[0]= mval[0]; lastmval[1]= mval[1];
+	lastmval[0] = mval[0]; lastmval[1] = mval[1];
 	
 	if (donearest) {
-		unsigned int min= 0xFFFFFFFF;
-		int selcol= 0, notcol=0;
+		unsigned int min = 0xFFFFFFFF;
+		int selcol = 0, notcol = 0;
 		
 		
 		if (has_bones) {
 			/* we skip non-bone hits */
-			for (a=0; a<hits; a++) {
-				if ( min > buffer[4*a+1] && (buffer[4*a+3] & 0xFFFF0000) ) {
-					min= buffer[4*a+1];
-					selcol= buffer[4*a+3] & 0xFFFF;
+			for (a = 0; a < hits; a++) {
+				if (min > buffer[4 * a + 1] && (buffer[4 * a + 3] & 0xFFFF0000) ) {
+					min = buffer[4 * a + 1];
+					selcol = buffer[4 * a + 3] & 0xFFFF;
 				}
 			}
 		}
 		else {
 			/* only exclude active object when it is selected... */
-			if (BASACT && (BASACT->flag & SELECT) && hits>1) notcol= BASACT->selcol;	
+			if (BASACT && (BASACT->flag & SELECT) && hits > 1) notcol = BASACT->selcol;
 			
-			for (a=0; a<hits; a++) {
-				if ( min > buffer[4*a+1] && notcol!=(buffer[4*a+3] & 0xFFFF)) {
-					min= buffer[4*a+1];
-					selcol= buffer[4*a+3] & 0xFFFF;
+			for (a = 0; a < hits; a++) {
+				if (min > buffer[4 * a + 1] && notcol != (buffer[4 * a + 3] & 0xFFFF)) {
+					min = buffer[4 * a + 1];
+					selcol = buffer[4 * a + 3] & 0xFFFF;
 				}
 			}
 		}
 		
-		base= FIRSTBASE;
+		base = FIRSTBASE;
 		while (base) {
 			if (BASE_SELECTABLE(v3d, base)) {
-				if (base->selcol==selcol) break;
+				if (base->selcol == selcol) break;
 			}
-			base= base->next;
+			base = base->next;
 		}
-		if (base) basact= base;
+		if (base) basact = base;
 	}
 	else {
 		
-		base= startbase;
+		base = startbase;
 		while (base) {
 			/* skip objects with select restriction, to prevent prematurely ending this loop
 			 * with an un-selectable choice */
 			if (base->object->restrictflag & OB_RESTRICT_SELECT) {
-				base=base->next;
-				if (base==NULL) base= FIRSTBASE;
-				if (base==startbase) break;
+				base = base->next;
+				if (base == NULL) base = FIRSTBASE;
+				if (base == startbase) break;
 			}
 			
 			if (BASE_SELECTABLE(v3d, base)) {
-				for (a=0; a<hits; a++) {
+				for (a = 0; a < hits; a++) {
 					if (has_bones) {
 						/* skip non-bone objects */
-						if ((buffer[4*a+3] & 0xFFFF0000)) {
-							if (base->selcol== (buffer[(4*a)+3] & 0xFFFF))
-								basact= base;
+						if ((buffer[4 * a + 3] & 0xFFFF0000)) {
+							if (base->selcol == (buffer[(4 * a) + 3] & 0xFFFF))
+								basact = base;
 						}
 					}
 					else {
-						if (base->selcol== (buffer[(4*a)+3] & 0xFFFF))
-							basact= base;
+						if (base->selcol == (buffer[(4 * a) + 3] & 0xFFFF))
+							basact = base;
 					}
 				}
 			}
 			
 			if (basact) break;
 			
-			base= base->next;
-			if (base==NULL) base= FIRSTBASE;
-			if (base==startbase) break;
+			base = base->next;
+			if (base == NULL) base = FIRSTBASE;
+			if (base == startbase) break;
 		}
 	}
 	
@@ -1414,22 +1414,22 @@ static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer, int
 Base *ED_view3d_give_base_under_cursor(bContext *C, const int mval[2])
 {
 	ViewContext vc;
-	Base *basact= NULL;
-	unsigned int buffer[4*MAXPICKBUF];
+	Base *basact = NULL;
+	unsigned int buffer[4 * MAXPICKBUF];
 	int hits;
 	
 	/* setup view context for argument to callbacks */
 	view3d_operator_needs_opengl(C);
 	view3d_set_viewcontext(C, &vc);
 	
-	hits= mixed_bones_object_selectbuffer(&vc, buffer, mval);
+	hits = mixed_bones_object_selectbuffer(&vc, buffer, mval);
 	
-	if (hits>0) {
-		int a, has_bones= 0;
+	if (hits > 0) {
+		int a, has_bones = 0;
 		
-		for (a=0; a<hits; a++) if (buffer[4*a+3] & 0xFFFF0000) has_bones= 1;
+		for (a = 0; a < hits; a++) if (buffer[4 * a + 3] & 0xFFFF0000) has_bones = 1;
 		
-		basact= mouse_select_eval_buffer(&vc, buffer, hits, mval, vc.scene->base.first, has_bones);
+		basact = mouse_select_eval_buffer(&vc, buffer, hits, mval, vc.scene->base.first, has_bones);
 	}
 	
 	return basact;
@@ -1439,18 +1439,18 @@ static void deselect_all_tracks(MovieTracking *tracking)
 {
 	MovieTrackingObject *object;
 
-	object= tracking->objects.first;
+	object = tracking->objects.first;
 	while (object) {
-		ListBase *tracksbase= BKE_tracking_object_tracks(tracking, object);
-		MovieTrackingTrack *track= tracksbase->first;
+		ListBase *tracksbase = BKE_tracking_object_tracks(tracking, object);
+		MovieTrackingTrack *track = tracksbase->first;
 
 		while (track) {
 			BKE_tracking_deselect_track(track, TRACK_AREA_ALL);
 
-			track= track->next;
+			track = track->next;
 		}
 
-		object= object->next;
+		object = object->next;
 	}
 }
 
@@ -1458,11 +1458,11 @@ static void deselect_all_tracks(MovieTracking *tracking)
 static int mouse_select(bContext *C, const int mval[2], short extend, short obcenter, short enumerate)
 {
 	ViewContext vc;
-	ARegion *ar= CTX_wm_region(C);
-	View3D *v3d= CTX_wm_view3d(C);
-	Scene *scene= CTX_data_scene(C);
-	Base *base, *startbase=NULL, *basact=NULL, *oldbasact=NULL;
-	int temp, a, dist=100;
+	ARegion *ar = CTX_wm_region(C);
+	View3D *v3d = CTX_wm_view3d(C);
+	Scene *scene = CTX_data_scene(C);
+	Base *base, *startbase = NULL, *basact = NULL, *oldbasact = NULL;
+	int temp, a, dist = 100;
 	int retval = 0;
 	short hits;
 	
@@ -1470,8 +1470,8 @@ static int mouse_select(bContext *C, const int mval[2], short extend, short obce
 	view3d_set_viewcontext(C, &vc);
 	
 	/* always start list from basact in wire mode */
-	startbase=  FIRSTBASE;
-	if (BASACT && BASACT->next) startbase= BASACT->next;
+	startbase =  FIRSTBASE;
+	if (BASACT && BASACT->next) startbase = BASACT->next;
 	
 	/* This block uses the control key to make the object selected by its center point rather than its contents */
 	/* in editmode do not activate */
@@ -1479,58 +1479,58 @@ static int mouse_select(bContext *C, const int mval[2], short extend, short obce
 		
 		/* note; shift+alt goes to group-flush-selecting */
 		if (enumerate) {
-			basact= object_mouse_select_menu(C, &vc, NULL, 0, mval, extend);
+			basact = object_mouse_select_menu(C, &vc, NULL, 0, mval, extend);
 		}
 		else {
-			base= startbase;
+			base = startbase;
 			while (base) {
 				if (BASE_SELECTABLE(v3d, base)) {
 					project_short(ar, base->object->obmat[3], &base->sx);
 					
-					temp= abs(base->sx -mval[0]) + abs(base->sy -mval[1]);
-					if (base==BASACT) temp+=10;
-					if (temp<dist ) {
+					temp = abs(base->sx - mval[0]) + abs(base->sy - mval[1]);
+					if (base == BASACT) temp += 10;
+					if (temp < dist) {
 						
-						dist= temp;
-						basact= base;
+						dist = temp;
+						basact = base;
 					}
 				}
-				base= base->next;
+				base = base->next;
 				
-				if (base==NULL) base= FIRSTBASE;
-				if (base==startbase) break;
+				if (base == NULL) base = FIRSTBASE;
+				if (base == startbase) break;
 			}
 		}
 	}
 	else {
-		unsigned int buffer[4*MAXPICKBUF];
+		unsigned int buffer[4 * MAXPICKBUF];
 
 		/* if objects have posemode set, the bones are in the same selection buffer */
 		
-		hits= mixed_bones_object_selectbuffer(&vc, buffer, mval);
+		hits = mixed_bones_object_selectbuffer(&vc, buffer, mval);
 		
-		if (hits>0) {
-			int has_bones= 0;
+		if (hits > 0) {
+			int has_bones = 0;
 			
 			/* note: bundles are handling in the same way as bones */
-			for (a=0; a<hits; a++) if (buffer[4*a+3] & 0xFFFF0000) has_bones= 1;
+			for (a = 0; a < hits; a++) if (buffer[4 * a + 3] & 0xFFFF0000) has_bones = 1;
 
 			/* note; shift+alt goes to group-flush-selecting */
-			if (has_bones==0 && enumerate) {
-				basact= object_mouse_select_menu(C, &vc, buffer, hits, mval, extend);
+			if (has_bones == 0 && enumerate) {
+				basact = object_mouse_select_menu(C, &vc, buffer, hits, mval, extend);
 			}
 			else {
-				basact= mouse_select_eval_buffer(&vc, buffer, hits, mval, startbase, has_bones);
+				basact = mouse_select_eval_buffer(&vc, buffer, hits, mval, startbase, has_bones);
 			}
 			
 			if (has_bones && basact) {
-				if (basact->object->type==OB_CAMERA) {
-					if (BASACT==basact) {
+				if (basact->object->type == OB_CAMERA) {
+					if (BASACT == basact) {
 						int i, hitresult;
-						int changed= 0;
+						int changed = 0;
 
-						for (i=0; i< hits; i++) {
-							hitresult= buffer[3+(i*4)];
+						for (i = 0; i < hits; i++) {
+							hitresult = buffer[3 + (i * 4)];
 
 							/* if there's bundles in buffer select bundles first,
 							 * so non-camera elements should be ignored in buffer */
@@ -1540,36 +1540,36 @@ static int mouse_select(bContext *C, const int mval[2], short extend, short obce
 
 							/* index of bundle is 1<<16-based. if there's no "bone" index
 							 * in hight word, this buffer value belongs to camera,. not to bundle */
-							if (buffer[4*i+3] & 0xFFFF0000) {
-								MovieClip *clip= object_get_movieclip(scene, basact->object, 0);
-								MovieTracking *tracking= &clip->tracking;
+							if (buffer[4 * i + 3] & 0xFFFF0000) {
+								MovieClip *clip = object_get_movieclip(scene, basact->object, 0);
+								MovieTracking *tracking = &clip->tracking;
 								ListBase *tracksbase;
 								MovieTrackingTrack *track;
 
-								track= BKE_tracking_indexed_track(&clip->tracking, hitresult >> 16, &tracksbase);
+								track = BKE_tracking_indexed_track(&clip->tracking, hitresult >> 16, &tracksbase);
 
 								if (TRACK_SELECTED(track) && extend) {
-									changed= 0;
+									changed = 0;
 									BKE_tracking_deselect_track(track, TRACK_AREA_ALL);
 								}
 								else {
-									int oldsel= TRACK_SELECTED(track) ? 1 : 0;
+									int oldsel = TRACK_SELECTED(track) ? 1 : 0;
 									if (!extend)
 										deselect_all_tracks(tracking);
 
 									BKE_tracking_select_track(tracksbase, track, TRACK_AREA_ALL, extend);
 
-									if (oldsel!=(TRACK_SELECTED(track) ? 1 : 0))
-										changed= 1;
+									if (oldsel != (TRACK_SELECTED(track) ? 1 : 0))
+										changed = 1;
 								}
 
-								basact->flag|= SELECT;
-								basact->object->flag= basact->flag;
+								basact->flag |= SELECT;
+								basact->object->flag = basact->flag;
 
-								retval= 1;
+								retval = 1;
 
-								WM_event_add_notifier(C, NC_MOVIECLIP|ND_SELECT, track);
-								WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
+								WM_event_add_notifier(C, NC_MOVIECLIP | ND_SELECT, track);
+								WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 
 								break;
 							}
@@ -1578,31 +1578,31 @@ static int mouse_select(bContext *C, const int mval[2], short extend, short obce
 						if (!changed) {
 							/* fallback to regular object selection if no new bundles were selected,
 							 * allows to select object parented to reconstruction object */
-							basact= mouse_select_eval_buffer(&vc, buffer, hits, mval, startbase, 0);
+							basact = mouse_select_eval_buffer(&vc, buffer, hits, mval, startbase, 0);
 						}
 					}
 				}
-				else if (ED_do_pose_selectbuffer(scene, basact, buffer, hits, extend) ) {	/* then bone is found */
+				else if (ED_do_pose_selectbuffer(scene, basact, buffer, hits, extend) ) {   /* then bone is found */
 				
 					/* we make the armature selected: 
 					 * not-selected active object in posemode won't work well for tools */
-					basact->flag|= SELECT;
-					basact->object->flag= basact->flag;
+					basact->flag |= SELECT;
+					basact->object->flag = basact->flag;
 					
 					retval = 1;
-					WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, basact->object);
-					WM_event_add_notifier(C, NC_OBJECT|ND_BONE_ACTIVE, basact->object);
+					WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, basact->object);
+					WM_event_add_notifier(C, NC_OBJECT | ND_BONE_ACTIVE, basact->object);
 					
 					/* in weightpaint, we use selected bone to select vertexgroup, so no switch to new active object */
 					if (BASACT && (BASACT->object->mode & OB_MODE_WEIGHT_PAINT)) {
 						/* prevent activating */
-						basact= NULL;
+						basact = NULL;
 					}
 
 				}
 				/* prevent bone selecting to pass on to object selecting */
-				if (basact==BASACT)
-					basact= NULL;
+				if (basact == BASACT)
+					basact = NULL;
 			}
 		}
 	}
@@ -1619,7 +1619,7 @@ static int mouse_select(bContext *C, const int mval[2], short extend, short obce
 		/* also prevent making it active on mouse selection */
 		else if (BASE_SELECTABLE(v3d, basact)) {
 
-			oldbasact= BASACT;
+			oldbasact = BASACT;
 			
 			if (!extend) {
 				deselectall_except(scene, basact);
@@ -1630,7 +1630,7 @@ static int mouse_select(bContext *C, const int mval[2], short extend, short obce
 			}
 			else {
 				if (basact->flag & SELECT) {
-					if (basact==oldbasact)
+					if (basact == oldbasact)
 						ED_base_object_select(basact, BA_DESELECT);
 				}
 				else ED_base_object_select(basact, BA_SELECT);
@@ -1641,7 +1641,7 @@ static int mouse_select(bContext *C, const int mval[2], short extend, short obce
 			}
 		}
 
-		WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
+		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 	}
 
 	return retval;
@@ -1657,22 +1657,22 @@ typedef struct BoxSelectUserData {
 
 int edge_inside_circle(short centx, short centy, short rad, short x1, short y1, short x2, short y2)
 {
-	int radsq= rad*rad;
+	int radsq = rad * rad;
 	float v1[2], v2[2], v3[2];
 	
 	/* check points in circle itself */
-	if ( (x1-centx)*(x1-centx) + (y1-centy)*(y1-centy) <= radsq ) return 1;
-	if ( (x2-centx)*(x2-centx) + (y2-centy)*(y2-centy) <= radsq ) return 1;
+	if ( (x1 - centx) * (x1 - centx) + (y1 - centy) * (y1 - centy) <= radsq) return 1;
+	if ( (x2 - centx) * (x2 - centx) + (y2 - centy) * (y2 - centy) <= radsq) return 1;
 	
 	/* pointdistline */
-	v3[0]= centx;
-	v3[1]= centy;
-	v1[0]= x1;
-	v1[1]= y1;
-	v2[0]= x2;
-	v2[1]= y2;
+	v3[0] = centx;
+	v3[1] = centy;
+	v1[0] = x1;
+	v1[1] = y1;
+	v2[0] = x2;
+	v2[1] = y2;
 	
-	if ( dist_to_line_segment_v2(v3, v1, v2) < (float)rad ) return 1;
+	if (dist_to_line_segment_v2(v3, v1, v2) < (float)rad) return 1;
 	
 	return 0;
 }
@@ -1680,28 +1680,28 @@ int edge_inside_circle(short centx, short centy, short rad, short x1, short y1,
 static void do_nurbs_box_select__doSelect(void *userData, Nurb *UNUSED(nu), BPoint *bp, BezTriple *bezt, int beztindex, int x, int y)
 {
 	BoxSelectUserData *data = userData;
-	Object *obedit= data->vc->obedit;
-	Curve *cu= (Curve*)obedit->data;
+	Object *obedit = data->vc->obedit;
+	Curve *cu = (Curve *)obedit->data;
 
 	if (BLI_in_rcti(data->rect, x, y)) {
 		if (bp) {
-			bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT);
+			bp->f1 = data->select ? (bp->f1 | SELECT) : (bp->f1 & ~SELECT);
 			if (bp == cu->lastsel && !(bp->f1 & 1)) cu->lastsel = NULL;
 		}
 		else {
 			if (cu->drawflag & CU_HIDE_HANDLES) {
 				/* can only be beztindex==0 here since handles are hidden */
-				bezt->f1 = bezt->f2 = bezt->f3 = data->select?(bezt->f2|SELECT):(bezt->f2&~SELECT);
+				bezt->f1 = bezt->f2 = bezt->f3 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT);
 			}
 			else {
-				if (beztindex==0) {
-					bezt->f1 = data->select?(bezt->f1|SELECT):(bezt->f1&~SELECT);
+				if (beztindex == 0) {
+					bezt->f1 = data->select ? (bezt->f1 | SELECT) : (bezt->f1 & ~SELECT);
 				}
-				else if (beztindex==1) {
-					bezt->f2 = data->select?(bezt->f2|SELECT):(bezt->f2&~SELECT);
+				else if (beztindex == 1) {
+					bezt->f2 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT);
 				}
 				else {
-					bezt->f3 = data->select?(bezt->f3|SELECT):(bezt->f3&~SELECT);
+					bezt->f3 = data->select ? (bezt->f3 | SELECT) : (bezt->f3 & ~SELECT);
 				}
 			}
 
@@ -1731,14 +1731,14 @@ static void do_lattice_box_select__doSelect(void *userData, BPoint *bp, int x, i
 	BoxSelectUserData *data = userData;
 
 	if (BLI_in_rcti(data->rect, x, y)) {
-		bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT);
+		bp->f1 = data->select ? (bp->f1 | SELECT) : (bp->f1 & ~SELECT);
 	}
 }
 static int do_lattice_box_select(ViewContext *vc, rcti *rect, int select, int extend)
 {
 	BoxSelectUserData data;
 
-	data.vc= vc;
+	data.vc = vc;
 	data.rect = rect;
 	data.select = select;
 
@@ -1763,8 +1763,8 @@ static void do_mesh_box_select__doSelectEdge(void *userData, BMEdge *eed, int x0
 {
 	BoxSelectUserData *data = userData;
 
-	if (EDBM_check_backbuf(bm_solidoffs+index)) {
-		if (data->pass==0) {
+	if (EDBM_backbuf_check(bm_solidoffs + index)) {
+		if (data->pass == 0) {
 			if (edge_fully_inside_rect(data->rect, x0, y0, x1, y1)) {
 				BM_elem_select_set(data->vc->em->bm, eed, data->select);
 				data->done = 1;
@@ -1788,10 +1788,10 @@ static void do_mesh_box_select__doSelectFace(void *userData, BMFace *efa, int x,
 static int do_mesh_box_select(ViewContext *vc, rcti *rect, int select, int extend)
 {
 	BoxSelectUserData data;
-	ToolSettings *ts= vc->scene->toolsettings;
+	ToolSettings *ts = vc->scene->toolsettings;
 	int bbsel;
 	
-	data.vc= vc;
+	data.vc = vc;
 	data.rect = rect;
 	data.select = select;
 	data.pass = 0;
@@ -1804,23 +1804,23 @@ static int do_mesh_box_select(ViewContext *vc, rcti *rect, int select, int exten
 	ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d);
 
 	glLoadMatrixf(vc->rv3d->viewmat);
-	bbsel= EDBM_init_backbuf_border(vc, rect->xmin, rect->ymin, rect->xmax, rect->ymax);
+	bbsel = EDBM_backbuf_border_init(vc, rect->xmin, rect->ymin, rect->xmax, rect->ymax);
 
 	if (ts->selectmode & SCE_SELECT_VERTEX) {
 		if (bbsel) {
-			EDBM_backbuf_checkAndSelectVerts(vc->em, select);
+			edbm_backbuf_check_and_select_verts(vc->em, select);
 		}
 		else {
 			mesh_foreachScreenVert(vc, do_mesh_box_select__doSelectVert, &data, V3D_CLIP_TEST_RV3D_CLIPPING);
 		}
 	}
 	if (ts->selectmode & SCE_SELECT_EDGE) {
-			/* Does both bbsel and non-bbsel versions (need screen cos for both) */
+		/* Does both bbsel and non-bbsel versions (need screen cos for both) */
 
 		data.pass = 0;
 		mesh_foreachScreenEdge(vc, do_mesh_box_select__doSelectEdge, &data, V3D_CLIP_TEST_OFF);
 
-		if (data.done==0) {
+		if (data.done == 0) {
 			data.pass = 1;
 			mesh_foreachScreenEdge(vc, do_mesh_box_select__doSelectEdge, &data, V3D_CLIP_TEST_OFF);
 		}
@@ -1828,14 +1828,14 @@ static int do_mesh_box_select(ViewContext *vc, rcti *rect, int select, int exten
 	
 	if (ts->selectmode & SCE_SELECT_FACE) {
 		if (bbsel) {
-			EDBM_backbuf_checkAndSelectFaces(vc->em, select);
+			edbm_backbuf_check_and_select_faces(vc->em, select);
 		}
 		else {
 			mesh_foreachScreenFace(vc, do_mesh_box_select__doSelectFace, &data);
 		}
 	}
 	
-	EDBM_free_backbuf();
+	EDBM_backbuf_free();
 		
 	EDBM_selectmode_flush(vc->em);
 	
@@ -1844,33 +1844,33 @@ static int do_mesh_box_select(ViewContext *vc, rcti *rect, int select, int exten
 
 static int do_meta_box_select(ViewContext *vc, rcti *rect, int select, int extend)
 {
-	MetaBall *mb = (MetaBall*)vc->obedit->data;
+	MetaBall *mb = (MetaBall *)vc->obedit->data;
 	MetaElem *ml;
 	int a;
 
-	unsigned int buffer[4*MAXPICKBUF];
+	unsigned int buffer[4 * MAXPICKBUF];
 	short hits;
 
-	hits= view3d_opengl_select(vc, buffer, MAXPICKBUF, rect);
+	hits = view3d_opengl_select(vc, buffer, MAXPICKBUF, rect);
 
 	if (extend == 0 && select) {
-		for (ml= mb->editelems->first; ml; ml= ml->next) {
+		for (ml = mb->editelems->first; ml; ml = ml->next) {
 			ml->flag &= ~SELECT;
 		}
 	}
 	
-	for (ml= mb->editelems->first; ml; ml= ml->next) {
-		for (a=0; a<hits; a++) {
-			if (ml->selcol1==buffer[ (4 * a) + 3 ]) {
+	for (ml = mb->editelems->first; ml; ml = ml->next) {
+		for (a = 0; a < hits; a++) {
+			if (ml->selcol1 == buffer[(4 * a) + 3]) {
 				ml->flag |= MB_SCALE_RAD;
-				if (select)	ml->flag |= SELECT;
-				else		ml->flag &= ~SELECT;
+				if (select) ml->flag |= SELECT;
+				else ml->flag &= ~SELECT;
 				break;
 			}
-			if (ml->selcol2==buffer[ (4 * a) + 3 ]) {
+			if (ml->selcol2 == buffer[(4 * a) + 3]) {
 				ml->flag &= ~MB_SCALE_RAD;
-				if (select)	ml->flag |= SELECT;
-				else		ml->flag &= ~SELECT;
+				if (select) ml->flag |= SELECT;
+				else ml->flag &= ~SELECT;
 				break;
 			}
 		}
@@ -1881,45 +1881,45 @@ static int do_meta_box_select(ViewContext *vc, rcti *rect, int select, int exten
 
 static int do_armature_box_select(ViewContext *vc, rcti *rect, short select, short extend)
 {
-	bArmature *arm= vc->obedit->data;
+	bArmature *arm = vc->obedit->data;
 	EditBone *ebone;
 	int a;
 
-	unsigned int buffer[4*MAXPICKBUF];
+	unsigned int buffer[4 * MAXPICKBUF];
 	short hits;
 
-	hits= view3d_opengl_select(vc, buffer, MAXPICKBUF, rect);
+	hits = view3d_opengl_select(vc, buffer, MAXPICKBUF, rect);
 	
 	/* clear flag we use to detect point was affected */
-	for (ebone= arm->edbo->first; ebone; ebone= ebone->next)
+	for (ebone = arm->edbo->first; ebone; ebone = ebone->next)
 		ebone->flag &= ~BONE_DONE;
 	
-	if (extend==0 && select)
+	if (extend == 0 && select)
 		ED_armature_deselect_all_visible(vc->obedit);
 
 	/* first we only check points inside the border */
-	for (a=0; a<hits; a++) {
-		int index = buffer[(4*a)+3];
-		if (index!=-1) {
+	for (a = 0; a < hits; a++) {
+		int index = buffer[(4 * a) + 3];
+		if (index != -1) {
 			ebone = BLI_findlink(arm->edbo, index & ~(BONESEL_ANY));
-			if ((ebone->flag & BONE_UNSELECTABLE)==0) {
+			if ((ebone->flag & BONE_UNSELECTABLE) == 0) {
 				if (index & BONESEL_TIP) {
 					ebone->flag |= BONE_DONE;
-					if (select)	ebone->flag |= BONE_TIPSEL;
-					else		ebone->flag &= ~BONE_TIPSEL;
+					if (select) ebone->flag |= BONE_TIPSEL;
+					else ebone->flag &= ~BONE_TIPSEL;
 				}
 				
 				if (index & BONESEL_ROOT) {
 					ebone->flag |= BONE_DONE;
-					if (select)	ebone->flag |= BONE_ROOTSEL;
-					else		ebone->flag &= ~BONE_ROOTSEL;
+					if (select) ebone->flag |= BONE_ROOTSEL;
+					else ebone->flag &= ~BONE_ROOTSEL;
 				}
 			}
 		}
 	}
 	
 	/* now we have to flush tag from parents... */
-	for (ebone= arm->edbo->first; ebone; ebone= ebone->next) {
+	for (ebone = arm->edbo->first; ebone; ebone = ebone->next) {
 		if (ebone->parent && (ebone->flag & BONE_CONNECTED)) {
 			if (ebone->parent->flag & BONE_DONE)
 				ebone->flag |= BONE_DONE;
@@ -1927,17 +1927,17 @@ static int do_armature_box_select(ViewContext *vc, rcti *rect, short select, sho
 	}
 	
 	/* only select/deselect entire bones when no points where in the rect */
-	for (a=0; a<hits; a++) {
-		int index = buffer[(4*a)+3];
-		if (index!=-1) {
+	for (a = 0; a < hits; a++) {
+		int index = buffer[(4 * a) + 3];
+		if (index != -1) {
 			ebone = BLI_findlink(arm->edbo, index & ~(BONESEL_ANY));
 			if (index & BONESEL_BONE) {
-				if ((ebone->flag & BONE_UNSELECTABLE)==0) {
+				if ((ebone->flag & BONE_UNSELECTABLE) == 0) {
 					if (!(ebone->flag & BONE_DONE)) {
 						if (select)
-							ebone->flag |= (BONE_ROOTSEL|BONE_TIPSEL|BONE_SELECTED);
+							ebone->flag |= (BONE_ROOTSEL | BONE_TIPSEL | BONE_SELECTED);
 						else
-							ebone->flag &= ~(BONE_ROOTSEL|BONE_TIPSEL|BONE_SELECTED);
+							ebone->flag &= ~(BONE_ROOTSEL | BONE_TIPSEL | BONE_SELECTED);
 					}
 				}
 			}
@@ -1952,24 +1952,24 @@ static int do_armature_box_select(ViewContext *vc, rcti *rect, short select, sho
 static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, int select, int extend)
 {
 	Bone *bone;
-	Object *ob= vc->obact;
-	unsigned int *vbuffer=NULL; /* selection buffer	*/
-	unsigned int *col;			/* color in buffer	*/
+	Object *ob = vc->obact;
+	unsigned int *vbuffer = NULL; /* selection buffer	*/
+	unsigned int *col;          /* color in buffer	*/
 	int bone_only;
-	int bone_selected=0;
-	int totobj= MAXPICKBUF;	// XXX solve later
+	int bone_selected = 0;
+	int totobj = MAXPICKBUF; // XXX solve later
 	short hits;
 	
 	if ((ob) && (ob->mode & OB_MODE_POSE))
-		bone_only= 1;
+		bone_only = 1;
 	else
-		bone_only= 0;
+		bone_only = 0;
 	
 	if (extend == 0 && select) {
 		if (bone_only) {
 			CTX_DATA_BEGIN(C, bPoseChannel *, pchan, visible_pose_bones) {
-				if ((pchan->bone->flag & BONE_UNSELECTABLE)==0) {
-					pchan->bone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
+				if ((pchan->bone->flag & BONE_UNSELECTABLE) == 0) {
+					pchan->bone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
 				}
 			}
 			CTX_DATA_END;
@@ -1980,8 +1980,8 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, i
 	}
 
 	/* selection buffer now has bones potentially too, so we add MAXPICKBUF */
-	vbuffer = MEM_mallocN(4 * (totobj+MAXPICKBUF) * sizeof(unsigned int), "selection buffer");
-	hits= view3d_opengl_select(vc, vbuffer, 4*(totobj+MAXPICKBUF), rect);
+	vbuffer = MEM_mallocN(4 * (totobj + MAXPICKBUF) * sizeof(unsigned int), "selection buffer");
+	hits = view3d_opengl_select(vc, vbuffer, 4 * (totobj + MAXPICKBUF), rect);
 	/*
 	 * LOGIC NOTES (theeth):
 	 * The buffer and ListBase have the same relative order, which makes the selection
@@ -1994,30 +1994,30 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, i
 	 * does it incorrectly.
 	 */
 
-	if (hits>0) { /* no need to loop if there's no hit */
+	if (hits > 0) { /* no need to loop if there's no hit */
 		Base *base;
 		col = vbuffer + 3;
 		
-		for (base= vc->scene->base.first; base && hits; base= base->next) {
+		for (base = vc->scene->base.first; base && hits; base = base->next) {
 			if (BASE_SELECTABLE(vc->v3d, base)) {
-				while (base->selcol == (*col & 0xFFFF)) {	/* we got an object */
+				while (base->selcol == (*col & 0xFFFF)) {   /* we got an object */
 					
-					if (*col & 0xFFFF0000) {					/* we got a bone */
+					if (*col & 0xFFFF0000) {                    /* we got a bone */
 						bone = get_indexed_bone(base->object, *col & ~(BONESEL_ANY));
 						if (bone) {
 							if (select) {
-								if ((bone->flag & BONE_UNSELECTABLE)==0) {
+								if ((bone->flag & BONE_UNSELECTABLE) == 0) {
 									bone->flag |= BONE_SELECTED;
-									bone_selected=1;
+									bone_selected = 1;
 // XXX									select_actionchannel_by_name(base->object->action, bone->name, 1);
 								}
 							}
 							else {
-								bArmature *arm= base->object->data;
+								bArmature *arm = base->object->data;
 								bone->flag &= ~BONE_SELECTED;
 // XXX									select_actionchannel_by_name(base->object->action, bone->name, 0);
-								if (arm->act_bone==bone)
-									arm->act_bone= NULL;
+								if (arm->act_bone == bone)
+									arm->act_bone = NULL;
 								
 							}
 						}
@@ -2029,18 +2029,18 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, i
 							ED_base_object_select(base, BA_DESELECT);
 					}
 
-					col+=4;	/* next color */
+					col += 4; /* next color */
 					hits--;
-					if (hits==0) break;
+					if (hits == 0) break;
 				}
 			}
 			
 			if (bone_selected) {
-				WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, base->object);
+				WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, base->object);
 			}
 		}
 
-		WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, vc->scene);
+		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, vc->scene);
 
 	}
 	MEM_freeN(vbuffer);
@@ -2055,14 +2055,14 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
 	short extend;
 	short select;
 
-	int ret= OPERATOR_CANCELLED;
+	int ret = OPERATOR_CANCELLED;
 
 	view3d_operator_needs_opengl(C);
 
 	/* setup view context for argument to callbacks */
 	view3d_set_viewcontext(C, &vc);
 	
-	select= (RNA_int_get(op->ptr, "gesture_mode")==GESTURE_MODAL_SELECT);
+	select = (RNA_int_get(op->ptr, "gesture_mode") == GESTURE_MODAL_SELECT);
 	rect.xmin = RNA_int_get(op->ptr, "xmin");
 	rect.ymin = RNA_int_get(op->ptr, "ymin");
 	rect.xmax = RNA_int_get(op->ptr, "xmax");
@@ -2070,59 +2070,59 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
 	extend = RNA_boolean_get(op->ptr, "extend");
 
 	if (vc.obedit) {
-		switch(vc.obedit->type) {
-		case OB_MESH:
-			vc.em = BMEdit_FromObject(vc.obedit);
-			ret= do_mesh_box_select(&vc, &rect, select, extend);
+		switch (vc.obedit->type) {
+			case OB_MESH:
+				vc.em = BMEdit_FromObject(vc.obedit);
+				ret = do_mesh_box_select(&vc, &rect, select, extend);
 //			if (EM_texFaceCheck())
-			if (ret & OPERATOR_FINISHED) {
-				WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc.obedit->data);
-			}
-			break;
-		case OB_CURVE:
-		case OB_SURF:
-			ret= do_nurbs_box_select(&vc, &rect, select, extend);
-			if (ret & OPERATOR_FINISHED) {
-				WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc.obedit->data);
-			}
-			break;
-		case OB_MBALL:
-			ret= do_meta_box_select(&vc, &rect, select, extend);
-			if (ret & OPERATOR_FINISHED) {
-				WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc.obedit->data);
-			}
-			break;
-		case OB_ARMATURE:
-			ret= do_armature_box_select(&vc, &rect, select, extend);
-			if (ret & OPERATOR_FINISHED) {
-				WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, vc.obedit);
-			}
-			break;
-		case OB_LATTICE:
-			ret= do_lattice_box_select(&vc, &rect, select, extend);		
-			if (ret & OPERATOR_FINISHED) {
-				WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc.obedit->data);
-			}
-			break;			
-		default:
-			assert(!"border select on incorrect object type");
+				if (ret & OPERATOR_FINISHED) {
+					WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
+				}
+				break;
+			case OB_CURVE:
+			case OB_SURF:
+				ret = do_nurbs_box_select(&vc, &rect, select, extend);
+				if (ret & OPERATOR_FINISHED) {
+					WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
+				}
+				break;
+			case OB_MBALL:
+				ret = do_meta_box_select(&vc, &rect, select, extend);
+				if (ret & OPERATOR_FINISHED) {
+					WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
+				}
+				break;
+			case OB_ARMATURE:
+				ret = do_armature_box_select(&vc, &rect, select, extend);
+				if (ret & OPERATOR_FINISHED) {
+					WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, vc.obedit);
+				}
+				break;
+			case OB_LATTICE:
+				ret = do_lattice_box_select(&vc, &rect, select, extend);
+				if (ret & OPERATOR_FINISHED) {
+					WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
+				}
+				break;
+			default:
+				assert(!"border select on incorrect object type");
 		}
 	}
-	else {	/* no editmode, unified for bones and objects */
+	else {  /* no editmode, unified for bones and objects */
 		if (vc.obact && vc.obact->mode & OB_MODE_SCULPT) {
 			/* pass */
 		}
 		else if (vc.obact && paint_facesel_test(vc.obact)) {
-			ret= do_paintface_box_select(&vc, &rect, select, extend);
+			ret = do_paintface_box_select(&vc, &rect, select, extend);
 		}
 		else if (vc.obact && paint_vertsel_test(vc.obact)) {
-			ret= do_paintvert_box_select(&vc, &rect, select, extend);
+			ret = do_paintvert_box_select(&vc, &rect, select, extend);
 		}
 		else if (vc.obact && vc.obact->mode & OB_MODE_PARTICLE_EDIT) {
-			ret= PE_border_select(C, &rect, select, extend);
+			ret = PE_border_select(C, &rect, select, extend);
 		}
 		else { /* object mode with none active */
-			ret= do_object_pose_box_select(C, &vc, &rect, select, extend);
+			ret = do_object_pose_box_select(C, &vc, &rect, select, extend);
 		}
 	}
 
@@ -2161,7 +2161,7 @@ static int vertsel_vert_pick(struct bContext *C, Mesh *me, const int mval[2], un
 	ViewContext vc;
 	view3d_set_viewcontext(C, &vc);
 
-	if (!me || me->totvert==0)
+	if (!me || me->totvert == 0)
 		return 0;
 
 	if (size > 0) {
@@ -2169,14 +2169,14 @@ static int vertsel_vert_pick(struct bContext *C, Mesh *me, const int mval[2], un
 		 * on an face in the backbuf, we can still select a vert */
 
 		int dist;
-		*index = view3d_sample_backbuf_rect(&vc, mval, size, 1, me->totvert+1, &dist,0,NULL, NULL);
+		*index = view3d_sample_backbuf_rect(&vc, mval, size, 1, me->totvert + 1, &dist, 0, NULL, NULL);
 	}
 	else {
 		/* sample only on the exact position */
 		*index = view3d_sample_backbuf(&vc, mval[0], mval[1]);
 	}
 
-	if ((*index)<=0 || (*index)>(unsigned int)me->totvert)
+	if ((*index) <= 0 || (*index) > (unsigned int)me->totvert)
 		return 0;
 
 	(*index)--;
@@ -2188,12 +2188,12 @@ static int vertsel_vert_pick(struct bContext *C, Mesh *me, const int mval[2], un
 /* gets called via generic mouse select operator */
 static int mouse_weight_paint_vertex_select(bContext *C, const int mval[2], short extend, Object *obact)
 {
-	Mesh* me= obact->data; /* already checked for NULL */
+	Mesh*me = obact->data; /* already checked for NULL */
 	unsigned int index = 0;
 	MVert *mv;
 
 	if (vertsel_vert_pick(C, me, mval, &index, 50)) {
-		mv = me->mvert+index;
+		mv = me->mvert + index;
 		if (extend) {
 			mv->flag ^= SELECT;
 		}
@@ -2202,7 +2202,7 @@ static int mouse_weight_paint_vertex_select(bContext *C, const int mval[2], shor
 			mv->flag |= SELECT;
 		}
 		paintvert_flush_flags(obact);
-		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obact->data);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
 		return 1;
 	}
 	return 0;
@@ -2213,36 +2213,36 @@ static int mouse_weight_paint_vertex_select(bContext *C, const int mval[2], shor
 
 static int view3d_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	Object *obedit= CTX_data_edit_object(C);
-	Object *obact= CTX_data_active_object(C);
-	short extend= RNA_boolean_get(op->ptr, "extend");
-	short center= RNA_boolean_get(op->ptr, "center");
-	short enumerate= RNA_boolean_get(op->ptr, "enumerate");
-	short object= RNA_boolean_get(op->ptr, "object");
-	int	retval = 0;
+	Object *obedit = CTX_data_edit_object(C);
+	Object *obact = CTX_data_active_object(C);
+	short extend = RNA_boolean_get(op->ptr, "extend");
+	short center = RNA_boolean_get(op->ptr, "center");
+	short enumerate = RNA_boolean_get(op->ptr, "enumerate");
+	short object = RNA_boolean_get(op->ptr, "object");
+	int retval = 0;
 
 	view3d_operator_needs_opengl(C);
 
 	if (object) {
-		obedit= NULL;
-		obact= NULL;
+		obedit = NULL;
+		obact = NULL;
 
 		/* ack, this is incorrect but to do this correctly we would need an
 		 * alternative editmode/objectmode keymap, this copies the functionality
 		 * from 2.4x where Ctrl+Select in editmode does object select only */
-		center= FALSE;
+		center = FALSE;
 	}
 
-	if (obedit && object==FALSE) {
-		if (obedit->type==OB_MESH)
+	if (obedit && object == FALSE) {
+		if (obedit->type == OB_MESH)
 			retval = mouse_mesh(C, event->mval, extend);
-		else if (obedit->type==OB_ARMATURE)
+		else if (obedit->type == OB_ARMATURE)
 			retval = mouse_armature(C, event->mval, extend);
-		else if (obedit->type==OB_LATTICE)
+		else if (obedit->type == OB_LATTICE)
 			retval = mouse_lattice(C, event->mval, extend);
 		else if (ELEM(obedit->type, OB_CURVE, OB_SURF))
 			retval = mouse_nurb(C, event->mval, extend);
-		else if (obedit->type==OB_MBALL)
+		else if (obedit->type == OB_MBALL)
 			retval = mouse_mball(C, event->mval, extend);
 			
 	}
@@ -2261,9 +2261,9 @@ static int view3d_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	 * FINISHED to signal one operator worked
 	 * */
 	if (retval)
-		return OPERATOR_PASS_THROUGH|OPERATOR_FINISHED;
+		return OPERATOR_PASS_THROUGH | OPERATOR_FINISHED;
 	else
-		return OPERATOR_PASS_THROUGH; /* nothing selected, just passthrough */
+		return OPERATOR_PASS_THROUGH;  /* nothing selected, just passthrough */
 }
 
 void VIEW3D_OT_select(wmOperatorType *ot)
@@ -2301,9 +2301,9 @@ static void mesh_circle_doSelectVert(void *userData, BMVert *eve, int x, int y,
 {
 	CircleSelectUserData *data = userData;
 	int mx = x - data->mval[0], my = y - data->mval[1];
-	float r = sqrt(mx*mx + my*my);
+	float r = sqrt(mx * mx + my * my);
 
-	if (r<=data->radius) {
+	if (r <= data->radius) {
 		BM_elem_select_set(data->vc->em->bm, eve, data->select);
 	}
 }
@@ -2319,20 +2319,20 @@ static void mesh_circle_doSelectFace(void *userData, BMFace *efa, int x, int y,
 {
 	CircleSelectUserData *data = userData;
 	int mx = x - data->mval[0], my = y - data->mval[1];
-	float r = sqrt(mx*mx + my*my);
+	float r = sqrt(mx * mx + my * my);
 	
-	if (r<=data->radius) {
+	if (r <= data->radius) {
 		BM_elem_select_set(data->vc->em->bm, efa, data->select);
 	}
 }
 
 static void mesh_circle_select(ViewContext *vc, int select, const int mval[2], float rad)
 {
-	ToolSettings *ts= vc->scene->toolsettings;
+	ToolSettings *ts = vc->scene->toolsettings;
 	int bbsel;
 	CircleSelectUserData data;
 	
-	bbsel= EDBM_init_backbuf_circle(vc, mval[0], mval[1], (short)(rad+1.0));
+	bbsel = EDBM_backbuf_circle_init(vc, mval[0], mval[1], (short)(rad + 1.0));
 	ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
 
 	vc->em = BMEdit_FromObject(vc->obedit);
@@ -2345,7 +2345,7 @@ static void mesh_circle_select(ViewContext *vc, int select, const int mval[2], f
 
 	if (ts->selectmode & SCE_SELECT_VERTEX) {
 		if (bbsel) {
-			EDBM_backbuf_checkAndSelectVerts(vc->em, select==LEFTMOUSE);
+			edbm_backbuf_check_and_select_verts(vc->em, select == LEFTMOUSE);
 		}
 		else {
 			mesh_foreachScreenVert(vc, mesh_circle_doSelectVert, &data, V3D_CLIP_TEST_RV3D_CLIPPING);
@@ -2354,7 +2354,7 @@ static void mesh_circle_select(ViewContext *vc, int select, const int mval[2], f
 
 	if (ts->selectmode & SCE_SELECT_EDGE) {
 		if (bbsel) {
-			EDBM_backbuf_checkAndSelectEdges(vc->em, select==LEFTMOUSE);
+			edbm_backbuf_check_and_select_edges(vc->em, select == LEFTMOUSE);
 		}
 		else {
 			mesh_foreachScreenEdge(vc, mesh_circle_doSelectEdge, &data, V3D_CLIP_TEST_OFF);
@@ -2363,45 +2363,45 @@ static void mesh_circle_select(ViewContext *vc, int select, const int mval[2], f
 	
 	if (ts->selectmode & SCE_SELECT_FACE) {
 		if (bbsel) {
-			EDBM_backbuf_checkAndSelectFaces(vc->em, select==LEFTMOUSE);
+			edbm_backbuf_check_and_select_faces(vc->em, select == LEFTMOUSE);
 		}
 		else {
 			mesh_foreachScreenFace(vc, mesh_circle_doSelectFace, &data);
 		}
 	}
 
-	EDBM_free_backbuf();
+	EDBM_backbuf_free();
 	EDBM_selectmode_flush(vc->em);
 }
 
 static void paint_facesel_circle_select(ViewContext *vc, int select, const int mval[2], float rad)
 {
-	Object *ob= vc->obact;
-	Mesh *me = ob?ob->data:NULL;
+	Object *ob = vc->obact;
+	Mesh *me = ob ? ob->data : NULL;
 	/* int bbsel; */ /* UNUSED */
 
 	if (me) {
-		bm_vertoffs= me->totpoly+1;	/* max index array */
+		bm_vertoffs = me->totpoly + 1; /* max index array */
 
-		/* bbsel= */ /* UNUSED */ EDBM_init_backbuf_circle(vc, mval[0], mval[1], (short)(rad+1.0));
-		EDBM_backbuf_checkAndSelectTFaces(me, select==LEFTMOUSE);
-		EDBM_free_backbuf();
+		/* bbsel= */ /* UNUSED */ EDBM_backbuf_circle_init(vc, mval[0], mval[1], (short)(rad + 1.0));
+		edbm_backbuf_check_and_select_tfaces(me, select == LEFTMOUSE);
+		EDBM_backbuf_free();
 	}
 }
 
 
 static void paint_vertsel_circle_select(ViewContext *vc, int select, const int mval[2], float rad)
 {
-	Object *ob= vc->obact;
-	Mesh *me = ob?ob->data:NULL;
+	Object *ob = vc->obact;
+	Mesh *me = ob ? ob->data : NULL;
 	/* int bbsel; */ /* UNUSED */
 	/* CircleSelectUserData data = {NULL}; */ /* UNUSED */
 	if (me) {
-		bm_vertoffs= me->totvert+1;	/* max index array */
+		bm_vertoffs = me->totvert + 1; /* max index array */
 
-		/* bbsel= */ /* UNUSED */ EDBM_init_backbuf_circle(vc, mval[0], mval[1], (short)(rad+1.0f));
-		EDBM_backbuf_checkAndSelectVerts_obmode(me, select==LEFTMOUSE);
-		EDBM_free_backbuf();
+		/* bbsel= */ /* UNUSED */ EDBM_backbuf_circle_init(vc, mval[0], mval[1], (short)(rad + 1.0f));
+		edbm_backbuf_check_and_select_verts_obmode(me, select == LEFTMOUSE);
+		EDBM_backbuf_free();
 
 		paintvert_flush_flags(ob);
 	}
@@ -2412,30 +2412,30 @@ static void nurbscurve_circle_doSelect(void *userData, Nurb *UNUSED(nu), BPoint
 {
 	CircleSelectUserData *data = userData;
 	int mx = x - data->mval[0], my = y - data->mval[1];
-	float r = sqrt(mx*mx + my*my);
-	Object *obedit= data->vc->obedit;
-	Curve *cu= (Curve*)obedit->data;
+	float r = sqrt(mx * mx + my * my);
+	Object *obedit = data->vc->obedit;
+	Curve *cu = (Curve *)obedit->data;
 
-	if (r<=data->radius) {
+	if (r <= data->radius) {
 		if (bp) {
-			bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT);
+			bp->f1 = data->select ? (bp->f1 | SELECT) : (bp->f1 & ~SELECT);
 
 			if (bp == cu->lastsel && !(bp->f1 & 1)) cu->lastsel = NULL;
 		}
 		else {
 			if (cu->drawflag & CU_HIDE_HANDLES) {
 				/* can only be beztindex==0 here since handles are hidden */
-				bezt->f1 = bezt->f2 = bezt->f3 = data->select?(bezt->f2|SELECT):(bezt->f2&~SELECT);
+				bezt->f1 = bezt->f2 = bezt->f3 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT);
 			}
 			else {
-				if (beztindex==0) {
-					bezt->f1 = data->select?(bezt->f1|SELECT):(bezt->f1&~SELECT);
+				if (beztindex == 0) {
+					bezt->f1 = data->select ? (bezt->f1 | SELECT) : (bezt->f1 & ~SELECT);
 				}
-				else if (beztindex==1) {
-					bezt->f2 = data->select?(bezt->f2|SELECT):(bezt->f2&~SELECT);
+				else if (beztindex == 1) {
+					bezt->f2 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT);
 				}
 				else {
-					bezt->f3 = data->select?(bezt->f3|SELECT):(bezt->f3&~SELECT);
+					bezt->f3 = data->select ? (bezt->f3 | SELECT) : (bezt->f3 & ~SELECT);
 				}
 			}
 
@@ -2464,10 +2464,10 @@ static void latticecurve_circle_doSelect(void *userData, BPoint *bp, int x, int
 {
 	CircleSelectUserData *data = userData;
 	int mx = x - data->mval[0], my = y - data->mval[1];
-	float r = sqrt(mx*mx + my*my);
+	float r = sqrt(mx * mx + my * my);
 
-	if (r<=data->radius) {
-		bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT);
+	if (r <= data->radius) {
+		bp->f1 = data->select ? (bp->f1 | SELECT) : (bp->f1 & ~SELECT);
 	}
 }
 static void lattice_circle_select(ViewContext *vc, int select, const int mval[2], float rad)
@@ -2491,7 +2491,7 @@ static short pchan_circle_doSelectJoint(void *userData, bPoseChannel *pchan, int
 {
 	CircleSelectUserData *data = userData;
 	int mx = x - data->mval[0], my = y - data->mval[1];
-	float r = sqrt(mx*mx + my*my);
+	float r = sqrt(mx * mx + my * my);
 	
 	if (r <= data->radius) {
 		if (data->select)
@@ -2508,7 +2508,7 @@ static void pose_circle_select(ViewContext *vc, int select, const int mval[2], f
 	bArmature *arm = vc->obact->data;
 	bPose *pose = vc->obact->pose;
 	bPoseChannel *pchan;
-	int change= FALSE;
+	int change = FALSE;
 	
 	/* set vc->edit data */
 	data.select = select;
@@ -2521,7 +2521,7 @@ static void pose_circle_select(ViewContext *vc, int select, const int mval[2], f
 	/* check each PoseChannel... */
 	// TODO: could be optimized at some point
 	for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
-		short sco1[2], sco2[2], didpoint=0;
+		short sco1[2], sco2[2], didpoint = 0;
 		float vec[3];
 		
 		/* skip invisible bones */
@@ -2540,15 +2540,15 @@ static void pose_circle_select(ViewContext *vc, int select, const int mval[2], f
 		 *	- the call to check also does the selection already
 		 */
 		if (pchan_circle_doSelectJoint(&data, pchan, sco1[0], sco1[1]))
-			didpoint= 1;
+			didpoint = 1;
 		if (pchan_circle_doSelectJoint(&data, pchan, sco2[0], sco2[1]))
-			didpoint= 1;
+			didpoint = 1;
 		
 		change |= didpoint;
 	}
 
 	if (change) {
-		WM_main_add_notifier(NC_OBJECT|ND_BONE_SELECT, vc->obact);
+		WM_main_add_notifier(NC_OBJECT | ND_BONE_SELECT, vc->obact);
 	}
 }
 
@@ -2556,7 +2556,7 @@ static short armature_circle_doSelectJoint(void *userData, EditBone *ebone, int
 {
 	CircleSelectUserData *data = userData;
 	int mx = x - data->mval[0], my = y - data->mval[1];
-	float r = sqrt(mx*mx + my*my);
+	float r = sqrt(mx * mx + my * my);
 	
 	if (r <= data->radius) {
 		if (head) {
@@ -2578,9 +2578,9 @@ static short armature_circle_doSelectJoint(void *userData, EditBone *ebone, int
 static void armature_circle_select(ViewContext *vc, int select, const int mval[2], float rad)
 {
 	CircleSelectUserData data;
-	bArmature *arm= vc->obedit->data;
+	bArmature *arm = vc->obedit->data;
 	EditBone *ebone;
-	int change= FALSE;
+	int change = FALSE;
 	
 	/* set vc->edit data */
 	data.select = select;
@@ -2592,8 +2592,8 @@ static void armature_circle_select(ViewContext *vc, int select, const int mval[2
 	
 	/* check each EditBone... */
 	// TODO: could be optimized at some point
-	for (ebone= arm->edbo->first; ebone; ebone=ebone->next) {
-		short sco1[2], sco2[2], didpoint=0;
+	for (ebone = arm->edbo->first; ebone; ebone = ebone->next) {
+		short sco1[2], sco2[2], didpoint = 0;
 		float vec[3];
 		
 		/* project head location to screenspace */
@@ -2608,18 +2608,18 @@ static void armature_circle_select(ViewContext *vc, int select, const int mval[2
 		 *	- the call to check also does the selection already
 		 */
 		if (armature_circle_doSelectJoint(&data, ebone, sco1[0], sco1[1], 1))
-			didpoint= 1;
+			didpoint = 1;
 		if (armature_circle_doSelectJoint(&data, ebone, sco2[0], sco2[1], 0))
-			didpoint= 1;
+			didpoint = 1;
 			
 		/* only if the endpoints didn't get selected, deal with the middle of the bone too */
 		// XXX should we just do this always?
-		if ( (didpoint==0) && edge_inside_circle(mval[0], mval[1], rad, sco1[0], sco1[1], sco2[0], sco2[1]) ) {
+		if ( (didpoint == 0) && edge_inside_circle(mval[0], mval[1], rad, sco1[0], sco1[1], sco2[0], sco2[1]) ) {
 			if (select) 
-				ebone->flag |= BONE_TIPSEL|BONE_ROOTSEL|BONE_SELECTED;
+				ebone->flag |= BONE_TIPSEL | BONE_ROOTSEL | BONE_SELECTED;
 			else 
-				ebone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
-			change= TRUE;
+				ebone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
+			change = TRUE;
 		}
 		
 		change |= didpoint;
@@ -2628,7 +2628,7 @@ static void armature_circle_select(ViewContext *vc, int select, const int mval[2
 	if (change) {
 		ED_armature_sync_selection(arm->edbo);
 		ED_armature_validate_active(arm);
-		WM_main_add_notifier(NC_OBJECT|ND_BONE_SELECT, vc->obedit);
+		WM_main_add_notifier(NC_OBJECT | ND_BONE_SELECT, vc->obedit);
 	}
 }
 
@@ -2636,43 +2636,43 @@ static void armature_circle_select(ViewContext *vc, int select, const int mval[2
 
 static void obedit_circle_select(ViewContext *vc, short select, const int mval[2], float rad)
 {
-	switch(vc->obedit->type) {		
-	case OB_MESH:
-		mesh_circle_select(vc, select, mval, rad);
-		break;
-	case OB_CURVE:
-	case OB_SURF:
-		nurbscurve_circle_select(vc, select, mval, rad);
-		break;
-	case OB_LATTICE:
-		lattice_circle_select(vc, select, mval, rad);
-		break;
-	case OB_ARMATURE:
-		armature_circle_select(vc, select, mval, rad);
-		break;
-	default:
-		return;
+	switch (vc->obedit->type) {
+		case OB_MESH:
+			mesh_circle_select(vc, select, mval, rad);
+			break;
+		case OB_CURVE:
+		case OB_SURF:
+			nurbscurve_circle_select(vc, select, mval, rad);
+			break;
+		case OB_LATTICE:
+			lattice_circle_select(vc, select, mval, rad);
+			break;
+		case OB_ARMATURE:
+			armature_circle_select(vc, select, mval, rad);
+			break;
+		default:
+			return;
 	}
 }
 
 /* not a real operator, only for circle test */
 static int view3d_circle_select_exec(bContext *C, wmOperator *op)
 {
-	ScrArea *sa= CTX_wm_area(C);
-	ARegion *ar= CTX_wm_region(C);
-	Scene *scene= CTX_data_scene(C);
-	Object *obact= CTX_data_active_object(C);
-	View3D *v3d= sa->spacedata.first;
-	int x= RNA_int_get(op->ptr, "x");
-	int y= RNA_int_get(op->ptr, "y");
-	int radius= RNA_int_get(op->ptr, "radius");
-	int gesture_mode= RNA_int_get(op->ptr, "gesture_mode");
+	ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = CTX_wm_region(C);
+	Scene *scene = CTX_data_scene(C);
+	Object *obact = CTX_data_active_object(C);
+	View3D *v3d = sa->spacedata.first;
+	int x = RNA_int_get(op->ptr, "x");
+	int y = RNA_int_get(op->ptr, "y");
+	int radius = RNA_int_get(op->ptr, "radius");
+	int gesture_mode = RNA_int_get(op->ptr, "gesture_mode");
 	int select;
 	
-	select= (gesture_mode==GESTURE_MODAL_SELECT);
+	select = (gesture_mode == GESTURE_MODAL_SELECT);
 
-	if ( CTX_data_edit_object(C) || paint_facesel_test(obact) || paint_vertsel_test(obact) ||
-		(obact && (obact->mode & (OB_MODE_PARTICLE_EDIT|OB_MODE_POSE))) )
+	if (CTX_data_edit_object(C) || paint_facesel_test(obact) || paint_vertsel_test(obact) ||
+	    (obact && (obact->mode & (OB_MODE_PARTICLE_EDIT | OB_MODE_POSE))) )
 	{
 		ViewContext vc;
 		int mval[2];
@@ -2680,20 +2680,20 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
 		view3d_operator_needs_opengl(C);
 		
 		view3d_set_viewcontext(C, &vc);
-		mval[0]= x;
-		mval[1]= y;
+		mval[0] = x;
+		mval[1] = y;
 
 		if (CTX_data_edit_object(C)) {
 			obedit_circle_select(&vc, select, mval, (float)radius);
-			WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obact->data);
+			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
 		}
 		else if (paint_facesel_test(obact)) {
 			paint_facesel_circle_select(&vc, select, mval, (float)radius);
-			WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obact->data);
+			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
 		}
 		else if (paint_vertsel_test(obact)) {
 			paint_vertsel_circle_select(&vc, select, mval, (float)radius);
-			WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obact->data);
+			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
 		}
 		else if (obact->mode & OB_MODE_POSE)
 			pose_circle_select(&vc, select, mval, (float)radius);
@@ -2705,20 +2705,20 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
 	}
 	else {
 		Base *base;
-		select= select?BA_SELECT:BA_DESELECT;
-		for (base= FIRSTBASE; base; base= base->next) {
+		select = select ? BA_SELECT : BA_DESELECT;
+		for (base = FIRSTBASE; base; base = base->next) {
 			if (BASE_SELECTABLE(v3d, base)) {
 				project_short(ar, base->object->obmat[3], &base->sx);
-				if (base->sx!=IS_CLIPPED) {
-					int dx= base->sx-x;
-					int dy= base->sy-y;
-					if ( dx*dx + dy*dy < radius*radius)
+				if (base->sx != IS_CLIPPED) {
+					int dx = base->sx - x;
+					int dy = base->sy - y;
+					if (dx * dx + dy * dy < radius * radius)
 						ED_base_object_select(base, select);
 				}
 			}
 		}
 		
-		WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, CTX_data_scene(C));
 	}
 	
 	return OPERATOR_FINISHED;