From 998101763aae5b0d25f6fa0f1a3227e45bb03b1e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 19 Jun 2013 19:59:49 +0000 Subject: correct for own regressions when refactoring select-path, was using heap popmin incorrectly. --- source/blender/bmesh/tools/bmesh_path.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'source/blender/bmesh') diff --git a/source/blender/bmesh/tools/bmesh_path.c b/source/blender/bmesh/tools/bmesh_path.c index eda252f18f5..9fc1996e51a 100644 --- a/source/blender/bmesh/tools/bmesh_path.c +++ b/source/blender/bmesh/tools/bmesh_path.c @@ -144,7 +144,8 @@ LinkNode *BM_mesh_calc_path_vert( BLI_heap_insert(heap, 0.0f, v_src); cost[BM_elem_index_get(v_src)] = 0.0f; - while ((v = BLI_heap_popmin(heap))) { + while (!BLI_heap_is_empty(heap)) { + v = BLI_heap_popmin(heap); if (v == v_dst) break; @@ -261,7 +262,8 @@ LinkNode *BM_mesh_calc_path_edge( BLI_heap_insert(heap, 0.0f, e_src); cost[BM_elem_index_get(e_src)] = 0.0f; - while ((e = BLI_heap_popmin(heap))) { + while (!BLI_heap_is_empty(heap)) { + e = BLI_heap_popmin(heap); if (e == e_dst) break; @@ -386,7 +388,8 @@ LinkNode *BM_mesh_calc_path_face( BLI_heap_insert(heap, 0.0f, f_src); cost[BM_elem_index_get(f_src)] = 0.0f; - while ((f = BLI_heap_popmin(heap))) { + while (!BLI_heap_is_empty(heap)) { + f = BLI_heap_popmin(heap); if (f == f_dst) break; -- cgit v1.2.3