diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-21 11:37:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-21 11:37:59 +0400 |
| commit | cd6b27f2b58aff46c9431bf7621e19bdb1b0b4c2 (patch) | |
| tree | 0631ffabeea1a2b2b63276efe802e371f25080f7 /source/blender/render | |
| parent | 10316768007df813ed2149c315c0db0415dda0e1 (diff) | |
remove return value from MEM_freeN, it wasn't used anywhere and was cast to a different function signature. (which evidently works but error prone).
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/strand.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 2be3c118ec8..c51fb244eb6 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -895,7 +895,7 @@ static void set_object_orco(Render *re, void *ob, float *orco) static void free_mesh_orco_hash(Render *re) { if (re->orco_hash) { - BLI_ghash_free(re->orco_hash, NULL, (GHashValFreeFP)MEM_freeN); + BLI_ghash_free(re->orco_hash, NULL, MEM_freeN); re->orco_hash = NULL; } } diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c index 8b83ca4b6c3..9bfdf73f367 100644 --- a/source/blender/render/intern/source/strand.c +++ b/source/blender/render/intern/source/strand.c @@ -338,7 +338,7 @@ StrandShadeCache *strand_shade_cache_create(void) void strand_shade_cache_free(StrandShadeCache *cache) { BLI_ghash_free(cache->refcounthash, NULL, NULL); - BLI_ghash_free(cache->resulthash, (GHashKeyFreeFP)MEM_freeN, NULL); + BLI_ghash_free(cache->resulthash, MEM_freeN, NULL); BLI_memarena_free(cache->memarena); MEM_freeN(cache); } @@ -377,7 +377,7 @@ static void strand_shade_get(Render *re, StrandShadeCache *cache, ShadeSample *s /* lower reference count and remove if not needed anymore by any samples */ (*refcount)--; if (*refcount == 0) { - BLI_ghash_remove(cache->resulthash, &pair, (GHashKeyFreeFP)MEM_freeN, NULL); + BLI_ghash_remove(cache->resulthash, &pair, MEM_freeN, NULL); BLI_ghash_remove(cache->refcounthash, &pair, NULL, NULL); } } @@ -412,7 +412,7 @@ void strand_shade_unref(StrandShadeCache *cache, ObjectInstanceRen *obi, StrandV (*refcount)--; if (*refcount == 0) { - BLI_ghash_remove(cache->resulthash, &pair, (GHashKeyFreeFP)MEM_freeN, NULL); + BLI_ghash_remove(cache->resulthash, &pair, MEM_freeN, NULL); BLI_ghash_remove(cache->refcounthash, &pair, NULL, NULL); } } |