merge with trunk at r31523
[blender.git] / source / blender / editors / space_view3d / view3d_select.c
index 42954e09060ac307ddc9027274ff5ba125dba2b8..776048c8f74d39e6715f67d57de71eac30d4c429 100644 (file)
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Original Code is Copyright (C) 2008 Blender Foundation.
  * All rights reserved.
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_arithb.h"
+#include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
 #include "BLI_rand.h"
+#include "BLI_linklist.h"
 
-#include "BKE_action.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
-#include "BKE_object.h"
-#include "BKE_global.h"
 #include "BKE_paint.h"
-#include "BKE_scene.h"
-#include "BKE_screen.h"
-#include "BKE_utildefines.h"
+#include "BKE_tessmesh.h"
 
 #include "RE_pipeline.h"       // make_stars
 
 #include "ED_particle.h"
 #include "ED_mesh.h"
 #include "ED_object.h"
-#include "ED_retopo.h"
 #include "ED_screen.h"
 #include "ED_types.h"
 #include "ED_util.h"
+#include "ED_retopo.h"
 #include "ED_mball.h"
 
 #include "UI_interface.h"
 
 #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= vc->ar->regiondata;
+       vc->rv3d= CTX_wm_region_view3d(C);
        vc->obact= CTX_data_active_object(C);
        vc->obedit= CTX_data_edit_object(C); 
 }
