[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35574] trunk/blender/source/blender/ blenkernel/intern/texture.c: Bug fix: Changing volume texture properties after render crashes ( reported by mats on irc)

[Janne Karhu]

Revision: 35574
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35574
Author:   jhk
Date:     2011-03-16 14:21:35 +0000 (Wed, 16 Mar 2011)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/texture.c

Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c	2011-03-16 13:23:31 UTC (rev 35573)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c	2011-03-16 14:21:35 UTC (rev 35574)
@@ -790,7 +790,11 @@
 	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;