diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2011-03-16 17:21:35 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2011-03-16 17:21:35 +0300 |
| commit | 6e4be608ffdbc1338deafd9532cc79ce84a634e2 (patch) | |
| tree | 9c1f994ac5fa9c19b0e0e4b23d0dc9190c46a314 | |
| parent | 8b9615caa08e7af278000bbce782be5c09cd70a5 (diff) | |
Bug fix: Changing volume texture properties after render crashes (reported by mats on irc)
* Preview render copied the volume texture, but not the actual volumedata, so normal render and preview render clashed.
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 5199bbd0f06..1d5840765bc 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -790,7 +790,11 @@ Tex *localize_texture(Tex *tex) if(texn->coba) texn->coba= MEM_dupallocN(texn->coba); if(texn->env) texn->env= BKE_copy_envmap(texn->env); if(texn->pd) texn->pd= MEM_dupallocN(texn->pd); - if(texn->vd) texn->vd= MEM_dupallocN(texn->vd); + if(texn->vd) { + texn->vd= MEM_dupallocN(texn->vd); + if(texn->vd->dataset) + texn->vd->dataset= MEM_dupallocN(texn->vd->dataset); + } texn->preview = NULL; |