@@ -119,88 +114,97 @@ void view3d_get_view_aligned_coordinate(ViewContext *vc, float *fp, short mval[2
        
        if(mval[0]!=IS_CLIPPED) {
                window_to_3d_delta(vc->ar, dvec, mval[0]-mx, mval[1]-my);
-               VecSubf(fp, fp, dvec);
+               sub_v3_v3v3(fp, fp, dvec);
        }
 }
 
-void view3d_get_transformation(ViewContext *vc, Object *ob, bglMats *mats)
+/*
+ * ob == NULL if you want global matrices
+ * */
+void view3d_get_transformation(ARegion *ar, RegionView3D *rv3d, Object *ob, bglMats *mats)
 {
        float cpy[4][4];
        int i, j;
 
-       Mat4MulMat4(cpy, ob->obmat, vc->rv3d->viewmat);
+       if (ob) {
+               mul_m4_m4m4(cpy, ob->obmat, rv3d->viewmat);
+       } else {
+               copy_m4_m4(cpy, rv3d->viewmat);
+       }
 
        for(i = 0; i < 4; ++i) {
                for(j = 0; j < 4; ++j) {
-                       mats->projection[i*4+j] = vc->rv3d->winmat[i][j];
+                       mats->projection[i*4+j] = rv3d->winmat[i][j];
                        mats->modelview[i*4+j] = cpy[i][j];
                }
        }
 
-       mats->viewport[0] = vc->ar->winrct.xmin;
-       mats->viewport[1] = vc->ar->winrct.ymin;
-       mats->viewport[2] = vc->ar->winx;
-       mats->viewport[3] = vc->ar->winy;       
+       mats->viewport[0] = ar->winrct.xmin;
+       mats->viewport[1] = ar->winrct.ymin;
+       mats->viewport[2] = ar->winx;
+       mats->viewport[3] = ar->winy;   
 }
 
 /* ********************** view3d_select: selection manipulations ********************* */
 
-/* XXX to solve *************** */
-static void BIF_undo_push() {}
-/* XXX end ********************* */
-
 /* local prototypes */
 
-void EM_backbuf_checkAndSelectVerts(EditMesh *em, int select)
+void EDBM_backbuf_checkAndSelectVerts(BMEditMesh *em, int select)
 {
-       EditVert *eve;
-       int index= em_wireoffs;
-
-       for(eve= em->verts.first; eve; eve= eve->next, index++) {
-               if(eve->h==0) {
-                       if(EM_check_backbuf(index)) {
-                               eve->f = select?(eve->f|1):(eve->f&~1);
+       BMVert *eve;
+       BMIter iter;
+       int index= bm_wireoffs;
+
+       eve = BMIter_New(&iter, em->bm, BM_VERTS_OF_MESH, NULL);
+       for ( ; eve; eve=BMIter_Step(&iter), index++) {
+               if(!BM_TestHFlag(eve, BM_HIDDEN)) {
+                       if(EDBM_check_backbuf(index)) {
+                               BM_Select_Vert(em->bm, eve, select);
                        }
                }
        }
 }
 
-void EM_backbuf_checkAndSelectEdges(EditMesh *em, int select)
+void EDBM_backbuf_checkAndSelectEdges(BMEditMesh *em, int select)
 {
-       EditEdge *eed;
-       int index= em_solidoffs;
-
-       for(eed= em->edges.first; eed; eed= eed->next, index++) {
-               if(eed->h==0) {
-                       if(EM_check_backbuf(index)) {
-                               EM_select_edge(eed, select);
+       BMEdge *eed;
+       BMIter iter;
+       int index= bm_solidoffs;
+
+       eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL);
+       for ( ; eed; eed=BMIter_Step(&iter), index++) {
+               if(!BM_TestHFlag(eed, BM_HIDDEN)) {
+                       if(EDBM_check_backbuf(index)) {
+                               BM_Select_Edge(em->bm, eed, select);
                        }
                }
        }
 }
 
-void EM_backbuf_checkAndSelectFaces(EditMesh *em, int select)
+void EDBM_backbuf_checkAndSelectFaces(BMEditMesh *em, int select)
 {
-       EditFace *efa;
+       BMFace *efa;
+       BMIter iter;
        int index= 1;
 
-       for(efa= em->faces.first; efa; efa= efa->next, index++) {
-               if(efa->h==0) {
-                       if(EM_check_backbuf(index)) {
-                               EM_select_face_fgon(em, efa, select);
+       efa = BMIter_New(&iter, em->bm, BM_FACES_OF_MESH, NULL);
+       for ( ; efa; efa=BMIter_Step(&iter), index++) {
+               if(!BM_TestHFlag(efa, BM_HIDDEN)) {
+                       if(EDBM_check_backbuf(index)) {
+                               BM_Select_Face(em->bm, efa, select);
                        }
                }
        }
 }
 
-void EM_backbuf_checkAndSelectTFaces(Mesh *me, int select)
+void EDBM_backbuf_checkAndSelectTFaces(Mesh *me, int select)
 {
        MFace *mface = me->mface;
        int a;
 
        if (mface) {
                for(a=1; a<=me->totface; a++, mface++) {
-                       if(EM_check_backbuf(a)) {
+                       if(EDBM_check_backbuf(a)) {
                                mface->flag = select?(mface->flag|ME_FACE_SEL):(mface->flag&~ME_FACE_SEL);
                        }
                }
@@ -329,9 +333,9 @@ int lasso_inside_edge(short mcords[][2], short moves, int x0, int y0, int x1, in
        
        /* no points in lasso, so we have to intersect with lasso edge */
        
-       if( IsectLL2Ds(mcords[0], mcords[moves-1], v1, v2) > 0) return 1;
+       if( isect_line_line_v2_short(mcords[0], mcords[moves-1], v1, v2) > 0) return 1;
        for(a=0; a<moves-1; a++) {
-               if( IsectLL2Ds(mcords[a], mcords[a+1], v1, v2) > 0) return 1;
+               if( isect_line_line_v2_short(mcords[a], mcords[a+1], v1, v2) > 0) return 1;
        }
        
        return 0;
@@ -341,9 +345,8 @@ int lasso_inside_edge(short mcords[][2], short moves, int x0, int y0, int x1, in
 /* warning; lasso select with backbuffer-check draws in backbuf with persp(PERSP_WIN) 
    and returns with persp(PERSP_VIEW). After lasso select backbuf is not OK
 */
-static void do_lasso_select_pose(ViewContext *vc, short mcords[][2], short moves, short select)
+static void do_lasso_select_pose(ViewContext *vc, Object *ob, short mcords[][2], short moves, short select)
 {
-       Object *ob= vc->obact;
        bPoseChannel *pchan;
        float vec[3];
        short sco1[2], sco2[2];
@@ -351,16 +354,21 @@ static void do_lasso_select_pose(ViewContext *vc, short mcords[][2], short moves
        if(ob->type!=OB_ARMATURE || ob->pose==NULL) return;
        
        for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
-               VECCOPY(vec, pchan->pose_head);
-               Mat4MulVecfl(ob->obmat, vec);
+               mul_v3_m4v3(vec, ob->obmat, pchan->pose_head);
                project_short(vc->ar, vec, sco1);
-               VECCOPY(vec, pchan->pose_tail);
-               Mat4MulVecfl(ob->obmat, vec);
+               mul_v3_m4v3(vec, ob->obmat, pchan->pose_tail);
                project_short(vc->ar, vec, sco2);
                
                if(lasso_inside_edge(mcords, moves, sco1[0], sco1[1], sco2[0], sco2[1])) {
                        if(select) pchan->bone->flag |= BONE_SELECTED;
-                       else pchan->bone->flag &= ~(BONE_ACTIVE|BONE_SELECTED);
+                       else pchan->bone->flag &= ~BONE_SELECTED;
+               }
+       }
+       
+       {
+               bArmature *arm= ob->data;
+               if(arm->act_bone && (arm->act_bone->flag & BONE_SELECTED)==0) {
+                       arm->act_bone= NULL;
                }
        }
 }
@@ -371,7 +379,7 @@ static void do_lasso_select_objects(ViewContext *vc, short mcords[][2], short mo
        Base *base;
        
        for(base= vc->scene->base.first; base; base= base->next) {
-               if(base->lay & vc->v3d->lay) {
+               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)) {
                                
@@ -380,7 +388,7 @@ static void do_lasso_select_objects(ViewContext *vc, short mcords[][2], short mo
                                base->object->flag= base->flag;
                        }
                        if(base->object->mode & OB_MODE_POSE) {
-                               do_lasso_select_pose(vc, mcords, moves, select);
+                               do_lasso_select_pose(vc, base->object, mcords, moves, select);
                        }
                }
        }
@@ -401,53 +409,52 @@ void lasso_select_boundbox(rcti *rect, short mcords[][2], short moves)
        }
 }
 
-static void do_lasso_select_mesh__doSelectVert(void *userData, EditVert *eve, int x, int y, int index)
+static void do_lasso_select_mesh__doSelectVert(void *userData, BMVert *eve, int x, int y, int index)
 {
        struct { ViewContext vc; rcti *rect; short (*mcords)[2], moves, select, pass, done; } *data = userData;
 
        if (BLI_in_rcti(data->rect, x, y) && lasso_inside(data->mcords, data->moves, x, y)) {
-               eve->f = data->select?(eve->f|1):(eve->f&~1);
+               BM_Select_Vert(data->vc.em->bm, eve, data->select);
        }
 }
-static void do_lasso_select_mesh__doSelectEdge(void *userData, EditEdge *eed, int x0, int y0, int x1, int y1, int index)
+static void do_lasso_select_mesh__doSelectEdge(void *userData, BMEdge *eed, int x0, int y0, int x1, int y1, int index)
 {
        struct { ViewContext vc; rcti *rect; short (*mcords)[2], moves, select, pass, done; } *data = userData;
 
-       if (EM_check_backbuf(em_solidoffs+index)) {
+       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)) {
-                               EM_select_edge(eed, data->select);
+                               BM_Select_Edge(data->vc.em->bm, eed, data->select);
                                data->done = 1;
                        }
                } else {
                        if (lasso_inside_edge(data->mcords, data->moves, x0, y0, x1, y1)) {
-                               EM_select_edge(eed, data->select);
+                               BM_Select_Edge(data->vc.em->bm, eed, data->select);
                        }
                }
        }
 }
-static void do_lasso_select_mesh__doSelectFace(void *userData, EditFace *efa, int x, int y, int index)
+static void do_lasso_select_mesh__doSelectFace(void *userData, BMFace *efa, int x, int y, int index)
 {
        struct { ViewContext vc; rcti *rect; short (*mcords)[2], moves, select, pass, done; } *data = userData;
 
        if (BLI_in_rcti(data->rect, x, y) && lasso_inside(data->mcords, data->moves, x, y)) {
-               EM_select_face_fgon(data->vc.em, efa, data->select);
+               BM_Select_Face(data->vc.em->bm, efa, data->select);
        }
 }
 
 static void do_lasso_select_mesh(ViewContext *vc, short mcords[][2], short moves, short select)
 {
        struct { ViewContext vc; rcti *rect; short (*mcords)[2], moves, select, pass, done; } data;
-       ToolSettings *ts= vc->scene->toolsettings;
        rcti rect;
        int bbsel;
        
        lasso_select_boundbox(&rect, mcords, moves);
        
        /* set editmesh */
-       vc->em= ((Mesh *)vc->obedit->data)->edit_mesh;
+       vc->em= ((Mesh *)vc->obedit->data)->edit_btmesh;
 
        data.vc= *vc;
        data.rect = &rect;
@@ -457,17 +464,26 @@ static void do_lasso_select_mesh(ViewContext *vc, short mcords[][2], short moves
        data.done = 0;
        data.pass = 0;
 
-       bbsel= EM_mask_init_backbuf_border(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
+       /* workaround: init mats first, EDBM_mask_init_backbuf_border can change
+          view matrix to pixel space, breaking edge select with backbuf. fixes bug #20936 */
+
+       /* [#21018] breaks zbuf select. run below. only if bbsel fails */
+       /* 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);
        
-       if(ts->selectmode & SCE_SELECT_VERTEX) {
+       if(vc->scene->toolsettings->selectmode & SCE_SELECT_VERTEX) {
                if (bbsel) {
-                       EM_backbuf_checkAndSelectVerts(vc->em, select);
+                       EDBM_backbuf_checkAndSelectVerts(vc->em, select);
                } else {
+                       ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
                        mesh_foreachScreenVert(vc, do_lasso_select_mesh__doSelectVert, &data, 1);
                }
        }
-       if(ts->selectmode & SCE_SELECT_EDGE) {
+       if(vc->scene->toolsettings->selectmode & SCE_SELECT_EDGE) {
                        /* Does both bbsel and non-bbsel versions (need screen cos for both) */
+               ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
 
                data.pass = 0;
                mesh_foreachScreenEdge(vc, do_lasso_select_mesh__doSelectEdge, &data, 0);
@@ -478,16 +494,17 @@ static void do_lasso_select_mesh(ViewContext *vc, short mcords[][2], short moves
                }
        }
        
-       if(ts->selectmode & SCE_SELECT_FACE) {
+       if(vc->scene->toolsettings->selectmode & SCE_SELECT_FACE) {
                if (bbsel) {
-                       EM_backbuf_checkAndSelectFaces(vc->em, select);
+                       EDBM_backbuf_checkAndSelectFaces(vc->em, select);
                } else {
+                       ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
                        mesh_foreachScreenFace(vc, do_lasso_select_mesh__doSelectFace, &data);
                }
        }
        
-       EM_free_backbuf();
-       EM_selectmode_flush(vc->em);    
+       EDBM_free_backbuf();
+       EDBM_selectmode_flush(vc->em);  
 }
 
 #if 0
@@ -549,13 +566,15 @@ static void do_lasso_select_mesh_uv(short mcords[][2], short moves, short select
 
 static void do_lasso_select_curve__doSelect(void *userData, Nurb *nu, BPoint *bp, BezTriple *bezt, int beztindex, int x, int y)
 {
-       struct { short (*mcords)[2]; short moves; short select; } *data = userData;
-
+       struct { ViewContext vc; short (*mcords)[2]; short moves; short select; } *data = userData;
+       
        if (lasso_inside(data->mcords, data->moves, x, y)) {
                if (bp) {
                        bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT);
                } else {
-                       if (G.f & G_HIDDENHANDLES) {
+                       Curve *cu= data->vc.obedit->data;
+                       
+                       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);
                        } else {
@@ -573,13 +592,15 @@ static void do_lasso_select_curve__doSelect(void *userData, Nurb *nu, BPoint *bp
 
 static void do_lasso_select_curve(ViewContext *vc, short mcords[][2], short moves, short select)
 {
-       struct { short (*mcords)[2]; short moves; short select; } data;
+       struct { ViewContext vc; short (*mcords)[2]; short moves; short select; } data;
 
        /* set vc->editnurb */
+       data.vc = *vc;
        data.mcords = mcords;
        data.moves = moves;
        data.select = select;
 
+       ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
        nurbs_foreachScreenVert(vc, do_lasso_select_curve__doSelect, &data);
 }
 
@@ -600,6 +621,7 @@ static void do_lasso_select_lattice(ViewContext *vc, short mcords[][2], short mo
        data.moves = moves;
        data.select = select;
 
+       ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
        lattice_foreachScreenVert(vc, do_lasso_select_lattice__doSelect, &data);
 }
 
@@ -614,11 +636,9 @@ static void do_lasso_select_armature(ViewContext *vc, short mcords[][2], short m
        
        for (ebone= arm->edbo->first; ebone; ebone=ebone->next) {
 
-               VECCOPY(vec, ebone->head);
-               Mat4MulVecfl(vc->obedit->obmat, vec);
+               mul_v3_m4v3(vec, vc->obedit->obmat, ebone->head);
                project_short(vc->ar, vec, sco1);
-               VECCOPY(vec, ebone->tail);
-               Mat4MulVecfl(vc->obedit->obmat, vec);
+               mul_v3_m4v3(vec, vc->obedit->obmat, ebone->tail);
                project_short(vc->ar, vec, sco2);
                
                didpoint= 0;
@@ -635,9 +655,11 @@ static void do_lasso_select_armature(ViewContext *vc, short mcords[][2], short m
                /* 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_ACTIVE|BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
+                       else ebone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
                }
        }
+       ED_armature_sync_selection(arm->edbo);
+       ED_armature_validate_active(arm);
 }
 
 static void do_lasso_select_facemode(ViewContext *vc, short mcords[][2], short moves, short select)
@@ -649,14 +671,14 @@ static void do_lasso_select_facemode(ViewContext *vc, short mcords[][2], short m
        if(me==NULL || me->mtface==NULL) return;
        if(me->totface==0) return;
        
-       em_vertoffs= me->totface+1;     /* max index array */
+       bm_vertoffs= me->totface+1;     /* max index array */
        
        lasso_select_boundbox(&rect, mcords, moves);
-       EM_mask_init_backbuf_border(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
+       EDBM_mask_init_backbuf_border(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
        
-       EM_backbuf_checkAndSelectTFaces(me, select);
+       EDBM_backbuf_checkAndSelectTFaces(me, select);
        
-       EM_free_backbuf();
+       EDBM_free_backbuf();
        
 // XXX object_tface_flags_changed(ob, 0);
 }
@@ -696,7 +718,7 @@ void view3d_lasso_select(bContext *C, ViewContext *vc, short mcords[][2], short
 {
        Object *ob = CTX_data_active_object(C);
 
-       if(vc->obedit==NULL) {
+       if(vc->obedit==NULL) { /* Object Mode */
                if(paint_facesel_test(ob))
                        do_lasso_select_facemode(vc, mcords, moves, select);
                else if(ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))
@@ -706,19 +728,26 @@ void view3d_lasso_select(bContext *C, ViewContext *vc, short mcords[][2], short
                else  
                        do_lasso_select_objects(vc, mcords, moves, select);
        }
-       else if(vc->obedit->type==OB_MESH) {
+       else { /* Edit Mode */
+               if(vc->obedit->type==OB_MESH)
                do_lasso_select_mesh(vc, mcords, moves, select);
-       } else if(vc->obedit->type==OB_CURVE || vc->obedit->type==OB_SURF) 
+               else if(vc->obedit->type==OB_CURVE || vc->obedit->type==OB_SURF) 
                do_lasso_select_curve(vc, mcords, moves, select);
        else if(vc->obedit->type==OB_LATTICE) 
                do_lasso_select_lattice(vc, mcords, moves, select);
        else if(vc->obedit->type==OB_ARMATURE)
                do_lasso_select_armature(vc, mcords, moves, select);
-
-       BIF_undo_push("Lasso select");
        
+               WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc->obedit->data);
+       }
 }
 
+static EnumPropertyItem lasso_select_types[] = {
+       {0, "SELECT", 0, "Select", ""},
+       {1, "DESELECT", 0, "Deselect", ""},
+       {0, NULL, 0, NULL, NULL}
+};
+
 
 /* lasso operator gives properties, but since old code works
    with short array we convert */
@@ -745,7 +774,7 @@ static int view3d_lasso_select_exec(bContext *C, wmOperator *op)
                /* setup view context for argument to callbacks */
                view3d_set_viewcontext(C, &vc);
                
-               select= !RNA_boolean_get(op->ptr, "deselect");
+               select= RNA_enum_is_equal(C, op->ptr, "type", "SELECT");
                view3d_lasso_select(C, &vc, mcords, i, select);
                
                return OPERATOR_FINISHED;
@@ -756,7 +785,7 @@ static int view3d_lasso_select_exec(bContext *C, wmOperator *op)
 void VIEW3D_OT_select_lasso(wmOperatorType *ot)
 {
        ot->name= "Lasso Select";
-       ot->description= "Select items using lasso selection.";
+       ot->description= "Select items using lasso selection";
        ot->idname= "VIEW3D_OT_select_lasso";
        
        ot->invoke= WM_gesture_lasso_invoke;
@@ -768,7 +797,7 @@ void VIEW3D_OT_select_lasso(wmOperatorType *ot)
        ot->flag= OPTYPE_UNDO;
        
        RNA_def_collection_runtime(ot->srna, "path", &RNA_OperatorMousePath, "Path", "");
-       RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Deselect rather than select items.");
+       RNA_def_enum(ot->srna, "type", lasso_select_types, 0, "Type", "");
 }
 
 
@@ -842,56 +871,87 @@ static void deselectall_except(Scene *scene, Base *b)   /* deselect all except b
        }
 }
 
-static Base *mouse_select_menu(ViewContext *vc, unsigned int *buffer, int hits, short *mval)
+static Base *mouse_select_menu(bContext *C, ViewContext *vc, unsigned int *buffer, int hits, short *mval, short extend)
 {
-       Scene *scene= vc->scene;
-       View3D *v3d= vc->v3d;
-       Base *baseList[SEL_MENU_SIZE]={NULL}; /*baseList is used to store all possible bases to bring up a menu */
-       Base *base;
        short baseCount = 0;
-       char menuText[20 + SEL_MENU_SIZE*32] = "Select Object%t";       /* max ob name = 22 */
-       char str[32];
-       
-       for(base=FIRSTBASE; base; base= base->next) {
-               if (BASE_SELECTABLE(v3d, base)) {
-                       baseList[baseCount] = NULL;
-                       
-                       /* two selection methods, the CTRL select uses max dist of 15 */
-                       if(buffer) {
-                               int a;
-                               for(a=0; a<hits; a++) {
-                                       /* index was converted */
-                                       if(base->selcol==buffer[ (4 * a) + 3 ]) baseList[baseCount] = base;
-                               }
-                       }
-                       else {
-                               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]);
-                               if(temp<dist ) baseList[baseCount] = base;
+       short ok;
+       LinkNode *linklist= NULL;
+       
+       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++) {
+                               /* index was converted */
+                               if(base->selcol==buffer[ (4 * a) + 3 ])
+                                       ok= TRUE;
                        }
+               }
+               else {
+                       int temp, dist=15;
+
+                       project_short(vc->ar, base->object->obmat[3], &base->sx);
                        
-                       if(baseList[baseCount]) {
-                               if (baseCount < SEL_MENU_SIZE) {
-                                       baseList[baseCount] = base;
-                                       sprintf(str, "|%s %%x%d", base->object->id.name+2, baseCount+1);        /* max ob name == 22 */
-                                                       strcat(menuText, str);
-                                                       baseCount++;
-                               }
-                       }
+                       temp= abs(base->sx -mval[0]) + abs(base->sy -mval[1]);
+                       if(temp < dist)
+                               ok= TRUE;
+               }
+
+               if(ok) {
+                       baseCount++;
+                       BLI_linklist_prepend(&linklist, base);
+
+                       if (baseCount==SEL_MENU_SIZE)
+                               break;
                }
        }
+       CTX_DATA_END;
 
-       if(baseCount<=1) return baseList[0];
+       if(baseCount)
+
+
+       if(baseCount==0) {
+               return NULL;
+       }
+       if(baseCount == 1) {
+               Base *base= (Base *)linklist->link;
+               BLI_linklist_free(linklist, NULL);
+               return base;
+       }
        else {
-               baseCount = -1; // XXX = pupmenu(menuText);
-               
-               if (baseCount != -1) { /* If nothing is selected then dont do anything */
-                       return baseList[baseCount-1];
+               /* UI */
+               uiPopupMenu *pup= uiPupMenuBegin(C, "Select Object", 0);
+               uiLayout *layout= uiPupMenuLayout(pup);
+               uiLayout *split= uiLayoutSplit(layout, 0, 0);
+               uiLayout *column= uiLayoutColumn(split, 0);
+               LinkNode *node;
+
+               node= linklist;
+               while(node) {
+                       Base *base=node->link;
+                       Object *ob= base->object;
+                       char *name= ob->id.name+2;
+                       /* annoying!, since we need to set 2 props cant use this. */
+                       /* uiItemStringO(column, name, 0, "OBJECT_OT_select_name", "name", name); */
+
+                       {
+                               PointerRNA ptr;
+
+                               WM_operator_properties_create(&ptr, "OBJECT_OT_select_name");
+                               RNA_string_set(&ptr, "name", name);
+                               RNA_boolean_set(&ptr, "extend", extend);
+                               uiItemFullO(column, name, uiIconFromID((ID *)ob), "OBJECT_OT_select_name", ptr.data, WM_OP_EXEC_DEFAULT, 0);
+                       }
+
+                       node= node->next;
                }
-               else return NULL;
+
+               uiPupMenuEnd(C, pup);
+
+               BLI_linklist_free(linklist, NULL);
+               return NULL;
        }
 }
 
@@ -953,17 +1013,134 @@ static short mixed_bones_object_selectbuffer(ViewContext *vc, unsigned int *buff
        return 0;
 }
 
+/* returns basact */
+static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer, int hits, short *mval, Base *startbase, int has_bones)
+{
+       Scene *scene= vc->scene;
+       View3D *v3d= vc->v3d;
+       Base *base, *basact= NULL;
+       static short 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;
+               }
+       }
+       lastmval[0]= mval[0]; lastmval[1]= mval[1];
+       
+       if(donearest) {
+               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;
+                               }
+                       }
+               }
+               else {
+                       /* only exclude active object when it is selected... */
+                       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;
+                               }
+                       }
+               }
+               
+               base= FIRSTBASE;
+               while(base) {
+                       if(base->lay & v3d->lay) {
+                               if(base->selcol==selcol) break;
+                       }
+                       base= base->next;
+               }
+               if(base) basact= base;
+       }
+       else {
+               
+               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;
+                       }
+                       
+                       if(base->lay & v3d->lay) {
+                               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;
+                                               }
+                                       }
+                                       else {
+                                               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;
+               }
+       }
+       
+       return basact;
+}
+
+/* mval comes from event->mval, only use within region handlers */
+Base *ED_view3d_give_base_under_cursor(bContext *C, short *mval)
+{
+       ViewContext vc;
+       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);
+       
+       if(hits>0) {
+               int a, has_bones= 0;
+               
+               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);
+       }
+       
+       return basact;
+}
 
 /* mval is region coords */
-static void mouse_select(bContext *C, short *mval, short extend, short obcenter)
+static int mouse_select(bContext *C, short *mval, 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;
-       unsigned int buffer[4*MAXPICKBUF];
        int temp, a, dist=100;
+       int retval = 0;
        short hits;
        
        /* setup view context for argument to callbacks */
@@ -978,10 +1155,9 @@ static void mouse_select(bContext *C, short *mval, short extend, short obcenter)
        if(vc.obedit==NULL && obcenter) {
                
                /* note; shift+alt goes to group-flush-selecting */
-               /* XXX solve */
-               if(0) 
-                       basact= mouse_select_menu(&vc, NULL, 0, mval);
-               else {
+               if(enumerate) {
+                       basact= mouse_select_menu(C, &vc, NULL, 0, mval, extend);
+               } else {
                        base= startbase;
                        while(base) {
                                if (BASE_SELECTABLE(v3d, base)) {
@@ -1003,6 +1179,8 @@ static void mouse_select(bContext *C, short *mval, short extend, short obcenter)
                }
        }
        else {
+               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);
@@ -1013,92 +1191,10 @@ static void mouse_select(bContext *C, short *mval, short extend, short obcenter)
                        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 && 0) 
-                               basact= mouse_select_menu(&vc, buffer, hits, mval);
-                       else {
-                               static short lastmval[2]={-100, -100};
-                               int 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;
-                                       }
-                               }
-                               lastmval[0]= mval[0]; lastmval[1]= mval[1];
-                               
-                               if(donearest) {
-                                       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;
-                                                       }
-                                               }
-                                       }
-                                       else {
-                                               /* only exclude active object when it is selected... */
-                                               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;
-                                                       }
-                                               }
-                                       }
-
-                                       base= FIRSTBASE;
-                                       while(base) {
-                                               if(base->lay & v3d->lay) {
-                                                       if(base->selcol==selcol) break;
-                                               }
-                                               base= base->next;
-                                       }
-                                       if(base) basact= base;
-                               }
-                               else {
-                                       
-                                       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;
-                                               }
-                                       
-                                               if(base->lay & v3d->lay) {
-                                                       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;
-                                                                       }
-                                                               }
-                                                               else {
-                                                                       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;
-                                       }
-                               }
+                       if(has_bones==0 && enumerate) {
+                               basact= mouse_select_menu(C, &vc, buffer, hits, mval, extend);
+                       } else {
+                               basact= mouse_select_eval_buffer(&vc, buffer, hits, mval, startbase, has_bones);
                        }
                        
                        if(has_bones && basact) {
@@ -1109,11 +1205,12 @@ static void mouse_select(bContext *C, short *mval, short extend, short obcenter)
                                        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);
                                        
                                        /* in weightpaint, we use selected bone to select vertexgroup, so no switch to new active object */
-                                       if(basact->object->mode & OB_MODE_WEIGHT_PAINT) {
+                                       if(BASACT && BASACT->object->mode & OB_MODE_WEIGHT_PAINT) {
                                                /* prevent activating */
                                                basact= NULL;
                                        }
@@ -1128,6 +1225,7 @@ static void mouse_select(bContext *C, short *mval, short extend, short obcenter)
        
        /* so, do we have something selected? */
        if(basact) {
+               retval = 1;
                
                if(vc.obedit) {
                        /* only do select */
@@ -1161,6 +1259,8 @@ static void mouse_select(bContext *C, short *mval, short extend, short obcenter)
                        WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
                }
        }
+
+       return retval;
 }
 
 /* ********************  border and circle ************************************** */
@@ -1183,7 +1283,7 @@ int edge_inside_circle(short centx, short centy, short rad, short x1, short y1,
        v2[0]= x2;
        v2[1]= y2;
        
-       if( PdistVL2Dfl(v3, v1, v2) < (float)rad ) return 1;
+       if( dist_to_line_segment_v2(v3, v1, v2) < (float)rad ) return 1;
        
        return 0;
 }
@@ -1196,7 +1296,9 @@ static void do_nurbs_box_select__doSelect(void *userData, Nurb *nu, BPoint *bp,
                if (bp) {
                        bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT);
                } else {
-                       if (G.f & G_HIDDENHANDLES) {
+                       Curve *cu= data->vc.obedit->data;
+                       
+                       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);
                        } else {
@@ -1211,14 +1313,19 @@ static void do_nurbs_box_select__doSelect(void *userData, Nurb *nu, BPoint *bp,
                }
        }
 }
