[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40468] trunk/blender/source/blender: Corrected fix for #28722: Segfault when reading volumetric clouds example

[Sergey Sharybin]

Revision: 40468
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40468
Author:   nazgul
Date:     2011-09-22 17:52:21 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Corrected fix for #28722: Segfault when reading volumetric clouds example

Looks like with current implementation voxeldata should always be created
for voxel textures. Remove recently added NULL check and allocate
voxel data when linking a texture.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/bpath.c
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenlib/intern/bpath.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/bpath.c	2011-09-22 16:57:16 UTC (rev 40467)
+++ trunk/blender/source/blender/blenlib/intern/bpath.c	2011-09-22 17:52:21 UTC (rev 40468)
@@ -244,7 +244,7 @@
 		tex= tex->id.next;
 
 	while (tex) {
-		if (tex->type == TEX_VOXELDATA && tex->vd && TEX_VD_IS_SOURCE_PATH(tex->vd->file_format))
+		if (tex->type == TEX_VOXELDATA && TEX_VD_IS_SOURCE_PATH(tex->vd->file_format))
 			break;
 		/* image is not a image with a path, skip it */
 		tex= tex->id.next;

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-09-22 16:57:16 UTC (rev 40467)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-09-22 17:52:21 UTC (rev 40468)
@@ -3009,6 +3009,9 @@
 	if(tex->vd) {
 		tex->vd->dataset = NULL;
 		tex->vd->ok = 0;
+	} else {
+		if(tex->type == TEX_VOXELDATA)
+			tex->vd= MEM_callocN(sizeof(VoxelData), "direct_link_texture VoxelData");
 	}
 	
 	tex->nodetree= newdataadr(fd, tex->nodetree);