Revision: 46677
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46677
Author: nicholasbishop
Date: 2012-05-16 00:51:36 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Code cleanup: simplify standard GHash creation.
Added four new functions as shortcuts to creating GHashes that use the
standard ptr/str/int/pair hash and compare functions.
GHash *BLI_ghash_ptr_new(const char *info);
GHash *BLI_ghash_str_new(const char *info);
GHash *BLI_ghash_int_new(const char *info);
GHash *BLI_ghash_pair_new(const char *info);
Replaced almost all occurrences of BLI_ghash_new() with one of the
above functions.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/icons.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/blenlib/BLI_ghash.h
trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/blenloader/intern/readblenentry.c
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
trunk/blender/source/blender/bmesh/operators/bmo_hull.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/interface/interface_ops.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
trunk/blender/source/blender/makesdna/intern/dna_genfile.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c
trunk/blender/source/blender/modifiers/intern/MOD_build.c
trunk/blender/source/blender/modifiers/intern/MOD_mask.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/sss.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/blender/windowmanager/intern/wm.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c 2012-05-15
18:50:51 UTC (rev 46676)
+++ trunk/blender/source/blender/blenkernel/intern/action.c 2012-05-16
00:51:36 UTC (rev 46677)
@@ -574,7 +574,7 @@
if (!pose->chanhash) {
bPoseChannel *pchan;
- pose->chanhash = BLI_ghash_new(BLI_ghashutil_strhash,
BLI_ghashutil_strcmp, "make_pose_chan gh");
+ pose->chanhash = BLI_ghash_str_new("make_pose_chan gh");
for (pchan = pose->chanbase.first; pchan; pchan = pchan->next)
BLI_ghash_insert(pose->chanhash, pchan->name, pchan);
}
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-05-15
18:50:51 UTC (rev 46676)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-05-16
00:51:36 UTC (rev 46677)
@@ -867,7 +867,7 @@
}
if (!forest->nodeHash)
- forest->nodeHash = BLI_ghash_new(BLI_ghashutil_ptrhash,
BLI_ghashutil_ptrcmp, "dag_add_node gh");
+ forest->nodeHash = BLI_ghash_ptr_new("dag_add_node gh");
BLI_ghash_insert(forest->nodeHash, fob, node);
}
Modified: trunk/blender/source/blender/blenkernel/intern/icons.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/icons.c 2012-05-15
18:50:51 UTC (rev 46676)
+++ trunk/blender/source/blender/blenkernel/intern/icons.c 2012-05-16
00:51:36 UTC (rev 46677)
@@ -103,7 +103,7 @@
gFirstIconId = first_dyn_id;
if (!gIcons)
- gIcons = BLI_ghash_new(BLI_ghashutil_inthash,
BLI_ghashutil_intcmp, "icons_init gh");
+ gIcons = BLI_ghash_int_new("icons_init gh");
}
void BKE_icons_free(void)
Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c 2012-05-15
18:50:51 UTC (rev 46676)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c 2012-05-16
00:51:36 UTC (rev 46677)
@@ -1304,7 +1304,7 @@
* - this is easier than iterating over all the tracks+strips
hierarchy everytime
* (and probably faster)
*/
- gh = BLI_ghash_new(BLI_ghashutil_strhash, BLI_ghashutil_strcmp,
"nlastrip_validate_name gh");
+ gh = BLI_ghash_str_new("nlastrip_validate_name gh");
for (nlt = adt->nla_tracks.first; nlt; nlt = nlt->next) {
for (tstrip = nlt->strips.first; tstrip; tstrip = tstrip->next)
{
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-05-15
18:50:51 UTC (rev 46676)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-05-16
00:51:36 UTC (rev 46677)
@@ -3669,7 +3669,7 @@
{
if (!sb) return;
sb->scratch = MEM_callocN(sizeof(SBScratch), "SBScratch");
- sb->scratch->colliderhash = BLI_ghash_new(BLI_ghashutil_ptrhash,
BLI_ghashutil_ptrcmp, "sb_new_scratch gh");
+ sb->scratch->colliderhash = BLI_ghash_ptr_new("sb_new_scratch gh");
sb->scratch->bodyface = NULL;
sb->scratch->totface = 0;
sb->scratch->aabbmax[0]=sb->scratch->aabbmax[1]=sb->scratch->aabbmax[2]
= 1.0e30f;
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-05-15
18:50:51 UTC (rev 46676)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-05-16
00:51:36 UTC (rev 46677)
@@ -768,7 +768,7 @@
if (customdata_size)
map->customdata = MEM_callocN(customdata_size*num_tracks,
"TracksMap customdata");
- map->hash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp,
"TracksMap hash");
+ map->hash = BLI_ghash_ptr_new("TracksMap hash");
return map;
}
Modified: trunk/blender/source/blender/blenlib/BLI_ghash.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_ghash.h 2012-05-15 18:50:51 UTC
(rev 46676)
+++ trunk/blender/source/blender/blenlib/BLI_ghash.h 2012-05-16 00:51:36 UTC
(rev 46677)
@@ -147,6 +147,11 @@
unsigned int BLI_ghashutil_inthash(const void *ptr);
int BLI_ghashutil_intcmp(const void *a, const void *b);
+GHash *BLI_ghash_ptr_new(const char *info);
+GHash *BLI_ghash_str_new(const char *info);
+GHash *BLI_ghash_int_new(const char *info);
+GHash *BLI_ghash_pair_new(const char *info);
+
typedef struct GHashPair {
const void *first;
const void *second;
Modified: trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_ghash.c 2012-05-15
18:50:51 UTC (rev 46676)
+++ trunk/blender/source/blender/blenlib/intern/BLI_ghash.c 2012-05-16
00:51:36 UTC (rev 46677)
@@ -305,6 +305,23 @@
return strcmp(a, b);
}
+GHash *BLI_ghash_ptr_new(const char *info)
+{
+ return BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, info);
+}
+GHash *BLI_ghash_str_new(const char *info)
+{
+ return BLI_ghash_new(BLI_ghashutil_strhash, BLI_ghashutil_strcmp, info);
+}
+GHash *BLI_ghash_int_new(const char *info)
+{
+ return BLI_ghash_new(BLI_ghashutil_inthash, BLI_ghashutil_intcmp, info);
+}
+GHash *BLI_ghash_pair_new(const char *info)
+{
+ return BLI_ghash_new(BLI_ghashutil_pairhash, BLI_ghashutil_paircmp,
info);
+}
+
GHashPair *BLI_ghashutil_pairalloc(const void *first, const void *second)
{
GHashPair *pair = MEM_mallocN(sizeof(GHashPair), "GHashPair");
Modified: trunk/blender/source/blender/blenlib/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/pbvh.c 2012-05-15 18:50:51 UTC
(rev 46676)
+++ trunk/blender/source/blender/blenlib/intern/pbvh.c 2012-05-16 00:51:36 UTC
(rev 46677)
@@ -381,7 +381,7 @@
GHash *map;
int i, j, totface;
- map = BLI_ghash_new(BLI_ghashutil_inthash, BLI_ghashutil_intcmp,
"build_mesh_leaf_node gh");
+ map = BLI_ghash_int_new("build_mesh_leaf_node gh");
node->uniq_verts = node->face_verts = 0;
totface = node->totprim;
@@ -1262,7 +1262,7 @@
unsigned i;
int tot;
- map = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp,
"pbvh_get_grid_updates gh");
+ map = BLI_ghash_ptr_new("pbvh_get_grid_updates gh");
pbvh_iter_begin(&iter, bvh, NULL, NULL);
Modified: trunk/blender/source/blender/blenloader/intern/readblenentry.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readblenentry.c
2012-05-15 18:50:51 UTC (rev 46676)
+++ trunk/blender/source/blender/blenloader/intern/readblenentry.c
2012-05-16 00:51:36 UTC (rev 46677)
@@ -221,7 +221,7 @@
LinkNode *BLO_blendhandle_get_linkable_groups(BlendHandle *bh)
{
FileData *fd = (FileData *) bh;
- GHash *gathered = BLI_ghash_new(BLI_ghashutil_ptrhash,
BLI_ghashutil_ptrcmp, "linkable_groups gh");
+ GHash *gathered = BLI_ghash_ptr_new("linkable_groups gh");
LinkNode *names = NULL;
BHead *bhead;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-05-15
18:50:51 UTC (rev 46676)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-05-16
00:51:36 UTC (rev 46677)
@@ -1833,7 +1833,7 @@
int i, maxindex;
BMLoop *nl;
- visithash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp,
__func__);
+ visithash = BLI_ghash_ptr_new(__func__);
maxindex = 0;
BM_ITER_ELEM (e, &eiter, v, BM_EDGES_OF_VERT) {
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-05-15
18:50:51 UTC (rev 46676)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-05-16
00:51:36 UTC (rev 46677)
@@ -624,7 +624,7 @@
int *new_idx = NULL;
/* Init the old-to-new vert pointers mapping */
- vptr_map = BLI_ghash_new(BLI_ghashutil_ptrhash,
BLI_ghashutil_ptrcmp, "BM_mesh_remap vert pointers mapping");
+ vptr_map = BLI_ghash_ptr_new("BM_mesh_remap vert pointers
mapping");
/* Make a copy of all vertices. */
verts_pool = MEM_callocN(sizeof(BMVert *) * totvert,
"BM_mesh_remap verts pool");
@@ -658,7 +658,7 @@
int *new_idx = NULL;
/* Init the old-to-new vert pointers mapping */
- eptr_map = BLI_ghash_new(BLI_ghashutil_ptrhash,
BLI_ghashutil_ptrcmp, "BM_mesh_remap edge pointers mapping");
+ eptr_map = BLI_ghash_ptr_new("BM_mesh_remap edge pointers
mapping");
/* Make a copy of all vertices. */
edges_pool = MEM_callocN(sizeof(BMEdge *) * totedge,
"BM_mesh_remap edges pool");
@@ -691,7 +691,7 @@
int *new_idx = NULL;
/* Init the old-to-new vert pointers mapping */
- fptr_map = BLI_ghash_new(BLI_ghashutil_ptrhash,
BLI_ghashutil_ptrcmp, "BM_mesh_remap face pointers mapping");
+ fptr_map = BLI_ghash_ptr_new("BM_mesh_remap face pointers
mapping");
/* Make a copy of all vertices. */
faces_pool = MEM_callocN(sizeof(BMFace *) * totface,
"BM_mesh_remap faces pool");
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-05-15
18:50:51 UTC (rev 46676)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-05-16
00:51:36 UTC (rev 46677)
@@ -274,7 +274,7 @@
}
if (!dest_slot->data.ghash) {
- dest_slot->data.ghash =
BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "bmesh operator 2");
+ dest_slot->data.ghash = BLI_ghash_ptr_new("bmesh
operator 2");
}
BLI_ghashIterator_init(&it, source_slot->data.ghash);
@@ -556,7 +556,7 @@
memcpy(mapping + 1, data, len);
if (!slot->data.ghash) {
- slot->data.ghash = BLI_ghash_new(BLI_ghashutil_ptrhash,
BLI_ghashutil_ptrcmp, "bmesh slot map hash");
+ slot->data.ghash = BLI_ghash_ptr_new("bmesh slot map hash");
}
BLI_ghash_insert(slot->data.ghash, element, mapping);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