-static void do_nurbs_box_select(ViewContext *vc, rcti *rect, int select)
+static void do_nurbs_box_select(ViewContext *vc, rcti *rect, int select, int extend)
 {
        struct { ViewContext vc; rcti *rect; int select; } data;
        
-       data.vc= *vc;
+       data.vc = *vc;
        data.rect = rect;
        data.select = select;
 
+       if (extend == 0 && select) {
+               CU_deselect_all(vc->obedit);
+       }
+
+       ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
        nurbs_foreachScreenVert(vc, do_nurbs_box_select__doSelect, &data);
 }
 
@@ -1230,7 +1337,7 @@ static void do_lattice_box_select__doSelect(void *userData, BPoint *bp, int x, i
                bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT);
        }
 }
-static void do_lattice_box_select(ViewContext *vc, rcti *rect, int select)
+static void do_lattice_box_select(ViewContext *vc, rcti *rect, int select, int extend)
 {
        struct { ViewContext vc; rcti *rect; int select, pass, done; } data;
 
@@ -1238,46 +1345,55 @@ static void do_lattice_box_select(ViewContext *vc, rcti *rect, int select)
        data.rect = rect;
        data.select = select;
 
+       if (extend == 0 && select) {
+               ED_setflagsLatt(vc->obedit, 0);
+       }
+
+       ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
        lattice_foreachScreenVert(vc, do_lattice_box_select__doSelect, &data);
 }
 
