[Bf-blender-cvs] [0515703] master: Minor optimization: avoid 2x hash, adding to set
Campbell Barton
noreply at git.blender.org
Sun Feb 28 23:08:12 CET 2016
Commit: 0515703b15e11a3faba9650d12053b40d7db31c4
Author: Campbell Barton
Date: Mon Feb 29 08:48:10 2016 +1100
Branches: master
https://developer.blender.org/rB0515703b15e11a3faba9650d12053b40d7db31c4
Minor optimization: avoid 2x hash, adding to set
===================================================================
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenloader/intern/readblenentry.c
===================================================================
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 2defda1..330b592 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -1264,8 +1264,7 @@ void BKE_pbvh_get_grid_updates(PBVH *bvh, bool clear, void ***r_gridfaces, int *
if (node->flag & PBVH_UpdateNormals) {
for (unsigned i = 0; i < node->totprim; ++i) {
void *face = bvh->gridfaces[node->prim_indices[i]];
- if (!BLI_gset_haskey(face_set, face))
- BLI_gset_insert(face_set, face);
+ BLI_gset_add(face_set, face);
}
if (clear)
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c
index cd6df35..3cae95d 100644
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@ -283,9 +283,8 @@ LinkNode *BLO_blendhandle_get_linkable_groups(BlendHandle *bh)
if (BKE_idcode_is_linkable(bhead->code)) {
const char *str = BKE_idcode_to_name(bhead->code);
- if (!BLI_gset_haskey(gathered, (void *)str)) {
+ if (BLI_gset_add(gathered, (void *)str)) {
BLI_linklist_prepend(&names, strdup(str));
- BLI_gset_insert(gathered, (void *)str);
}
}
}
More information about the Bf-blender-cvs
mailing list