[Bf-blender-cvs] [542a0c4] master: Dyntopo: redundant length check subdividing edges

[Campbell Barton]

Commit: 542a0c41d2c0a77de2d139bac8bc95c029ebf11c
Author: Campbell Barton
Date:   Sun Apr 12 19:14:28 2015 +1000
Branches: master
https://developer.blender.org/rB542a0c41d2c0a77de2d139bac8bc95c029ebf11c

Dyntopo: redundant length check subdividing edges

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

M	source/blender/blenkernel/intern/pbvh_bmesh.c

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

diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index 92fdfa9..26d3a1e 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -862,8 +862,14 @@ static bool pbvh_bmesh_subdivide_long_edges(EdgeQueueContext *eq_ctx, PBVH *bvh,
 		BLI_mempool_free(eq_ctx->pool, pair);
 		pair = NULL;
 
+		/* At the moment edges never get shorter (subdiv will make new edges)
+		 * unlike collapse where edges can become longer. */
+#if 0
 		if (len_squared_v3v3(v1->co, v2->co) <= eq_ctx->q->limit_len_squared)
 			continue;
+#else
+		BLI_assert(len_squared_v3v3(v1->co, v2->co) > eq_ctx->q->limit_len_squared);
+#endif
 
 		/* Check that the edge still exists */
 		if (!(e = BM_edge_exists(v1, v2))) {