[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14003] trunk/blender/source/blender/src: bugfix for [#8433] Retopo doesn't work with AutoMerge Editing.

[Campbell Barton]

Revision: 14003
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14003
Author:   campbellbarton
Date:     2008-03-07 23:01:52 +0100 (Fri, 07 Mar 2008)

Log Message:
-----------
bugfix for [#8433] Retopo doesn't work with AutoMerge Editing.
Disable retopo while snapping, then run after. This means automerge happens first which is more useful.

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

Modified: trunk/blender/source/blender/src/filesel.c
===================================================================
--- trunk/blender/source/blender/src/filesel.c	2008-03-07 16:28:51 UTC (rev 14002)
+++ trunk/blender/source/blender/src/filesel.c	2008-03-07 22:01:52 UTC (rev 14003)
@@ -1041,7 +1041,7 @@
 	else loadbutton= 0;
 
 	uiBlockBeginAlign(block);
-	uiDefBut(block, TEX, B_FS_DIRNAME,"",	textrct.xmin + (strp?20:0), filebuty2, textrct.xmax-textrct.xmin-loadbutton - (strp?20:0), 21, sfile->dir, 0.0, (float)FILE_MAXDIR-1, 0, 0, "Directory, enter a directory and press enter to create it"); /* Directory input */
+	uiDefBut(block, TEX, B_FS_DIRNAME,"",	textrct.xmin + (strp?20:0), filebuty2, textrct.xmax-textrct.xmin-loadbutton - (strp?20:0), 21, sfile->dir, 0.0, (float)FILE_MAXDIR-1, 0, 0, "Directory, enter a directory and press enter to create it, Substitute ~ for home"); /* Directory input */
 	if(loadbutton) {
 		uiSetCurFont(block, UI_HELV);
 		uiDefBut(block, BUT, B_FS_LOAD, sfile->title,	textrct.xmax-loadbutton, filebuty2, loadbutton, 21, sfile->dir, 0.0, (float)FILE_MAXFILE-1, 0, 0, "");

Modified: trunk/blender/source/blender/src/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/src/transform_conversions.c	2008-03-07 16:28:51 UTC (rev 14002)
+++ trunk/blender/source/blender/src/transform_conversions.c	2008-03-07 22:01:52 UTC (rev 14003)
@@ -3417,9 +3417,13 @@
 	short redrawipo=0, resetslowpar=1;
 	int cancelled= (t->state == TRANS_CANCEL);
 	
-	if (t->spacetype==SPACE_VIEW3D)
+	if (t->spacetype==SPACE_VIEW3D) {
 		EM_automerge(1);
-	
+		/* when snapping, delay retopo until after automerge */
+		if (G.qual & LR_CTRLKEY) {
+			retopo_do_all();
+		}
+	}
 	if (t->spacetype == SPACE_ACTION) {
 		void *data;
 		short datatype;

Modified: trunk/blender/source/blender/src/transform_generics.c
===================================================================
--- trunk/blender/source/blender/src/transform_generics.c	2008-03-07 16:28:51 UTC (rev 14002)
+++ trunk/blender/source/blender/src/transform_generics.c	2008-03-07 22:01:52 UTC (rev 14003)
@@ -378,8 +378,9 @@
 				if (G.sima->flag & SI_LIVE_UNWRAP)
 					unwrap_lscm_live_re_solve();
 			} else {
-			
-				retopo_do_all();
+				/* 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)