-static void do_mesh_box_select__doSelectVert(void *userData, EditVert *eve, int x, int y, int index)
+static void do_mesh_box_select__doSelectVert(void *userData, BMVert *eve, int x, int y, int index)
 {
        struct { ViewContext vc; rcti *rect; short select, pass, done; } *data = userData;
 
        if (BLI_in_rcti(data->rect, x, y)) {
-               eve->f = data->select?(eve->f|1):(eve->f&~1);
+               BM_Select_Vert(data->vc.em->bm, eve, data->select);
        }
 }
-static void do_mesh_box_select__doSelectEdge(void *userData, EditEdge *eed, int x0, int y0, int x1, int y1, int index)
+static void do_mesh_box_select__doSelectEdge(void *userData, BMEdge *eed, int x0, int y0, int x1, int y1, int index)
 {
        struct { ViewContext vc; rcti *rect; short select, pass, done; } *data = userData;
 
-       if(EM_check_backbuf(em_solidoffs+index)) {
+       if(EDBM_check_backbuf(bm_solidoffs+index)) {
                if (data->pass==0) {
                        if (edge_fully_inside_rect(data->rect, x0, y0, x1, y1)) {
-                               EM_select_edge(eed, data->select);
+                               BM_Select_Edge(data->vc.em->bm, eed, data->select);
                                data->done = 1;
                        }
                } else {
                        if (edge_inside_rect(data->rect, x0, y0, x1, y1)) {
-                               EM_select_edge(eed, data->select);
+                               BM_Select_Edge(data->vc.em->bm, eed, data->select);
                        }
                }
        }
 }
-static void do_mesh_box_select__doSelectFace(void *userData, EditFace *efa, int x, int y, int index)
+
+static void 
+do_mesh_box_select__doSelectFace(void *userData, BMFace
+                               *efa, int x, int y,
+                               int index)
+
 {
        struct { ViewContext vc; rcti *rect; short select, pass, done; } *data = userData;
 
        if (BLI_in_rcti(data->rect, x, y)) {
-               EM_select_face_fgon(data->vc.em, efa, data->select);
+               BM_Select_Face(data->vc.em->bm, efa, data->select);
        }
 }
-static void do_mesh_box_select(ViewContext *vc, rcti *rect, int select)
+static void do_mesh_box_select(ViewContext *vc, rcti *rect, int select, int extend)
 {
        struct { ViewContext vc; rcti *rect; short select, pass, done; } data;
-       ToolSettings *ts= vc->scene->toolsettings;
        int bbsel;
        
        data.vc= *vc;
@@ -1286,16 +1402,30 @@ static void do_mesh_box_select(ViewContext *vc, rcti *rect, int select)
        data.pass = 0;
        data.done = 0;
 
-       bbsel= EM_init_backbuf_border(vc, rect->xmin, rect->ymin, rect->xmax, rect->ymax);
+       if (extend == 0 && select)
+       {
+               EDBM_clear_flag_all(vc->em, BM_SELECT);
+       }
+
+       /* workaround: init mats first, EM_mask_init_backbuf_border can change
+          view matrix to pixel space, breaking edge select with backbuf. fixes bug #20936 */
+       /*ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d);*/ /* for foreach's screen/vert projection */
+
+       /* [#21018] breaks zbuf select. run below. only if bbsel fails */
+       /* 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);
 
-       if(ts->selectmode & SCE_SELECT_VERTEX) {
+       if(vc->scene->toolsettings->selectmode & SCE_SELECT_VERTEX) {
                if (bbsel) {
-                       EM_backbuf_checkAndSelectVerts(vc->em, select);
+                       EDBM_backbuf_checkAndSelectVerts(vc->em, select);
                } else {
+                       ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d);
                        mesh_foreachScreenVert(vc, do_mesh_box_select__doSelectVert, &data, 1);
                }
        }
-       if(ts->selectmode & SCE_SELECT_EDGE) {
+       if(vc->scene->toolsettings->selectmode & SCE_SELECT_EDGE) {
                        /* Does both bbsel and non-bbsel versions (need screen cos for both) */
 
                data.pass = 0;
@@ -1307,17 +1437,18 @@ static void do_mesh_box_select(ViewContext *vc, rcti *rect, int select)
                }
        }
        
