[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26134] trunk/blender/source/blender/ render/intern/source/voxeldata.c: Fix for own bug, voxel data texture was freeing smoke data when it shouldn't

[Matt Ebb]

Revision: 26134
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26134
Author:   broken
Date:     2010-01-20 10:57:47 +0100 (Wed, 20 Jan 2010)

Log Message:
-----------
Fix for own bug, voxel data texture was freeing smoke data when it shouldn't 
have been.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/voxeldata.c

Modified: trunk/blender/source/blender/render/intern/source/voxeldata.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/voxeldata.c       
2010-01-20 08:57:26 UTC (rev 26133)
+++ trunk/blender/source/blender/render/intern/source/voxeldata.c       
2010-01-20 09:57:47 UTC (rev 26134)
@@ -246,7 +246,8 @@
        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;
        }
 }


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs