diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-02-06 07:31:08 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-06 07:34:36 +0300 |
| commit | f9f04726e5a4387d89edb3f067f6f0e4dff58a28 (patch) | |
| tree | 2e0ceb1787e12ccca1e7d4d96d9aa5e648e17dde /source/blender/blenkernel/intern/pbvh.c | |
| parent | 4cbf2ebdc924db94681bb154e58385f32d1ba9a3 (diff) | |
GHash: no need to malloc iterators
Diffstat (limited to 'source/blender/blenkernel/intern/pbvh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index bd953890443..5e07437d426 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -281,7 +281,7 @@ static int map_insert_vert(PBVH *bvh, GHash *map, /* Find vertices used by the faces in this node and update the draw buffers */ static void build_mesh_leaf_node(PBVH *bvh, PBVHNode *node) { - GHashIterator *iter; + GHashIterator gh_iter; GHash *map; int i, j, totface; bool has_visible = false; @@ -314,22 +314,17 @@ static void build_mesh_leaf_node(PBVH *bvh, PBVHNode *node) "bvh node vert indices"); /* Build the vertex list, unique verts first */ - for (iter = BLI_ghashIterator_new(map), i = 0; - BLI_ghashIterator_done(iter) == false; - BLI_ghashIterator_step(iter), ++i) - { - void *value = BLI_ghashIterator_getValue(iter); + GHASH_ITER (gh_iter, map) { + void *value = BLI_ghashIterator_getValue(&gh_iter); int ndx = GET_INT_FROM_POINTER(value); if (ndx < 0) ndx = -ndx + node->uniq_verts - 1; node->vert_indices[ndx] = - GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(iter)); + GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&gh_iter)); } - BLI_ghashIterator_free(iter); - for (i = 0; i < totface; ++i) { MFace *f = bvh->faces + node->prim_indices[i]; int sides = f->v4 ? 4 : 3; |