[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59578] trunk/blender/source/blender/bmesh /operators/bmo_removedoubles.c: remove doubles: source/ target can be swapped, check both flags.
Campbell Barton
ideasman42 at gmail.com
Wed Aug 28 01:23:20 CEST 2013
Revision: 59578
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59578
Author: campbellbarton
Date: 2013-08-27 23:23:19 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
remove doubles: source/target can be swapped, check both flags.
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:38:55 UTC (rev 59577)
+++ trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c 2013-08-27 23:23:19 UTC (rev 59578)
@@ -493,7 +493,7 @@
for (i = 0; i < verts_len; i++) {
BMVert *v_check = verts[i];
- if (BMO_elem_flag_test(bm, v_check, VERT_DOUBLE)) {
+ if (BMO_elem_flag_test(bm, v_check, VERT_DOUBLE | VERT_TARGET)) {
continue;
}
@@ -501,7 +501,7 @@
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)) {
+ if (BMO_elem_flag_test(bm, v_other, VERT_DOUBLE | VERT_TARGET)) {
continue;
}
More information about the Bf-blender-cvs
mailing list