-       if(ts->selectmode & SCE_SELECT_FACE) {
+       if(vc->scene->toolsettings->selectmode & SCE_SELECT_FACE) {
                if(bbsel) {
-                       EM_backbuf_checkAndSelectFaces(vc->em, select);
+                       EDBM_backbuf_checkAndSelectFaces(vc->em, select);
                } else {
+                       ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d);
                        mesh_foreachScreenFace(vc, do_mesh_box_select__doSelectFace, &data);
                }
        }
        
-       EM_free_backbuf();
+       EDBM_free_backbuf();
                
-       EM_selectmode_flush(vc->em);
+       EDBM_selectmode_flush(vc->em);
 }
 
 static int view3d_borderselect_exec(bContext *C, wmOperator *op)
@@ -1333,57 +1464,70 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
        MetaElem *ml;
        unsigned int buffer[4*MAXPICKBUF];
        int a, index;
-       short hits, val;
+       int extend;
+       short hits, selecting;
 
        view3d_operator_needs_opengl(C);
        
        /* setup view context for argument to callbacks */
        view3d_set_viewcontext(C, &vc);
        
-       val= RNA_int_get(op->ptr, "event_type");
+       selecting= (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");
        rect.ymax= RNA_int_get(op->ptr, "ymax");
-       
+       extend = RNA_boolean_get(op->ptr, "extend");
+
        if(obedit==NULL && (paint_facesel_test(OBACT))) {
-// XXX         face_borderselect();
+               face_borderselect(C, obact, &rect, selecting, extend);
                return OPERATOR_FINISHED;
        }
        else if(obedit==NULL && (obact && obact->mode & OB_MODE_PARTICLE_EDIT)) {
-               return PE_border_select(C, &rect, (val==LEFTMOUSE));
+               return PE_border_select(C, &rect, selecting, extend);
        }
+       else if(obedit==NULL && (obact && obact->mode & OB_MODE_SCULPT))
+               return OPERATOR_CANCELLED;
        
        if(obedit) {
                if(obedit->type==OB_MESH) {
                        Mesh *me= obedit->data;
-                       vc.em= me->edit_mesh;
-                       do_mesh_box_select(&vc, &rect, (val==LEFTMOUSE));
-//                     if (EM_texFaceCheck())
+                       vc.em= me->edit_btmesh;
+                       do_mesh_box_select(&vc, &rect, selecting, extend);
+//                     if (EDBM_texFaceCheck())
                        WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
                        
                }
                else if(ELEM(obedit->type, OB_CURVE, OB_SURF)) {
-                       do_nurbs_box_select(&vc, &rect, val==LEFTMOUSE);
+                       do_nurbs_box_select(&vc, &rect, selecting, extend);
                }
                else if(obedit->type==OB_MBALL) {
                        MetaBall *mb = (MetaBall*)obedit->data;
                        hits= view3d_opengl_select(&vc, buffer, MAXPICKBUF, &rect);
                        
+                       if (extend == 0 && selecting) {
+                               ml= mb->editelems->first;
+
+                               while(ml) {
+                                       ml->flag &= ~SELECT;
+                                       ml= ml->next;
+                               }
+                       }
+
                        ml= mb->editelems->first;
                        
                        while(ml) {
                                for(a=0; a<hits; a++) {
                                        if(ml->selcol1==buffer[ (4 * a) + 3 ]) {
                                                ml->flag |= MB_SCALE_RAD;
-                                               if(val==LEFTMOUSE) ml->flag |= SELECT;
-                                               else ml->flag &= ~SELECT;
+                                               if(selecting)   ml->flag |= SELECT;
+                                               else                    ml->flag &= ~SELECT;
                                                break;
                                        }
                                        if(ml->selcol2==buffer[ (4 * a) + 3 ]) {
                                                ml->flag &= ~MB_SCALE_RAD;
-                                               if(val==LEFTMOUSE) ml->flag |= SELECT;
-                                               else ml->flag &= ~SELECT;
+                                               if(selecting)   ml->flag |= SELECT;
+                                               else                    ml->flag &= ~SELECT;
                                                break;
                                        }
                                }
@@ -1398,6 +1542,17 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
                        for(ebone= arm->edbo->first; ebone; ebone= ebone->next)
                                ebone->flag &= ~BONE_DONE;
                        
+                       if (extend==0 && selecting) {
+                               /*      Set the flags */
+                               CTX_DATA_BEGIN(C, EditBone *, ebone, visible_bones) {
+                                       /* ignore bone if selection can't change */
+                                       if ((ebone->flag & BONE_UNSELECTABLE) == 0) {
+                                               ebone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
+                                       }
+                               }
+                               CTX_DATA_END;
+                       }
+
                        hits= view3d_opengl_select(&vc, buffer, MAXPICKBUF, &rect);
                        
                        /* first we only check points inside the border */
@@ -1407,14 +1562,14 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
                                        ebone = BLI_findlink(arm->edbo, index & ~(BONESEL_ANY));
                                        if (index & BONESEL_TIP) {
                                                ebone->flag |= BONE_DONE;
-                                               if (val==LEFTMOUSE) ebone->flag |= BONE_TIPSEL;
-                                               else ebone->flag &= ~BONE_TIPSEL;
+                                               if (selecting)  ebone->flag |= BONE_TIPSEL;
+                                               else                    ebone->flag &= ~BONE_TIPSEL;
                                        }
                                        
                                        if (index & BONESEL_ROOT) {
                                                ebone->flag |= BONE_DONE;
-                                               if (val==LEFTMOUSE) ebone->flag |= BONE_ROOTSEL;
-                                               else ebone->flag &= ~BONE_ROOTSEL;
+                                               if (selecting)  ebone->flag |= BONE_ROOTSEL;
+                                               else                    ebone->flag &= ~BONE_ROOTSEL;
                                        }
                                }
                        }
@@ -1434,7 +1589,7 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
                                        ebone = BLI_findlink(arm->edbo, index & ~(BONESEL_ANY));
                                        if (index & BONESEL_BONE) {
                                                if(!(ebone->flag & BONE_DONE)) {
-                                                       if (val==LEFTMOUSE)
+                                                       if (selecting)
                                                                ebone->flag |= (BONE_ROOTSEL|BONE_TIPSEL|BONE_SELECTED);
                                                        else
                                                                ebone->flag &= ~(BONE_ROOTSEL|BONE_TIPSEL|BONE_SELECTED);
@@ -1443,10 +1598,9 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
                                }
                        }
                        
-                       ED_armature_sync_selection(arm->edbo);
                }
                else if(obedit->type==OB_LATTICE) {
-                       do_lattice_box_select(&vc, &rect, val==LEFTMOUSE);
+                       do_lattice_box_select(&vc, &rect, selecting, extend);
                }
        }
        else {  /* no editmode, unified for bones and objects */
@@ -1454,7 +1608,6 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
                Object *ob= OBACT;
                unsigned int *vbuffer=NULL; /* selection buffer */
                unsigned int *col;                      /* color in buffer      */
-               short selecting = 0;
                int bone_only;
                int totobj= MAXPICKBUF; // XXX solve later
                
@@ -1463,9 +1616,25 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
                else
                        bone_only= 0;
                
-               if (val==LEFTMOUSE)
-                       selecting = 1;
-               
+               if (extend == 0 && selecting) {
+                       base= FIRSTBASE;
+
+                       if (bone_only) {
+                               CTX_DATA_BEGIN(C, bPoseChannel *, pchan, visible_pose_bones) {
+                                       pchan->bone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
+                               }
+                               CTX_DATA_END;
+                       } else {
+                               while(base) {
+                                       Base *next = base->next;
+                                       if(base->lay & v3d->lay) {
+                                               ED_base_object_select(base, BA_DESELECT);
+                                       }
+                                       base= next;
+                               }
+                       }
+               }
+
                /* 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);
@@ -1498,8 +1667,12 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
 // XXX                                                                 select_actionchannel_by_name(base->object->action, bone->name, 1);
                                                                }
                                                                else {
-                                                                       bone->flag &= ~(BONE_ACTIVE|BONE_SELECTED);
+                                                                       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;
+                                                                       
                                                                }
                                                        }
                                                }
@@ -1529,13 +1702,18 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
 
 
 /* *****************Selection Operators******************* */
+static EnumPropertyItem prop_select_types[] = {
+       {0, "EXCLUSIVE", 0, "Exclusive", ""},
+       {1, "EXTEND", 0, "Extend", ""},
+       {0, NULL, 0, NULL, NULL}
+};
 
 /* ****** Border Select ****** */
 void VIEW3D_OT_select_border(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Border Select";
-       ot->description= "Select items using border selection.";
+       ot->description= "Select items using border selection";
        ot->idname= "VIEW3D_OT_select_border";
        
        /* api callbacks */
@@ -1549,13 +1727,7 @@ void VIEW3D_OT_select_border(wmOperatorType *ot)
        ot->flag= OPTYPE_UNDO;
        
        /* rna */
-       RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX);
-       RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
-       RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
-       RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
-       RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
-
-       RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everyting first.");
+       WM_operator_properties_gesture_border(ot, TRUE);
 }
 
 /* ****** Mouse Select ****** */
