diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-05-29 08:00:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-13 18:47:12 +0400 |
commit | 365ff6698700fb23c8bd9d0509c49df71180431e (patch) | |
tree | 9f94247268e14830338cd8fdb8bdbb2a26f78bc7 /source/blender/blenkernel | |
parent | 8bd4b7361bb47d5ecaf005ef04ec58cdf73a3a48 (diff) |
GSet, GHash: Add BLI_gset_add, since its common to add members to a set
also rename BLI_edgeset_reinsert -> BLI_edgeset_add, in this case its the same.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 9df527efa21..798633c8c56 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -2805,15 +2805,15 @@ void CDDM_calc_edges_tessface(DerivedMesh *dm) eh = BLI_edgeset_new_ex(__func__, BLI_EDGEHASH_SIZE_GUESS_FROM_POLYS(numFaces)); for (i = 0; i < numFaces; i++, mf++) { - BLI_edgeset_reinsert(eh, mf->v1, mf->v2); - BLI_edgeset_reinsert(eh, mf->v2, mf->v3); + BLI_edgeset_add(eh, mf->v1, mf->v2); + BLI_edgeset_add(eh, mf->v2, mf->v3); if (mf->v4) { - BLI_edgeset_reinsert(eh, mf->v3, mf->v4); - BLI_edgeset_reinsert(eh, mf->v4, mf->v1); + BLI_edgeset_add(eh, mf->v3, mf->v4); + BLI_edgeset_add(eh, mf->v4, mf->v1); } else { - BLI_edgeset_reinsert(eh, mf->v3, mf->v1); + BLI_edgeset_add(eh, mf->v3, mf->v1); } } diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index f5c7f9e4501..885f186faf3 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -1323,14 +1323,14 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm ) /* insert other near springs in edgeset AFTER bending springs are calculated (for selfcolls) */ for (i = 0; i < numedges; i++) { /* struct springs */ - BLI_edgeset_reinsert(edgeset, medge[i].v1, medge[i].v2); + BLI_edgeset_add(edgeset, medge[i].v1, medge[i].v2); } for (i = 0; i < numfaces; i++) { /* edge springs */ if (mface[i].v4) { - BLI_edgeset_reinsert(edgeset, mface[i].v1, mface[i].v3); + BLI_edgeset_add(edgeset, mface[i].v1, mface[i].v3); - BLI_edgeset_reinsert(edgeset, mface[i].v2, mface[i].v4); + BLI_edgeset_add(edgeset, mface[i].v2, mface[i].v4); } } diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index 83e0d1a4740..1218e3a063c 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -71,7 +71,7 @@ static void pbvh_bmesh_node_finalize(PBVH *bvh, int node_index, const int cd_ver v = l_iter->v; if (!BLI_gset_haskey(n->bm_unique_verts, v)) { if (BM_ELEM_CD_GET_INT(v, cd_vert_node_offset) != DYNTOPO_NODE_NONE) { - BLI_gset_reinsert(n->bm_other_verts, v, NULL); + BLI_gset_add(n->bm_other_verts, v); } else { BLI_gset_insert(n->bm_unique_verts, v); diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 7d9ba1661d5..bc3ec2f9681 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -360,7 +360,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss, CCGSubSurf *origss, DerivedMesh *dm, MVert *mv0 = mvert + (ml[j_next].v); MVert *mv1 = mvert + (ml[j].v); - if (BLI_edgeset_reinsert(eset, v0, v1)) { + if (BLI_edgeset_add(eset, v0, v1)) { CCGEdge *e, *orige = ccgSubSurf_getFaceEdge(origf, j_next); CCGEdgeHDL ehdl = SET_INT_IN_POINTER(mp->loopstart + j_next); float crease; |