Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-12-10 09:07:46 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-12-10 09:07:46 +0400
commit27ddd17ef9d2de30345449d3c01a486b855a4f26 (patch)
tree941ec7345ab533bed394243279eac494f376e535
parent9e5dc7de01f63827706e8a7ed83629801d60af53 (diff)
some of the modal knife key bindings didn't cause a refresh until you moved the mouse. - snap, angle snap, midpoint snap.
-rw-r--r--source/blender/editors/mesh/editmesh_knife.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index d5cf174b1a1..babb79acb05 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -3114,6 +3114,7 @@ static int knifetool_modal(bContext *C, wmOperator *op, wmEvent *event)
{
Object *obedit = CTX_data_edit_object(C);
KnifeTool_OpData *kcd = op->customdata;
+ int do_refresh = FALSE;
if (!obedit || obedit->type != OB_MESH || BMEdit_FromObject(obedit) != kcd->em) {
knifetool_exit(C, op);
@@ -3153,6 +3154,7 @@ static int knifetool_modal(bContext *C, wmOperator *op, wmEvent *event)
knife_update_active(kcd);
knife_update_header(C, kcd);
ED_region_tag_redraw(kcd->ar);
+ do_refresh = TRUE;
break;
case KNF_MODAL_MIDPOINT_OFF:
kcd->snap_midpoints = 0;
@@ -3161,25 +3163,29 @@ static int knifetool_modal(bContext *C, wmOperator *op, wmEvent *event)
knife_update_active(kcd);
knife_update_header(C, kcd);
ED_region_tag_redraw(kcd->ar);
+ do_refresh = TRUE;
break;
case KNF_MODEL_IGNORE_SNAP_ON:
ED_region_tag_redraw(kcd->ar);
kcd->ignore_vert_snapping = kcd->ignore_edge_snapping = 1;
knife_update_header(C, kcd);
+ do_refresh = TRUE;
break;
case KNF_MODEL_IGNORE_SNAP_OFF:
ED_region_tag_redraw(kcd->ar);
kcd->ignore_vert_snapping = kcd->ignore_edge_snapping = 0;
knife_update_header(C, kcd);
+ do_refresh = TRUE;
break;
case KNF_MODAL_ANGLE_SNAP_TOGGLE:
kcd->angle_snapping = !kcd->angle_snapping;
knife_update_header(C, kcd);
+ do_refresh = TRUE;
break;
case KNF_MODAL_CUT_THROUGH_TOGGLE:
kcd->cut_through = !kcd->cut_through;
- knifetool_update_mval(kcd, event->mval); /* refresh knife path */
knife_update_header(C, kcd);
+ do_refresh = TRUE;
break;
case KNF_MODAL_NEW_CUT:
ED_region_tag_redraw(kcd->ar);
@@ -3232,6 +3238,12 @@ static int knifetool_modal(bContext *C, wmOperator *op, wmEvent *event)
}
}
+ if (do_refresh) {
+ /* we don't really need to update mval,
+ * but this happens to be the best way to refresh at the moment */
+ knifetool_update_mval(kcd, event->mval);
+ }
+
/* keep going until the user confirms */
return OPERATOR_RUNNING_MODAL;
}