[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40469] trunk/blender/source/blender: Remove checks for voxel data when texture type is known.
Sergey Sharybin
g.ulairi at gmail.com
Thu Sep 22 19:52:27 CEST 2011
Revision: 40469
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40469
Author: nazgul
Date: 2011-09-22 17:52:27 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Remove checks for voxel data when texture type is known.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/render/intern/source/voxeldata.c
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2011-09-22 17:52:21 UTC (rev 40468)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2011-09-22 17:52:27 UTC (rev 40469)
@@ -1787,7 +1787,7 @@
if(tex->pd->coba) writestruct(wd, DATA, "ColorBand", 1, tex->pd->coba);
if(tex->pd->falloff_curve) write_curvemapping(wd, tex->pd->falloff_curve);
}
- if(tex->type == TEX_VOXELDATA && tex->vd) writestruct(wd, DATA, "VoxelData", 1, tex->vd);
+ if(tex->type == TEX_VOXELDATA) writestruct(wd, DATA, "VoxelData", 1, tex->vd);
/* nodetree is integral part of texture, no libdata */
if(tex->nodetree) {
Modified: trunk/blender/source/blender/render/intern/source/voxeldata.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/voxeldata.c 2011-09-22 17:52:21 UTC (rev 40468)
+++ trunk/blender/source/blender/render/intern/source/voxeldata.c 2011-09-22 17:52:27 UTC (rev 40469)
@@ -389,7 +389,7 @@
VoxelData *vd = tex->vd;
float co[3], offset[3] = {0.5, 0.5, 0.5};
- if ((!vd) || (vd->dataset==NULL)) {
+ if (vd->dataset==NULL) {
texres->tin = 0.0f;
return 0;
}
More information about the Bf-blender-cvs
mailing list