archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

add hash function BLI_ghash_assign, BLI_edgehash_assign

Browse Source 
avoids remove,insert and only hashes the key once.
This commit is contained in:
Campbell Barton
2013-08-18 03:41:39 +00:00
parent 7cce556344
commit 754b4ab3bc
8 changed files with 172 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/object_deform.c
View File

@@ -100,11 +100,13 @@ bool *BKE_objdef_validmap_get(Object *ob, const int defbase_tot)
bPoseChannel *chan;
for (chan = pose->chanbase.first; chan; chan = chan->next) {
void **val_p;
if (chan->bone->flag & BONE_NO_DEFORM)
continue;
if (BLI_ghash_remove(gh, chan->name, NULL, NULL)) {
BLI_ghash_insert(gh, chan->name, SET_INT_IN_POINTER(1));
val_p = BLI_ghash_lookup_p(gh, chan->name);
if (val_p) {
*val_p = SET_INT_IN_POINTER(1);
}
}
}

6
source/blender/blenkernel/intern/pbvh_bmesh.c
View File

@@ -367,12 +367,12 @@ static void pbvh_bmesh_vert_ownership_transfer(PBVH *bvh, PBVHNode *new_owner,
BLI_assert(current_owner != new_owner);
/* Remove current ownership */
BLI_ghash_remove(bvh->bm_vert_to_node, v, NULL, NULL);
// BLI_ghash_remove(bvh->bm_vert_to_node, v, NULL, NULL); // assign handles below
BLI_ghash_remove(current_owner->bm_unique_verts, v, NULL, NULL);
/* Set new ownership */
BLI_ghash_insert(bvh->bm_vert_to_node, v,
SET_INT_IN_POINTER(new_owner - bvh->nodes));
BLI_ghash_assign(bvh->bm_vert_to_node, v,
SET_INT_IN_POINTER(new_owner - bvh->nodes), NULL, NULL);
BLI_ghash_insert(new_owner->bm_unique_verts, v, NULL);
BLI_ghash_remove(new_owner->bm_other_verts, v, NULL, NULL);
BLI_assert(!BLI_ghash_haskey(new_owner->bm_other_verts, v));