Followup to previous commit: fix same wrong numinput handling in other modal ops.

Also stumbled uppon 'move marker' code, was needing a bunch of fixes, cleanup and simplification,
and added a candy feature - now you will enter numinput values in seconds when editor is
in 'time' mode, instead of frames!

3 files changed, 83 insertions, 100 deletions

diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c
index 02d54f7d7e1..545ecbaebe4 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -73,7 +73,7 @@ typedef struct {
 
 #define HEADER_LENGTH 180
 
-static void edbm_bevel_update_header(wmOperator *op, bContext *C)
+static void edbm_bevel_update_header(bContext *C, wmOperator *op)
 {
 	const char *str = IFACE_("Confirm: (Enter/LMB), Cancel: (Esc/RMB), Mode: %s (M), Offset: %s, Segments: %d");
 
@@ -262,7 +262,7 @@ static int edbm_bevel_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 	opdata->initial_length = len_v2(mlen);
 	opdata->pixel_size = rv3d ? ED_view3d_pixel_size(rv3d, center_3d) : 1.0f;
 
-	edbm_bevel_update_header(op, C);
+	edbm_bevel_update_header(C, op);
 
 	if (!edbm_bevel_calc(op)) {
 		edbm_bevel_cancel(C, op);
@@ -329,7 +329,7 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
 		applyNumInput(&opdata->num_input, &value);
 		RNA_float_set(op->ptr, "offset", value);
 		edbm_bevel_calc(op);
-		edbm_bevel_update_header(op, C);
+		edbm_bevel_update_header(C, op);
 		return OPERATOR_RUNNING_MODAL;
 	}
 	else {
@@ -346,7 +346,7 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
 					RNA_float_set(op->ptr, "offset", factor);
 
 					edbm_bevel_calc(op);
-					edbm_bevel_update_header(op, C);
+					edbm_bevel_update_header(C, op);
 					handled = true;
 				}
 				break;
@@ -371,7 +371,7 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				segments++;
 				RNA_int_set(op->ptr, "segments", segments);
 				edbm_bevel_calc(op);
-				edbm_bevel_update_header(op, C);
+				edbm_bevel_update_header(C, op);
 				handled = true;
 				break;
 
@@ -383,7 +383,7 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				segments = max_ii(segments - 1, 1);
 				RNA_int_set(op->ptr, "segments", segments);
 				edbm_bevel_calc(op);
-				edbm_bevel_update_header(op, C);
+				edbm_bevel_update_header(C, op);
 				handled = true;
 				break;
 
@@ -405,7 +405,7 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
 					RNA_float_set(op->ptr, "offset", edbm_bevel_mval_factor(op, event));
 				}
 				edbm_bevel_calc(op);
-				edbm_bevel_update_header(op, C);
+				edbm_bevel_update_header(C, op);
 				handled = true;
 				break;
 		}
@@ -416,7 +416,7 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			applyNumInput(&opdata->num_input, &value);
 			RNA_float_set(op->ptr, "offset", value);
 			edbm_bevel_calc(op);
-			edbm_bevel_update_header(op, C);
+			edbm_bevel_update_header(C, op);
 			return OPERATOR_RUNNING_MODAL;
 		}
 	}
diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c
index dc40330b309..4a552d0fbd3 100644
--- a/source/blender/editors/mesh/editmesh_inset.c
+++ b/source/blender/editors/mesh/editmesh_inset.c
@@ -297,25 +297,24 @@ static int edbm_inset_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 static int edbm_inset_modal(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	InsetData *opdata = op->customdata;
-
-	if (event->val == KM_PRESS && hasNumInput(&opdata->num_input)) {
-		/* Modal numinput active, try to handle numeric inputs first... */
-		if (handleNumInput(C, &opdata->num_input, event)) {
-			float amounts[2] = {RNA_float_get(op->ptr, "thickness"),
-			                    RNA_float_get(op->ptr, "depth")};
-			applyNumInput(&opdata->num_input, amounts);
-			amounts[0] = max_ff(amounts[0], 0.0f);
-			RNA_float_set(op->ptr, "thickness", amounts[0]);
-			RNA_float_set(op->ptr, "depth", amounts[1]);
-
-			if (edbm_inset_calc(op)) {
-				edbm_inset_update_header(op, C);
-				return OPERATOR_RUNNING_MODAL;
-			}
-			else {
-				edbm_inset_cancel(C, op);
-				return OPERATOR_CANCELLED;
-			}
+	const bool has_numinput = hasNumInput(&opdata->num_input);
+
+	/* Modal numinput active, try to handle numeric inputs first... */
+	if (event->val == KM_PRESS && has_numinput && handleNumInput(C, &opdata->num_input, event)) {
+		float amounts[2] = {RNA_float_get(op->ptr, "thickness"),
+		                    RNA_float_get(op->ptr, "depth")};
+		applyNumInput(&opdata->num_input, amounts);
+		amounts[0] = max_ff(amounts[0], 0.0f);
+		RNA_float_set(op->ptr, "thickness", amounts[0]);
+		RNA_float_set(op->ptr, "depth", amounts[1]);
+
+		if (edbm_inset_calc(op)) {
+			edbm_inset_update_header(op, C);
+			return OPERATOR_RUNNING_MODAL;
+		}
+		else {
+			edbm_inset_cancel(C, op);
+			return OPERATOR_CANCELLED;
 		}
 	}
 	else {
@@ -327,7 +326,7 @@ static int edbm_inset_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				return OPERATOR_CANCELLED;
 
 			case MOUSEMOVE:
-				if (!hasNumInput(&opdata->num_input)) {
+				if (!has_numinput) {
 					float mdiff[2];
 					float amount;
 
@@ -455,24 +454,22 @@ static int edbm_inset_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				break;
 		}
 
-		if (!handled && event->val == KM_PRESS) {
-			/* Modal numinput inactive, try to handle numeric inputs last... */
-			if (handleNumInput(C, &opdata->num_input, event)) {
-				float amounts[2] = {RNA_float_get(op->ptr, "thickness"),
-				                    RNA_float_get(op->ptr, "depth")};
-				applyNumInput(&opdata->num_input, amounts);
-				amounts[0] = max_ff(amounts[0], 0.0f);
-				RNA_float_set(op->ptr, "thickness", amounts[0]);
-				RNA_float_set(op->ptr, "depth", amounts[1]);
-
-				if (edbm_inset_calc(op)) {
-					edbm_inset_update_header(op, C);
-					return OPERATOR_RUNNING_MODAL;
-				}
-				else {
-					edbm_inset_cancel(C, op);
-					return OPERATOR_CANCELLED;
-				}
+		/* Modal numinput inactive, try to handle numeric inputs last... */
+		if (!handled && event->val == KM_PRESS && handleNumInput(C, &opdata->num_input, event)) {
+			float amounts[2] = {RNA_float_get(op->ptr, "thickness"),
+			                    RNA_float_get(op->ptr, "depth")};
+			applyNumInput(&opdata->num_input, amounts);
+			amounts[0] = max_ff(amounts[0], 0.0f);
+			RNA_float_set(op->ptr, "thickness", amounts[0]);
+			RNA_float_set(op->ptr, "depth", amounts[1]);
+
+			if (edbm_inset_calc(op)) {
+				edbm_inset_update_header(op, C);
+				return OPERATOR_RUNNING_MODAL;
+			}
+			else {
+				edbm_inset_cancel(C, op);
+				return OPERATOR_CANCELLED;
 			}
 		}
 	}
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index bb044f39fba..3329d25d0f0 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -555,39 +555,27 @@ static int loopcut_modal(bContext *C, wmOperator *op, const wmEvent *event)
 	int cuts = RNA_int_get(op->ptr, "number_cuts");
 	RingSelOpData *lcd = op->customdata;
 	bool show_cuts = false;
+	const bool has_numinput = hasNumInput(&lcd->num);
 
 	view3d_operator_needs_opengl(C);
 
 	/* using the keyboard to input the number of cuts */
-	if (event->val == KM_PRESS && hasNumInput(&lcd->num)) {
-		/* Modal numinput active, try to handle numeric inputs first... */
-		if (handleNumInput(C, &lcd->num, event)) {
-			float values[2] = {(float)cuts, smoothness};
-			applyNumInput(&lcd->num, values);
-			
-			/* allow zero so you can backspace and type in a value
-			 * otherwise 1 as minimum would make more sense */
-			cuts = CLAMPIS(values[0], 0, SUBD_CUTS_MAX);
-			smoothness = CLAMPIS(values[1], -SUBD_SMOOTH_MAX, SUBD_SMOOTH_MAX);
-			
-			RNA_int_set(op->ptr, "number_cuts", cuts);
-			ringsel_find_edge(lcd, cuts);
-			show_cuts = true;
-			RNA_float_set(op->ptr, "smoothness", smoothness);
-			
-			ED_region_tag_redraw(lcd->ar);
-		}
-		else {
-			switch (event->type) {
-				case RETKEY:
-				case PADENTER:
-				case LEFTMOUSE: /* confirm */ // XXX hardcoded
-					return loopcut_finish(lcd, C, op);
-				default:
-					/* do nothing */;
-					break;
-			}
-		}
+	/* Modal numinput active, try to handle numeric inputs first... */
+	if (event->val == KM_PRESS && has_numinput && handleNumInput(C, &lcd->num, event)) {
+		float values[2] = {(float)cuts, smoothness};
+		applyNumInput(&lcd->num, values);
+
+		/* allow zero so you can backspace and type in a value
+		 * otherwise 1 as minimum would make more sense */
+		cuts = CLAMPIS(values[0], 0, SUBD_CUTS_MAX);
+		smoothness = CLAMPIS(values[1], -SUBD_SMOOTH_MAX, SUBD_SMOOTH_MAX);
+
+		RNA_int_set(op->ptr, "number_cuts", cuts);
+		ringsel_find_edge(lcd, cuts);
+		show_cuts = true;
+		RNA_float_set(op->ptr, "smoothness", smoothness);
+
+		ED_region_tag_redraw(lcd->ar);
 	}
 	else {
 		bool handled = false;
@@ -663,35 +651,33 @@ static int loopcut_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				handled = true;
 				break;
 			case MOUSEMOVE:  /* mouse moved somewhere to select another loop */
-			{
-				lcd->vc.mval[0] = event->mval[0];
-				lcd->vc.mval[1] = event->mval[1];
-				loopcut_mouse_move(lcd, cuts);
+				if (!has_numinput) {
+					lcd->vc.mval[0] = event->mval[0];
+					lcd->vc.mval[1] = event->mval[1];
+					loopcut_mouse_move(lcd, cuts);
 
-				ED_region_tag_redraw(lcd->ar);
-				handled = true;
+					ED_region_tag_redraw(lcd->ar);
+					handled = true;
+				}
 				break;
-			}
 		}
 
-		if (!handled && event->val == KM_PRESS) {
-			/* Modal numinput inactive, try to handle numeric inputs last... */
-			if (handleNumInput(C, &lcd->num, event)) {
-				float values[2] = {(float)cuts, smoothness};
-				applyNumInput(&lcd->num, values);
-				
-				/* allow zero so you can backspace and type in a value
-				 * otherwise 1 as minimum would make more sense */
-				cuts = CLAMPIS(values[0], 0, SUBD_CUTS_MAX);
-				smoothness = CLAMPIS(values[1], -SUBD_SMOOTH_MAX, SUBD_SMOOTH_MAX);
-				
-				RNA_int_set(op->ptr, "number_cuts", cuts);
-				ringsel_find_edge(lcd, cuts);
-				show_cuts = true;
-				RNA_float_set(op->ptr, "smoothness", smoothness);
-				
-				ED_region_tag_redraw(lcd->ar);
-			}
+		/* Modal numinput inactive, try to handle numeric inputs last... */
+		if (!handled && event->val == KM_PRESS && handleNumInput(C, &lcd->num, event)) {
+			float values[2] = {(float)cuts, smoothness};
+			applyNumInput(&lcd->num, values);
+
+			/* allow zero so you can backspace and type in a value
+			 * otherwise 1 as minimum would make more sense */
+			cuts = CLAMPIS(values[0], 0, SUBD_CUTS_MAX);
+			smoothness = CLAMPIS(values[1], -SUBD_SMOOTH_MAX, SUBD_SMOOTH_MAX);
+
+			RNA_int_set(op->ptr, "number_cuts", cuts);
+			ringsel_find_edge(lcd, cuts);
+			show_cuts = true;
+			RNA_float_set(op->ptr, "smoothness", smoothness);
+
+			ED_region_tag_redraw(lcd->ar);
 		}
 	}