@@ -1564,38 +1736,50 @@ void VIEW3D_OT_select_border(wmOperatorType *ot)
 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");
+       Object *obact= CTX_data_active_object(C);
+       short center= RNA_boolean_get(op->ptr, "center");
+       short enumerate= RNA_boolean_get(op->ptr, "enumerate");
+       int     retval = 0;
 
        view3d_operator_needs_opengl(C);
        
        if(obedit) {
                if(obedit->type==OB_MESH)
-                       mouse_mesh(C, event->mval, extend);
+                       retval = mouse_mesh(C, event->mval, extend);
                else if(obedit->type==OB_ARMATURE)
-                       mouse_armature(C, event->mval, extend);
+                       retval = mouse_armature(C, event->mval, extend);
                else if(obedit->type==OB_LATTICE)
-                       mouse_lattice(C, event->mval, extend);
+                       retval = mouse_lattice(C, event->mval, extend);
                else if(ELEM(obedit->type, OB_CURVE, OB_SURF))
-                       mouse_nurb(C, event->mval, extend);
+                       retval = mouse_nurb(C, event->mval, extend);
                else if(obedit->type==OB_MBALL)
-                       mouse_mball(C, event->mval, extend);
+                       retval = mouse_mball(C, event->mval, extend);
                        
        }
