[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14480] trunk/blender/source/blender/src: bug since 2.45 nobody noticed, canceling retopo would move the vert.

[Campbell Barton]

Revision: 14480
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14480
Author:   campbellbarton
Date:     2008-04-19 21:50:46 +0200 (Sat, 19 Apr 2008)

Log Message:
-----------
bug since 2.45 nobody noticed, canceling retopo would move the vert.

Modified Paths:
--------------
    trunk/blender/source/blender/src/transform_conversions.c
    trunk/blender/source/blender/src/transform_generics.c

Modified: trunk/blender/source/blender/src/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/src/transform_conversions.c	2008-04-19 19:19:39 UTC (rev 14479)
+++ trunk/blender/source/blender/src/transform_conversions.c	2008-04-19 19:50:46 UTC (rev 14480)
@@ -3428,10 +3428,14 @@
 	int cancelled= (t->state == TRANS_CANCEL);
 	
 	if (t->spacetype==SPACE_VIEW3D) {
-		EM_automerge(1);
-		/* when snapping, delay retopo until after automerge */
-		if (G.qual & LR_CTRLKEY) {
-			retopo_do_all();
+		if (G.obedit) {
+			if (cancelled==0) {
+				EM_automerge(1);
+				/* when snapping, delay retopo until after automerge */
+				if (G.qual & LR_CTRLKEY) {
+					retopo_do_all();
+				}
+			}
 		}
 	}
 	if (t->spacetype == SPACE_ACTION) {

Modified: trunk/blender/source/blender/src/transform_generics.c
===================================================================
--- trunk/blender/source/blender/src/transform_generics.c	2008-04-19 19:19:39 UTC (rev 14479)
+++ trunk/blender/source/blender/src/transform_generics.c	2008-04-19 19:50:46 UTC (rev 14480)
@@ -378,14 +378,14 @@
 				if (G.sima->flag & SI_LIVE_UNWRAP)
 					unwrap_lscm_live_re_solve();
 			} else {
-				/* Only retopo if not snapping, Note, this is the only case of G.qual being used, but we have no T_SHIFT_MOD - Campbell */
-				if ((G.qual & LR_CTRLKEY)==0)
-					retopo_do_all();
-	
 				/* mirror modifier clipping? */
-				if(t->state != TRANS_CANCEL)
+				if(t->state != TRANS_CANCEL) {
+					if ((G.qual & LR_CTRLKEY)==0) {
+						/* Only retopo if not snapping, Note, this is the only case of G.qual being used, but we have no T_SHIFT_MOD - Campbell */
+						retopo_do_all();
+					}
 					clipMirrorModifier(t, G.obedit);
-				
+				}
 				if((t->context & CTX_NO_MIRROR) == 0 && (G.scene->toolsettings->editbutflag & B_MESH_X_MIRROR))
 					editmesh_apply_to_mirror(t);