[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59577] trunk/blender/source/blender/bmesh /operators/bmo_removedoubles.c: mesh remove doubles was adding verts into the weld_verts. targetmap multiple times (new paranoid asserts find this stuff).

[Campbell Barton]

Revision: 59577
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59577
Author:   campbellbarton
Date:     2013-08-27 22:38:55 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
mesh remove doubles was adding verts into the weld_verts.targetmap multiple times (new paranoid asserts find this stuff).

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c	2013-08-27 22:33:32 UTC (rev 59576)
+++ trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c	2013-08-27 22:38:55 UTC (rev 59577)
@@ -500,6 +500,11 @@
 		for (j = i + 1; j < verts_len; j++) {
 			BMVert *v_other = verts[j];
 
+			/* a match has already been found, (we could check which is best, for now don't) */
+			if (BMO_elem_flag_test(bm, v_other, VERT_DOUBLE)) {
+				continue;
+			}
+
 			/* Compare sort values of the verts using 3x tolerance (allowing for the tolerance
 			 * on each of the three axes). This avoids the more expensive length comparison
 			 * for most vertex pairs. */