+       else if(obact && obact->mode & OB_MODE_SCULPT)
+               return OPERATOR_CANCELLED;
        else if(obact && obact->mode & OB_MODE_PARTICLE_EDIT)
-               PE_mouse_particles(C, event->mval, extend);
-       else 
-               mouse_select(C, event->mval, extend, 0);
-
-       /* allowing tweaks */
-       return OPERATOR_PASS_THROUGH|OPERATOR_FINISHED;
+               return PE_mouse_particles(C, event->mval, extend);
+       else if(obact && paint_facesel_test(obact))
+               retval = face_select(C, obact, event->mval, extend);
+       else
+               retval = mouse_select(C, event->mval, extend, center, enumerate);
+
+       /* passthrough allows tweaks
+        * FINISHED to signal one operator worked
+        * */
+       if (retval)
+               return OPERATOR_PASS_THROUGH|OPERATOR_FINISHED;
+       else
+               return OPERATOR_PASS_THROUGH; /* nothing selected, just passthrough */
 }
 
 void VIEW3D_OT_select(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Activate/Select";
-       ot->description= "Activate/select item(s).";
+       ot->description= "Activate/select item(s)";
        ot->idname= "VIEW3D_OT_select";
        
        /* api callbacks */
@@ -1606,44 +1790,45 @@ void VIEW3D_OT_select(wmOperatorType *ot)
        ot->flag= OPTYPE_UNDO;
        
        /* properties */
-       RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everyting first.");
+       RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first.");
+       RNA_def_boolean(ot->srna, "center", 0, "Center", "Use the object center when selecting (object mode only).");
+       RNA_def_boolean(ot->srna, "enumerate", 0, "Enumerate", "List objects under the mouse (object mode only).");
 }
 
 
 /* -------------------- circle select --------------------------------------------- */
 
-static void mesh_circle_doSelectVert(void *userData, EditVert *eve, int x, int y, int index)
+static void mesh_circle_doSelectVert(void *userData, BMVert *eve, int x, int y, int index)
 {
        struct {ViewContext *vc; short select, mval[2]; float radius; } *data = userData;
        int mx = x - data->mval[0], my = y - data->mval[1];
        float r = sqrt(mx*mx + my*my);
 
        if (r<=data->radius) {
-               eve->f = data->select?(eve->f|1):(eve->f&~1);
+               BM_Select_Vert(data->vc->em->bm, eve, data->select);
        }
 }
-static void mesh_circle_doSelectEdge(void *userData, EditEdge *eed, int x0, int y0, int x1, int y1, int index)
+static void mesh_circle_doSelectEdge(void *userData, BMEdge *eed, int x0, int y0, int x1, int y1, int index)
 {
        struct {ViewContext *vc; short select, mval[2]; float radius; } *data = userData;
 
        if (edge_inside_circle(data->mval[0], data->mval[1], (short) data->radius, x0, y0, x1, y1)) {
-               EM_select_edge(eed, data->select);
+               BM_Select_Edge(data->vc->em->bm, eed, data->select);
        }
 }
