Revision: 28640
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28640
Author: campbellbarton
Date: 2010-05-07 09:54:25 +0200 (Fri, 07 May 2010)
Log Message:
-----------
ghash alloc string from render branch
svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25
-r28571:28573
svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25
-r28575:28576
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/BME_tools.c
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/blenlib/BLI_ghash.h
trunk/blender/source/blender/blenlib/intern/BLI_args.c
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/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/mesh/editmesh_loop.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/meshtools.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.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/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/gameengine/Converter/BL_ArmatureObject.cpp
Modified: trunk/blender/source/blender/blenkernel/intern/BME_tools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/BME_tools.c 2010-05-07
07:31:39 UTC (rev 28639)
+++ trunk/blender/source/blender/blenkernel/intern/BME_tools.c 2010-05-07
07:54:25 UTC (rev 28640)
@@ -49,7 +49,7 @@
BME_TransData_Head *td;
td = MEM_callocN(sizeof(BME_TransData_Head), "BMesh transdata header");
- td->gh = BLI_ghash_new(BLI_ghashutil_ptrhash,BLI_ghashutil_ptrcmp);
+ td->gh = BLI_ghash_new(BLI_ghashutil_ptrhash,BLI_ghashutil_ptrcmp,
"BME_init_transdata gh");
td->ma = BLI_memarena_new(bufsize, "BME_TransData arena");
BLI_memarena_use_calloc(td->ma);
Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c 2010-05-07
07:31:39 UTC (rev 28639)
+++ trunk/blender/source/blender/blenkernel/intern/action.c 2010-05-07
07:54:25 UTC (rev 28640)
@@ -549,7 +549,7 @@
if(!pose->chanhash) {
bPoseChannel *pchan;
- pose->chanhash= BLI_ghash_new(BLI_ghashutil_strhash,
BLI_ghashutil_strcmp);
+ pose->chanhash= BLI_ghash_new(BLI_ghashutil_strhash,
BLI_ghashutil_strcmp, "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 2010-05-07
07:31:39 UTC (rev 28639)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2010-05-07
07:54:25 UTC (rev 28640)
@@ -803,7 +803,7 @@
}
if(!forest->nodeHash)
- forest->nodeHash= BLI_ghash_new(BLI_ghashutil_ptrhash,
BLI_ghashutil_ptrcmp);
+ forest->nodeHash= BLI_ghash_new(BLI_ghashutil_ptrhash,
BLI_ghashutil_ptrcmp, "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 2010-05-07
07:31:39 UTC (rev 28639)
+++ trunk/blender/source/blender/blenkernel/intern/icons.c 2010-05-07
07:54:25 UTC (rev 28640)
@@ -101,7 +101,7 @@
gFirstIconId = first_dyn_id;
if (!gIcons)
- gIcons = BLI_ghash_new(BLI_ghashutil_inthash,
BLI_ghashutil_intcmp);
+ gIcons = BLI_ghash_new(BLI_ghashutil_inthash,
BLI_ghashutil_intcmp, "icons_init gh");
}
void BKE_icons_free()
Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c 2010-05-07
07:31:39 UTC (rev 28639)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c 2010-05-07
07:54:25 UTC (rev 28640)
@@ -1243,7 +1243,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);
+ gh= BLI_ghash_new(BLI_ghashutil_strhash, BLI_ghashutil_strcmp,
"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 2010-05-07
07:31:39 UTC (rev 28639)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2010-05-07
07:54:25 UTC (rev 28640)
@@ -3663,7 +3663,7 @@
{
if (!sb) return;
sb->scratch = MEM_callocN(sizeof(SBScratch), "SBScratch");
- sb->scratch->colliderhash =
BLI_ghash_new(BLI_ghashutil_ptrhash,BLI_ghashutil_ptrcmp);
+ sb->scratch->colliderhash =
BLI_ghash_new(BLI_ghashutil_ptrhash,BLI_ghashutil_ptrcmp, "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/blenlib/BLI_ghash.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_ghash.h 2010-05-07 07:31:39 UTC
(rev 28639)
+++ trunk/blender/source/blender/blenlib/BLI_ghash.h 2010-05-07 07:54:25 UTC
(rev 28640)
@@ -72,7 +72,7 @@
struct Entry *curEntry;
} GHashIterator;
-GHash* BLI_ghash_new (GHashHashFP hashfp, GHashCmpFP cmpfp);
+GHash* BLI_ghash_new (GHashHashFP hashfp, GHashCmpFP cmpfp, const
char *info);
void BLI_ghash_free (GHash *gh, GHashKeyFreeFP keyfreefp,
GHashValFreeFP valfreefp);
//BM_INLINE void BLI_ghash_insert (GHash *gh, void *key, void
*val);
Modified: trunk/blender/source/blender/blenlib/intern/BLI_args.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_args.c 2010-05-07
07:31:39 UTC (rev 28639)
+++ trunk/blender/source/blender/blenlib/intern/BLI_args.c 2010-05-07
07:54:25 UTC (rev 28640)
@@ -102,7 +102,7 @@
{
bArgs *ba = MEM_callocN(sizeof(bArgs), "bArgs");
ba->passes = MEM_callocN(sizeof(int) * argc, "bArgs passes");
- ba->items = BLI_ghash_new(keyhash, keycmp);
+ ba->items = BLI_ghash_new(keyhash, keycmp, "bArgs passes gh");
ba->argc = argc;
ba->argv = argv;
Modified: trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_ghash.c 2010-05-07
07:31:39 UTC (rev 28639)
+++ trunk/blender/source/blender/blenlib/intern/BLI_ghash.c 2010-05-07
07:54:25 UTC (rev 28640)
@@ -45,8 +45,8 @@
/***/
-GHash *BLI_ghash_new(GHashHashFP hashfp, GHashCmpFP cmpfp) {
- GHash *gh= MEM_mallocN(sizeof(*gh), "GHash");
+GHash *BLI_ghash_new(GHashHashFP hashfp, GHashCmpFP cmpfp, const char *info) {
+ GHash *gh= MEM_mallocN(sizeof(*gh), info);
gh->hashfp= hashfp;
gh->cmpfp= cmpfp;
gh->entrypool = BLI_mempool_create(sizeof(Entry), 64, 64, 0);
Modified: trunk/blender/source/blender/blenlib/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/pbvh.c 2010-05-07 07:31:39 UTC
(rev 28639)
+++ trunk/blender/source/blender/blenlib/intern/pbvh.c 2010-05-07 07:54:25 UTC
(rev 28640)
@@ -303,7 +303,7 @@
GHash *map;
int i, j, totface;
- map = BLI_ghash_new(BLI_ghashutil_inthash, BLI_ghashutil_intcmp);
+ map = BLI_ghash_new(BLI_ghashutil_inthash, BLI_ghashutil_intcmp,
"build_mesh_leaf_node gh");
node->uniq_verts = node->face_verts = 0;
totface= node->totprim;
@@ -970,7 +970,7 @@
void *face, **faces;
int i, tot;
- map = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
+ map = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp,
"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
2010-05-07 07:31:39 UTC (rev 28639)
+++ trunk/blender/source/blender/blenloader/intern/readblenentry.c
2010-05-07 07:54:25 UTC (rev 28640)
@@ -283,7 +283,7 @@
LinkNode *BLO_blendhandle_get_linkable_groups(BlendHandle *bh)
{
FileData *fd= (FileData*) bh;
- GHash *gathered= BLI_ghash_new(BLI_ghashutil_ptrhash,
BLI_ghashutil_ptrcmp);
+ GHash *gathered= BLI_ghash_new(BLI_ghashutil_ptrhash,
BLI_ghashutil_ptrcmp, "linkable_groups gh");
LinkNode *names= NULL;
BHead *bhead;
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c
2010-05-07 07:31:39 UTC (rev 28639)
+++ trunk/blender/source/blender/editors/armature/editarmature.c
2010-05-07 07:54:25 UTC (rev 28640)
@@ -5870,7 +5870,7 @@
ED_armature_to_edit(obedit);
- arcBoneMap = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
+ arcBoneMap = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp,
"SkeletonFromReebGraph gh");
BLI_markdownSymmetry((BGraph*)rg, rg->nodes.first,
scene->toolsettings->skgen_symmetry_limit);
Modified: trunk/blender/source/blender/editors/armature/editarmature_retarget.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_retarget.c
2010-05-07 07:31:39 UTC (rev 28639)
+++ trunk/blender/source/blender/editors/armature/editarmature_retarget.c
2010-05-07 07:54:25 UTC (rev 28640)
@@ -316,8 +316,8 @@
rg->head = NULL;
- rg->bones_map = BLI_ghash_new(BLI_ghashutil_strhash,
BLI_ghashutil_strcmp);
- rg->controls_map = BLI_ghash_new(BLI_ghashutil_strhash,
BLI_ghashutil_strcmp);
+ rg->bones_map = BLI_ghash_new(BLI_ghashutil_strhash,
BLI_ghashutil_strcmp, "newRigGraph bones gh");
+ rg->controls_map = BLI_ghash_new(BLI_ghashutil_strhash,
BLI_ghashutil_strcmp, "newRigGraph cont gh");
rg->free_arc = RIG_freeRigArc;
rg->free_node = NULL;
@@ -561,7 +561,7 @@
RigControl *ctrl;
RigGraph *rg;
- ptr_hash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
+ ptr_hash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp,
"cloneRigGraph gh");
rg = newRigGraph();
Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_sketch.c
2010-05-07 07:31:39 UTC (rev 28639)
+++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c
2010-05-07 07:54:25 UTC (rev 28640)
@@ -168,7 +168,7 @@
BLI_ghash_free(TEMPLATES_HASH, NULL, NULL);
}
- TEMPLATES_HASH = BLI_ghash_new(BLI_ghashutil_inthash,
BLI_ghashutil_intcmp);
+ TEMPLATES_HASH = BLI_ghash_new(BLI_ghashutil_inthash,
BLI_ghashutil_intcmp, "makeListTemplates gh");
TEMPLATES_CURRENT = 0;
for ( base = FIRSTBASE; base; base = base->next )
Modified: trunk/blender/source/blender/editors/armature/reeb.c
===================================================================
--- trunk/blender/source/blender/editors/armature/reeb.c 2010-05-07
07:31:39 UTC (rev 28639)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
