diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-05-07 11:54:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-05-07 11:54:25 +0400 |
| commit | 389e590460527ee497fe6426c48fba234490ff74 (patch) | |
| tree | 9c173233bdcb4dcc58770e192b89b1b730aed7a3 /source/blender/blenkernel/intern/softbody.c | |
| parent | 27acb95cad777fa3c3cdaba5af6da79dbe438d11 (diff) | |
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
Diffstat (limited to 'source/blender/blenkernel/intern/softbody.c')
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index b8274940318..c06e0679a7d 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3663,7 +3663,7 @@ static void sb_new_scratch(SoftBody *sb) { 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; |