merge with trunk/2.5 at r23876

[[Split portion of a mixed commit.]]

1 files changed, 47 insertions, 18 deletions

diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c
index 686f0fd9348..9a2a953f643 100644
--- a/source/blender/editors/mesh/loopcut.c
+++ b/source/blender/editors/mesh/loopcut.c
@@ -51,6 +51,7 @@
 
 #include "BKE_blender.h"
 #include "BKE_context.h"
+#include "BKE_depsgraph.h"
 #include "BKE_scene.h"
 #include "BKE_utildefines.h"
 #include "BKE_mesh.h"
@@ -132,7 +133,7 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select)
 	float (*edges)[2][3] = NULL;
 	BLI_array_declare(edges);
 	float co[2][3];
-	int looking=1, i, j=0, tot=0;
+	int looking=1, i, tot=0;
 	
 	if (!startedge)
 		return;
@@ -246,28 +247,29 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select)
 	lcd->totedge = tot;
 }
 
-static void ringsel_find_edge(tringselOpData *lcd, const bContext *C, ARegion *ar)
+static void ringsel_find_edge(tringselOpData *lcd, const bContext *C, ARegion *ar, int cuts)
 {
 	if (lcd->eed)
-		edgering_sel(lcd, 1, 0);
+		edgering_sel(lcd, cuts, 0);
 }
 
 static void ringsel_finish(bContext *C, wmOperator *op)
 {
 	tringselOpData *lcd= op->customdata;
+	int cuts= RNA_int_get(op->ptr,"number_cuts");
 
 	if (lcd->eed) {
-		edgering_sel(lcd, 0, 1);
+		edgering_sel(lcd, cuts, 1);
 		if (lcd->do_cut) {
 			BMEditMesh *em = lcd->em;
-			
 			BM_esubdivideflag(lcd->ob, em->bm, BM_SELECT, 0.0f, 
-			                  0.0f, 0, 1, SUBDIV_SELECT_LOOPCUT, 
+			                  0.0f, 0, cuts, SUBDIV_SELECT_LOOPCUT, 
 			                  SUBD_PATH, 0, 0);
 
 			WM_event_add_notifier(C, NC_GEOM|ND_SELECT|ND_DATA, lcd->ob->data);
 			DAG_id_flush_update(lcd->ob->data, OB_RECALC_DATA);
 		}
+		WM_event_add_notifier(C, NC_GEOM|ND_DATA, lcd->ob->data);
 	}
 }
 
@@ -320,7 +322,6 @@ static int ringsel_cancel (bContext *C, wmOperator *op)
 
 static int ringsel_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 {
-	ScrArea *sa = CTX_wm_area(C);
 	tringselOpData *lcd;
 	BMEdge *edge;
 	int dist = 75;
@@ -331,7 +332,7 @@ static int ringsel_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 		return OPERATOR_CANCELLED;
 	
 	/* add a modal handler for this operator - handles loop selection */
-	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+	WM_event_add_modal_handler(C, op);
 
 	lcd = op->customdata;
 	lcd->vc.mval[0] = evt->mval[0];
@@ -340,7 +341,7 @@ static int ringsel_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 	edge = EDBM_findnearestedge(&lcd->vc, &dist);
 	if (edge != lcd->eed) {
 		lcd->eed = edge;
-		ringsel_find_edge(lcd, C, lcd->ar);
+		ringsel_find_edge(lcd, C, lcd->ar, 1);
 	}
 
 	return OPERATOR_RUNNING_MODAL;
@@ -349,7 +350,6 @@ static int ringsel_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 
 static int ringcut_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 {
-	ScrArea *sa = CTX_wm_area(C);
 	tringselOpData *lcd;
 	BMEdge *edge;
 	int dist = 75;
@@ -360,7 +360,7 @@ static int ringcut_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 		return OPERATOR_CANCELLED;
 	
 	/* add a modal handler for this operator - handles loop selection */
-	WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+	WM_event_add_modal_handler(C, op);
 
 	lcd = op->customdata;
 	lcd->vc.mval[0] = evt->mval[0];
@@ -369,7 +369,7 @@ static int ringcut_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 	edge = EDBM_findnearestedge(&lcd->vc, &dist);
 	if (edge != lcd->eed) {
 		lcd->eed = edge;
-		ringsel_find_edge(lcd, C, lcd->ar);
+		ringsel_find_edge(lcd, C, lcd->ar, 1);
 	}
 
 	return OPERATOR_RUNNING_MODAL;
@@ -377,23 +377,49 @@ static int ringcut_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 
 static int ringsel_modal (bContext *C, wmOperator *op, wmEvent *event)
 {
+	int cuts= RNA_int_get(op->ptr,"number_cuts");
 	tringselOpData *lcd= op->customdata;
 
 	view3d_operator_needs_opengl(C);
 
+
 	switch (event->type) {
-		case RIGHTMOUSE:
 		case LEFTMOUSE: /* confirm */ // XXX hardcoded
-			if (event->val == 0) {
+			if (event->val == KM_RELEASE) {
 				/* finish */
 				ED_region_tag_redraw(lcd->ar);
-
+				
 				ringsel_finish(C, op);
 				ringsel_exit(C, op);
 				
 				return OPERATOR_FINISHED;
 			}
-
+			
+			ED_region_tag_redraw(lcd->ar);
+			break;
+		case RIGHTMOUSE: /* abort */ // XXX hardcoded
+		case ESCKEY:
+			if (event->val == KM_RELEASE) {
+				/* cancel */
+				ED_region_tag_redraw(lcd->ar);
+				
+				return ringsel_cancel(C, op);
+			}
+			
+			ED_region_tag_redraw(lcd->ar);
+			break;
+		case WHEELUPMOUSE:  /* change number of cuts */
+			cuts++;
+			RNA_int_set(op->ptr,"number_cuts",cuts);
+			ringsel_find_edge(lcd, C, lcd->ar, cuts);
+			
+			ED_region_tag_redraw(lcd->ar);
+			break;
+		case WHEELDOWNMOUSE:  /* change number of cuts */
+			cuts=MAX2(cuts-1,1);
+			RNA_int_set(op->ptr,"number_cuts",cuts);
+			ringsel_find_edge(lcd, C, lcd->ar,cuts);
+			
 			ED_region_tag_redraw(lcd->ar);
 			break;
 		case MOUSEMOVE: { /* mouse moved somewhere to select another loop */
@@ -406,12 +432,12 @@ static int ringsel_modal (bContext *C, wmOperator *op, wmEvent *event)
 
 			if (edge != lcd->eed) {
 				lcd->eed = edge;
-				ringsel_find_edge(lcd, C, lcd->ar);
+				ringsel_find_edge(lcd, C, lcd->ar, cuts);
 			}
 
 			ED_region_tag_redraw(lcd->ar);
 			break;
-		}
+		}			
 	}
 	
 	/* keep going until the user confirms */
@@ -452,4 +478,7 @@ void MESH_OT_loopcut (wmOperatorType *ot)
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+
+	/* properties */
+	RNA_def_int(ot->srna, "number_cuts", 1, 1, 10, "Number of Cuts", "", 1, INT_MAX);
 }