Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-08-28 02:38:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-08-28 02:38:55 +0400
commitd5469dd5c2abdd677f094ea1d2969b55d23e3ea4 (patch)
treef21a9b2ba5c433d35e6333fbdb22fbcf9077e048 /source/blender/bmesh/operators/bmo_removedoubles.c
parentb7a3a3894efdefb935634784265a4a56bf893cba (diff)
mesh remove doubles was adding verts into the weld_verts.targetmap multiple times (new paranoid asserts find this stuff).
Diffstat (limited to 'source/blender/bmesh/operators/bmo_removedoubles.c')
-rw-r--r--source/blender/bmesh/operators/bmo_removedoubles.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c
index 514d8e15845..96265604e09 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -500,6 +500,11 @@ static void bmesh_find_doubles_common(BMesh *bm, BMOperator *op,
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. */