[Bf-blender-cvs] [374ddd022c2] blender-v2.79-release: BMesh: use predictable order for remove-doubles

[Campbell Barton]

Commit: 374ddd022c21dd4cb9739a6ec8e13999711ffd5b
Author: Campbell Barton
Date:   Sat Sep 2 03:27:55 2017 +1000
Branches: blender-v2.79-release
https://developer.blender.org/rB374ddd022c21dd4cb9739a6ec8e13999711ffd5b

BMesh: use predictable order for remove-doubles

Each qsort implementation may give different results when values match.

Now fallback to sorting by index.

===================================================================

M	source/blender/bmesh/operators/bmo_removedoubles.c

===================================================================

diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c
index 7d19d90807a..f2f5debe73a 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -285,6 +285,13 @@ static int vergaverco(const void *e1, const void *e2)
 
 	if      (x1 > x2) return  1;
 	else if (x1 < x2) return -1;
+
+	const int i1 = BM_elem_index_get(v1);
+	const int i2 = BM_elem_index_get(v2);
+
+	if      (i1 > i2) return  1;
+	else if (i1 < i2) return -1;
+
 	else return 0;
 }
 
@@ -602,6 +609,12 @@ static void bmesh_find_doubles_common(
 	/* get the verts as an array we can sort */
 	verts = BMO_slot_as_arrayN(op->slots_in, "verts", &verts_len);
 
+	/* Ensure indices are different so we have a predictable order when values match. */
+	for (i = 0; i < verts_len; i++) {
+		BM_elem_index_set(verts[i], i);  /* set_dirty! */
+	}
+	bm->elem_index_dirty |= BM_VERT;
+
 	/* sort by vertex coordinates added together */
 	qsort(verts, verts_len, sizeof(BMVert *), vergaverco);