[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12359] trunk/blender/source/blender/src/ editmesh_mods.c: automerge wasnt maintaining totverts (bug #7608)

Campbell Barton cbarton at metavr.com
Tue Oct 23 17:25:59 CEST 2007


Revision: 12359
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12359
Author:   campbellbarton
Date:     2007-10-23 17:25:59 +0200 (Tue, 23 Oct 2007)

Log Message:
-----------
automerge wasnt maintaining totverts (bug #7608)

Modified Paths:
--------------
    trunk/blender/source/blender/src/editmesh_mods.c

Modified: trunk/blender/source/blender/src/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/src/editmesh_mods.c	2007-10-23 14:48:32 UTC (rev 12358)
+++ trunk/blender/source/blender/src/editmesh_mods.c	2007-10-23 15:25:59 UTC (rev 12359)
@@ -132,9 +132,12 @@
 }
 
 void EM_automerge(int update) {
+	int len;
 	if  (G.scene->automerge) {
 		if (G.obedit && G.obedit->type==OB_MESH) {
-			if (removedoublesflag(1, 1, G.scene->toolsettings->doublimit)) {
+			len = removedoublesflag(1, 1, G.scene->toolsettings->doublimit);
+			if (len) {
+				G.totvert -= len; /* saves doing a countall */
 				if (update) {
 					DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
 				}





More information about the Bf-blender-cvs mailing list