[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52834] trunk/blender/source/blender/ editors/mesh/editmesh_knife.c: some of the modal knife key bindings didn' t cause a refresh until you moved the mouse.

Campbell Barton ideasman42 at gmail.com
Mon Dec 10 06:07:52 CET 2012


Revision: 52834
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52834
Author:   campbellbarton
Date:     2012-12-10 05:07:46 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
some of the modal knife key bindings didn't cause a refresh until you moved the mouse. - snap, angle snap, midpoint snap.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_knife.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c	2012-12-10 02:06:26 UTC (rev 52833)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c	2012-12-10 05:07:46 UTC (rev 52834)
@@ -3114,6 +3114,7 @@
 {
 	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 @@
 				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 @@
 				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 @@
 		}
 	}
 
+	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;
 }




More information about the Bf-blender-cvs mailing list