diff options
| author | Matt Ebb <matt@mke3.net> | 2009-11-05 07:07:58 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-11-05 07:07:58 +0300 |
| commit | 539a68f6c035d521b7c8a1eb7a15de664798cf69 (patch) | |
| tree | 29395118f4c266a8027b5823455532f634d55c77 /source/blender/render | |
| parent | 38f7839218e541b2bf9e106ad5578de63c7db6af (diff) | |
Fix for [#19793] Resolution Sliding Crashes Blender 2.5 SVN 24256
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/volume_precache.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c index 25645d9cce2..cfaf333d656 100644 --- a/source/blender/render/intern/source/volume_precache.c +++ b/source/blender/render/intern/source/volume_precache.c @@ -622,6 +622,11 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat vp->data_r = MEM_callocN(sizeof(float)*vp->res[0]*vp->res[1]*vp->res[2], "volume light cache data red channel"); vp->data_g = MEM_callocN(sizeof(float)*vp->res[0]*vp->res[1]*vp->res[2], "volume light cache data green channel"); vp->data_b = MEM_callocN(sizeof(float)*vp->res[0]*vp->res[1]*vp->res[2], "volume light cache data blue channel"); + if (vp->data_r==0 || vp->data_g==0 || vp->data_b==0) { + MEM_freeN(vp); + vp = NULL; + return; + } obi->volume_precache = vp; /* Need a shadeinput to calculate scattering */ |