[Bf-blender-cvs] [55d3277] master: BMesh: use a smaller dist3 threshold

Campbell Barton noreply at git.blender.org
Thu Aug 14 04:58:21 CEST 2014


Commit: 55d3277d0c8939ce6ab9de3a7b34bfc3eec41254
Author: Campbell Barton
Date:   Thu Aug 14 12:49:02 2014 +1000
Branches: master
https://developer.blender.org/rB55d3277d0c8939ce6ab9de3a7b34bfc3eec41254

BMesh: use a smaller dist3 threshold

Matches array modifier remove-doubles

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

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 954f31f..75f9fee 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -529,7 +529,7 @@ static void bmesh_find_doubles_common(BMesh *bm, BMOperator *op,
 
 	const float dist  = BMO_slot_float_get(op->slots_in, "dist");
 	const float dist_sq = dist * dist;
-	const float dist3 = dist * 3.0f;
+	const float dist3 = (M_SQRT3 + 0.00005f) * dist;   /* Just above sqrt(3) */
 
 	/* Test whether keep_verts arg exists and is non-empty */
 	if (BMO_slot_exists(op->slots_in, "keep_verts")) {




More information about the Bf-blender-cvs mailing list