Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2010-01-20 12:57:47 +0300
committerMatt Ebb <matt@mke3.net>2010-01-20 12:57:47 +0300
commit22ca6f69cafb054a0260409b72ec7fadc411e115 (patch)
tree06089d6f1fcef6304dc6a622f7eb7c26446bd755 /source/blender/render
parenta50674238683d2db5f4ecd2f889cbc03ee7d43de (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.c3
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;
}
}