diff options
author | Matt Ebb <matt@mke3.net> | 2010-01-20 12:57:47 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-01-20 12:57:47 +0300 |
commit | 22ca6f69cafb054a0260409b72ec7fadc411e115 (patch) | |
tree | 06089d6f1fcef6304dc6a622f7eb7c26446bd755 /source/blender/render | |
parent | a50674238683d2db5f4ecd2f889cbc03ee7d43de (diff) |
Fix for own bug, voxel data texture was freeing smoke data when it shouldn't
have been.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/voxeldata.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c index 8e71fec4db9..381e6322254 100644 --- a/source/blender/render/intern/source/voxeldata.c +++ b/source/blender/render/intern/source/voxeldata.c @@ -246,7 +246,8 @@ static void free_voxeldata_one(Render *re, Tex *tex) VoxelData *vd = tex->vd; if (vd->dataset) { - MEM_freeN(vd->dataset); + if(vd->file_format != TEX_VD_SMOKE) + MEM_freeN(vd->dataset); vd->dataset = NULL; } } |