- modal keymap for border select

- revert circle select keys adjustments & view navigation while selecting (durian guys liked but allowed activating multiple circle select's at once)

2 files changed, 29 insertions, 36 deletions

diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index 12adfced5c2..2edccacff7a 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -574,13 +574,14 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr)
 
 static void v3d_posearmature_buts(uiLayout *layout, View3D *v3d, Object *ob, float lim)
 {
-	uiBlock *block= uiLayoutGetBlock(layout);
+//	uiBlock *block= uiLayoutGetBlock(layout);
 	bArmature *arm;
 	bPoseChannel *pchan;
 	Bone *bone= NULL;
-	TransformProperties *tfp= v3d->properties_storage;
+//	TransformProperties *tfp= v3d->properties_storage;
 	PointerRNA pchanptr;
-	uiLayout *row, *col;
+	uiLayout *col;
+//	uiLayout *row;
 
 	arm = ob->data;
 	if (!arm || !ob->pose) return;
@@ -682,11 +683,12 @@ void validate_editbonebutton_cb(bContext *C, void *bonev, void *namev)
 
 static void v3d_editarmature_buts(uiLayout *layout, View3D *v3d, Object *ob, float lim)
 {
-	uiBlock *block= uiLayoutGetBlock(layout);
+//	uiBlock *block= uiLayoutGetBlock(layout);
 	bArmature *arm= ob->data;
 	EditBone *ebone;
-	TransformProperties *tfp= v3d->properties_storage;
-	uiLayout *row, *col;
+//	TransformProperties *tfp= v3d->properties_storage;
+//	uiLayout *row;
+	uiLayout *col;
 	PointerRNA eboneptr;
 	
 	ebone= arm->edbo->first;
@@ -722,7 +724,8 @@ static void v3d_editmetaball_buts(uiLayout *layout, Object *ob, float lim)
 {
 	PointerRNA mbptr, ptr;
 	MetaBall *mball= ob->data;
-	uiLayout *row, *col;
+//	uiLayout *row;
+	uiLayout *col;
 	
 	if (!mball || !(mball->lastelem)) return;
 	
@@ -779,9 +782,9 @@ static int test_parent_loop(Object *par, Object *ob)
 static void do_view3d_region_buttons(bContext *C, void *arg, int event)
 {
 	Scene *scene= CTX_data_scene(C);
-	Object *obedit= CTX_data_edit_object(C);
+//	Object *obedit= CTX_data_edit_object(C);
 	View3D *v3d= CTX_wm_view3d(C);
-	BoundBox *bb;
+//	BoundBox *bb;
 	Object *ob= OBACT;
 	TransformProperties *tfp= v3d->properties_storage;
 	
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 04658df3861..f0425974f29 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1373,38 +1373,38 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
 	MetaElem *ml;
 	unsigned int buffer[4*MAXPICKBUF];
 	int a, index;
-	short hits, val;
+	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");
 	
 	if(obedit==NULL && (paint_facesel_test(OBACT))) {
-		face_borderselect(C, obact, &rect, (val==LEFTMOUSE));
+		face_borderselect(C, obact, &rect, selecting);
 		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);
 	}
 	
 	if(obedit) {
 		if(obedit->type==OB_MESH) {
 			Mesh *me= obedit->data;
 			vc.em= me->edit_mesh;
-			do_mesh_box_select(&vc, &rect, (val==LEFTMOUSE));
+			do_mesh_box_select(&vc, &rect, selecting);
 //			if (EM_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);
 		}
 		else if(obedit->type==OB_MBALL) {
 			MetaBall *mb = (MetaBall*)obedit->data;
@@ -1416,14 +1416,14 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
 				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;
 					}
 				}
@@ -1447,14 +1447,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;
 					}
 				}
 			}
@@ -1474,7 +1474,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);
@@ -1486,7 +1486,7 @@ 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);
 		}
 	}
 	else {	/* no editmode, unified for bones and objects */
@@ -1494,7 +1494,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
 		
@@ -1503,9 +1502,6 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
 		else
 			bone_only= 0;
 		
-		if (val==LEFTMOUSE)
-			selecting = 1;
-		
 		/* 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);
@@ -1589,13 +1585,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 everything first.");
+	WM_operator_properties_gesture_border(ot, TRUE);
 }
 
 /* ****** Mouse Select ****** */