diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-26 00:03:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-26 00:03:45 +0400 |
| commit | bbce51d11691acc561f1684c20e60613941d4e9b (patch) | |
| tree | ada2418ebb181015b561df9e9c92035ee2a84b43 /source/blender/blenkernel/BKE_pbvh.h | |
| parent | 1d5eff36f5bd7fc7986e59d4dbe7b885ccb50e61 (diff) | |
replace hashes with sets where possible.
Diffstat (limited to 'source/blender/blenkernel/BKE_pbvh.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_pbvh.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h index 7d3d8d7dcbd..36806c8713c 100644 --- a/source/blender/blenkernel/BKE_pbvh.h +++ b/source/blender/blenkernel/BKE_pbvh.h @@ -172,8 +172,8 @@ int BKE_pbvh_node_planes_contain_AABB(PBVHNode *node, void *data); /* test if AABB is at least partially outside the planes' volume */ int BKE_pbvh_node_planes_exclude_AABB(PBVHNode *node, void *data); -struct GHash *BKE_pbvh_bmesh_node_unique_verts(PBVHNode *node); -struct GHash *BKE_pbvh_bmesh_node_other_verts(PBVHNode *node); +struct GSet *BKE_pbvh_bmesh_node_unique_verts(PBVHNode *node); +struct GSet *BKE_pbvh_bmesh_node_other_verts(PBVHNode *node); void BKE_pbvh_bmesh_node_save_orig(PBVHNode *node); void BKE_pbvh_bmesh_after_stroke(PBVH *bvh); @@ -235,8 +235,8 @@ typedef struct PBVHVertexIter { float *vmask; /* bmesh */ - struct GHashIterator bm_unique_verts; - struct GHashIterator bm_other_verts; + struct GSetIterator bm_unique_verts; + struct GSetIterator bm_other_verts; struct CustomData *bm_vdata; /* result: these are all computed in the macro, but we assume @@ -294,13 +294,13 @@ void pbvh_vertex_iter_init(PBVH *bvh, PBVHNode *node, vi.mask = &vi.vmask[vi.vert_indices[vi.gx]]; \ } \ else { \ - if (!BLI_ghashIterator_done(&vi.bm_unique_verts)) {\ - vi.bm_vert = BLI_ghashIterator_getKey(&vi.bm_unique_verts); \ - BLI_ghashIterator_step(&vi.bm_unique_verts); \ + if (!BLI_gsetIterator_done(&vi.bm_unique_verts)) {\ + vi.bm_vert = BLI_gsetIterator_getKey(&vi.bm_unique_verts); \ + BLI_gsetIterator_step(&vi.bm_unique_verts); \ } \ else { \ - vi.bm_vert = BLI_ghashIterator_getKey(&vi.bm_other_verts); \ - BLI_ghashIterator_step(&vi.bm_other_verts); \ + vi.bm_vert = BLI_gsetIterator_getKey(&vi.bm_other_verts); \ + BLI_gsetIterator_step(&vi.bm_other_verts); \ } \ if (mode == PBVH_ITER_UNIQUE && \ BM_elem_flag_test(vi.bm_vert, BM_ELEM_HIDDEN)) \ |