diff options
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 4 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 8 | ||||
| -rw-r--r-- | source/blender/render/intern/source/sss.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/strand.c | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index f6d08db78c7..f6be316dcfd 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -853,7 +853,7 @@ static float *get_object_orco(Render *re, Object *ob) float *orco; if (!re->orco_hash) - re->orco_hash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp); + re->orco_hash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "get_object_orco gh"); orco = BLI_ghash_lookup(re->orco_hash, ob); @@ -876,7 +876,7 @@ static float *get_object_orco(Render *re, Object *ob) static void set_object_orco(Render *re, void *ob, float *orco) { if (!re->orco_hash) - re->orco_hash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp); + re->orco_hash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "set_object_orco gh"); BLI_ghash_insert(re->orco_hash, ob, orco); } diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 42581141d1f..45c16a01308 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -932,12 +932,16 @@ static int read_render_result_from_file(char *filename, RenderResult *rr) int rectx, recty; if(IMB_exr_begin_read(exrhandle, filename, &rectx, &recty)==0) { + printf("failed being read %s\n", filename); IMB_exr_close(exrhandle); return 0; } - + if(rr == NULL || rectx!=rr->rectx || recty!=rr->recty) { - printf("error in reading render result\n"); + if(rr) + printf("error in reading render result: dimensions don't match\n"); + else + printf("error in reading render result: NULL result pointer\n"); IMB_exr_close(exrhandle); return 0; } diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c index bb5f8e9b8b4..aa285401524 100644 --- a/source/blender/render/intern/source/sss.c +++ b/source/blender/render/intern/source/sss.c @@ -988,7 +988,7 @@ void make_sss_tree(Render *re) { Material *mat; - re->sss_hash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp); + re->sss_hash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "make_sss_tree gh"); re->i.infostr= "SSS preprocessing"; re->stats_draw(re->sdh, &re->i); diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c index e3428741473..88d042e7b97 100644 --- a/source/blender/render/intern/source/strand.c +++ b/source/blender/render/intern/source/strand.c @@ -318,8 +318,8 @@ StrandShadeCache *strand_shade_cache_create() StrandShadeCache *cache; cache= MEM_callocN(sizeof(StrandShadeCache), "StrandShadeCache"); - cache->resulthash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp); - cache->refcounthash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp); + cache->resulthash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "strand_shade_cache_create1 gh"); + cache->refcounthash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "strand_shade_cache_create2 gh"); cache->memarena= BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, "strand shade cache arena"); return cache; |