diff options
| author | Matt Ebb <matt@mke3.net> | 2010-06-01 10:07:22 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-06-01 10:07:22 +0400 |
| commit | eab7f6d3c2f1a2ecfce6976f2b6d50a5ea5d2fcb (patch) | |
| tree | 87d5441225b16ccb2afafcb5723fa2306b9c18a8 /source/blender/blenkernel/intern/texture.c | |
| parent | 80a89d2de50e46d65940864d18ced946eec29ba7 (diff) | |
Fix [#22469] Crashes with "segmentation fault" when opening an image for Voxel Data texture of type Image sequence
Cleaned up the code here, made it more efficient and more reliable with threaded render.
Diffstat (limited to 'source/blender/blenkernel/intern/texture.c')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 873a4103e3e..6d8c339d2b9 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -1149,7 +1149,8 @@ void BKE_free_pointdensity(PointDensity *pd) void BKE_free_voxeldatadata(struct VoxelData *vd) { if (vd->dataset) { - MEM_freeN(vd->dataset); + if(vd->file_format != TEX_VD_SMOKE) + MEM_freeN(vd->dataset); vd->dataset = NULL; } @@ -1173,6 +1174,8 @@ struct VoxelData *BKE_add_voxeldata(void) vd->int_multiplier = 1.0; vd->extend = TEX_CLIP; vd->object = NULL; + vd->cachedframe = -1; + vd->ok = 0; return vd; } |