-static void mesh_circle_doSelectFace(void *userData, EditFace *efa, int x, int y, int index)
+static void mesh_circle_doSelectFace(void *userData, BMFace *efa, int x, int y, int index)
 {
        struct {ViewContext *vc; short select, mval[2]; float radius; } *data = userData;
        int mx = x - data->mval[0], my = y - data->mval[1];
        float r = sqrt(mx*mx + my*my);
        
        if (r<=data->radius) {
-               EM_select_face_fgon(data->vc->em, efa, data->select);
+               BM_Select_Face(data->vc->em->bm, efa, data->select);
        }
 }
 
 static void mesh_circle_select(ViewContext *vc, int selecting, short *mval, float rad)
 {
-       ToolSettings *ts= vc->scene->toolsettings;
        int bbsel;
        Object *ob= vc->obact;
        
@@ -1651,11 +1836,11 @@ static void mesh_circle_select(ViewContext *vc, int selecting, short *mval, floa
                Mesh *me = ob?ob->data:NULL;
 
                if (me) {
-                       em_vertoffs= me->totface+1;     /* max index array */
+                       bm_vertoffs= me->totface+1;     /* max index array */
 
-                       bbsel= EM_init_backbuf_circle(vc, mval[0], mval[1], (short)(rad+1.0));
-                       EM_backbuf_checkAndSelectTFaces(me, selecting==LEFTMOUSE);
-                       EM_free_backbuf();
+                       //bbsel= EDBM_init_backbuf_circle(vc, mval[0], mval[1], (short)(rad+1.0));
+                       //BMESH_TODO EM_backbuf_checkAndSelectTFaces(me, selecting==LEFTMOUSE);
+                       //EDBM_free_backbuf();
 
 // XXX                 object_tface_flags_changed(OBACT, 0);
                }
@@ -1663,40 +1848,43 @@ static void mesh_circle_select(ViewContext *vc, int selecting, short *mval, floa
        else {
                struct {ViewContext *vc; short select, mval[2]; float radius; } data;
                
-               bbsel= EM_init_backbuf_circle(vc, mval[0], mval[1], (short)(rad+1.0));
-               vc->em= ((Mesh *)vc->obedit->data)->edit_mesh;
+               bbsel= EDBM_init_backbuf_circle(vc, mval[0], mval[1], (short)(rad+1.0));
+               vc->em= ((Mesh *)vc->obedit->data)->edit_btmesh;
+               ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
 
+               data.vc = vc;
                data.select = selecting;
                data.mval[0] = mval[0];
                data.mval[1] = mval[1];
                data.radius = rad;
+               data.vc = vc;
 
-               if(ts->selectmode & SCE_SELECT_VERTEX) {
+               if(vc->scene->toolsettings->selectmode & SCE_SELECT_VERTEX) {
                        if(bbsel) {
-                               EM_backbuf_checkAndSelectVerts(vc->em, selecting==LEFTMOUSE);
+                               EDBM_backbuf_checkAndSelectVerts(vc->em, selecting==LEFTMOUSE);
                        } else {
                                mesh_foreachScreenVert(vc, mesh_circle_doSelectVert, &data, 1);
                        }
                }
 
-               if(ts->selectmode & SCE_SELECT_EDGE) {
+               if(vc->scene->toolsettings->selectmode & SCE_SELECT_EDGE) {
                        if (bbsel) {
-                               EM_backbuf_checkAndSelectEdges(vc->em, selecting==LEFTMOUSE);
+                               EDBM_backbuf_checkAndSelectEdges(vc->em, selecting==LEFTMOUSE);
                        } else {
                                mesh_foreachScreenEdge(vc, mesh_circle_doSelectEdge, &data, 0);
                        }
                }
                
-               if(ts->selectmode & SCE_SELECT_FACE) {
+               if(vc->scene->toolsettings->selectmode & SCE_SELECT_FACE) {
                        if(bbsel) {
-                               EM_backbuf_checkAndSelectFaces(vc->em, selecting==LEFTMOUSE);
+                               EDBM_backbuf_checkAndSelectFaces(vc->em, selecting==LEFTMOUSE);
                        } else {
                                mesh_foreachScreenFace(vc, mesh_circle_doSelectFace, &data);
                        }
                }
 
-               EM_free_backbuf();
-               EM_selectmode_flush(vc->em);
+               EDBM_free_backbuf();
+               EDBM_selectmode_flush(vc->em);
        }
 }
 
@@ -1732,6 +1920,7 @@ static void nurbscurve_circle_select(ViewContext *vc, int selecting, short *mval
        data.mval[1] = mval[1];
        data.radius = rad;
 
+       ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
        nurbs_foreachScreenVert(vc, nurbscurve_circle_doSelect, &data);
 }
 
@@ -1757,9 +1946,83 @@ static void lattice_circle_select(ViewContext *vc, int selecting, short *mval, f
        data.mval[1] = mval[1];
        data.radius = rad;
 
+       ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
        lattice_foreachScreenVert(vc, latticecurve_circle_doSelect, &data);
 }
 
+
+static short armature_circle_doSelectJoint(void *userData, EditBone *ebone, int x, int y, short head)
+{
+       struct {ViewContext *vc; short select, mval[2]; float radius; } *data = userData;
+       int mx = x - data->mval[0], my = y - data->mval[1];
+       float r = sqrt(mx*mx + my*my);
+       
+       if (r <= data->radius) {
+               if (head) {
+                       if (data->select)
+                               ebone->flag |= BONE_ROOTSEL;
+                       else 
+                               ebone->flag &= ~BONE_ROOTSEL;
+               }
+               else {
+                       if (data->select)
+                               ebone->flag |= BONE_TIPSEL;
+                       else 
+                               ebone->flag &= ~BONE_TIPSEL;
+               }
+               return 1;
+       }
+       return 0;
+}
+static void armature_circle_select(ViewContext *vc, int selecting, short *mval, float rad)
+{
+       struct {ViewContext *vc; short select, mval[2]; float radius; } data;
+       bArmature *arm= vc->obedit->data;
+       EditBone *ebone;
+       
+       /* set vc->edit data */
+       data.select = selecting;
+       data.mval[0] = mval[0];
+       data.mval[1] = mval[1];
+       data.radius = rad;
+
+       ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
+       
+       /* check each EditBone... */
+       // TODO: could be optimised at some point
+       for (ebone= arm->edbo->first; ebone; ebone=ebone->next) {
+               short sco1[2], sco2[2], didpoint=0;
+               float vec[3];
+               
+               /* project head location to screenspace */
+               mul_v3_m4v3(vec, vc->obedit->obmat, ebone->head);
+               project_short(vc->ar, vec, sco1);
+               
+               /* project tail location to screenspace */
+               mul_v3_m4v3(vec, vc->obedit->obmat, ebone->tail);
+               project_short(vc->ar, vec, sco2);
+               
+               /* check if the head and/or tail is in the circle 
+                *      - the call to check also does the selection already
+                */
+               if (armature_circle_doSelectJoint(&data, ebone, sco1[0], sco1[1], 1))
+                       didpoint= 1;
+               if (armature_circle_doSelectJoint(&data, ebone, sco2[0], sco2[1], 0))
+                       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 (selecting) 
+                               ebone->flag |= BONE_TIPSEL|BONE_ROOTSEL|BONE_SELECTED;
+                       else 
+                               ebone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
+               }
+       }
+
+       ED_armature_validate_active(arm);
+}
+
 /** Callbacks for circle selection in Editmode */
 
 static void obedit_circle_select(ViewContext *vc, short selecting, short *mval, float rad) 
@@ -1775,6 +2038,9 @@ static void obedit_circle_select(ViewContext *vc, short selecting, short *mval,
        case OB_LATTICE:
                lattice_circle_select(vc, selecting, mval, rad);
                break;
+       case OB_ARMATURE:
+               armature_circle_select(vc, selecting, mval, rad);
+               break;
        default:
                return;
        }
@@ -1791,17 +2057,20 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
        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 selecting;
        
+    selecting= (gesture_mode==GESTURE_MODAL_SELECT);
+    
        if(CTX_data_edit_object(C) || (obact && obact->mode & OB_MODE_PARTICLE_EDIT)) {
                ViewContext vc;
-               short mval[2], selecting;
+               short mval[2];
                
                view3d_operator_needs_opengl(C);
                
                view3d_set_viewcontext(C, &vc);
                mval[0]= x;
                mval[1]= y;
-               selecting= LEFTMOUSE==RNA_int_get(op->ptr, "event_type"); // XXX solve
 
                if(CTX_data_edit_object(C)) {
                        obedit_circle_select(&vc, selecting, mval, (float)radius);
@@ -1810,9 +2079,12 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
                else
                        return PE_circle_select(C, selecting, mval, (float)radius);
        }
+       else if(obact && obact->mode & OB_MODE_SCULPT) {
+               return OPERATOR_CANCELLED;
+       }
        else {
                Base *base;
-               
+               selecting= selecting?BA_SELECT:BA_DESELECT;
                for(base= FIRSTBASE; base; base= base->next) {
                        if(base->lay & v3d->lay) {
                                project_short(ar, base->object->obmat[3], &base->sx);
@@ -1820,7 +2092,7 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
                                        int dx= base->sx-x;
                                        int dy= base->sy-y;
                                        if( dx*dx + dy*dy < radius*radius)
-                                               ED_base_object_select(base, BA_SELECT);
+                                               ED_base_object_select(base, selecting);
                                }
                        }
                }
@@ -1834,7 +2106,7 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
 void VIEW3D_OT_select_circle(wmOperatorType *ot)
 {
        ot->name= "Circle Select";
-       ot->description= "Select items using circle selection.";
+       ot->description= "Select items using circle selection";
        ot->idname= "VIEW3D_OT_select_circle";
        
        ot->invoke= WM_gesture_circle_invoke;
@@ -1848,5 +2120,5 @@ void VIEW3D_OT_select_circle(wmOperatorType *ot)
        RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX);
        RNA_def_int(ot->srna, "y", 0, INT_MIN, INT_MAX, "Y", "", INT_MIN, INT_MAX);
        RNA_def_int(ot->srna, "radius", 0, INT_MIN, INT_MAX, "Radius", "", INT_MIN, INT_MAX);
-       RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX);
 }