[Bf-blender-cvs] [24448e1] master: Correct own error in recent sculpt changes
Campbell Barton
noreply at git.blender.org
Sun Apr 26 19:37:00 CEST 2015
Commit: 24448e11fb4cdaaef3f1b2652e69d57bb903fcc1
Author: Campbell Barton
Date: Mon Apr 27 03:34:13 2015 +1000
Branches: master
https://developer.blender.org/rB24448e11fb4cdaaef3f1b2652e69d57bb903fcc1
Correct own error in recent sculpt changes
mixed up squared nonsquared length, also remove invalid verify check.
===================================================================
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 bc193b7..02b8cdb 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -799,7 +799,7 @@ static void long_edge_queue_face_add(
if (len_sq > eq_ctx->q->limit_len_squared) {
long_edge_queue_edge_add_recursive(
eq_ctx, l_iter->radial_next, l_iter,
- len_sq, eq_ctx->q->limit_len_squared);
+ len_sq, eq_ctx->q->limit_len);
}
#else
long_edge_queue_edge_add(eq_ctx, l_iter->e);
@@ -1051,11 +1051,6 @@ static bool pbvh_bmesh_subdivide_long_edges(
{
bool any_subdivided = false;
-#ifdef USE_EDGEQUEUE_TAG_VERIFY
- pbvh_bmesh_edge_tag_verify(bvh);
-#endif
-
-
while (!BLI_heap_is_empty(eq_ctx->q->heap)) {
BMVert **pair = BLI_heap_popmin(eq_ctx->q->heap);
BMVert *v1 = pair[0], *v2 = pair[1];
More information about the Bf-blender-cvs
mailing list