Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2009-05-16 17:17:21 +0400
committerMatt Ebb <matt@mke3.net>2009-05-16 17:17:21 +0400
commitffbd75e57116ba05a1261f14be0d1206acce7e3d (patch)
treef81f7fef9fe98983919394e101c7240e26a0a157 /source/blender/render/intern
parente1122a1b67173ee180cfda9fe8dda2f4c37481bf (diff)
* Fix for simple bug in voxel data texture
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r--source/blender/render/intern/source/voxeldata.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index 86cc54c0d44..f0816cfddff 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -355,14 +355,14 @@ void cache_voxeldata(struct Render *re,Tex *tex)
if (!vd) return;
- read_voxeldata_header(fp, vd);
- size = (vd->resolX)*(vd->resolY)*(vd->resolZ);
- vd->dataset = MEM_mallocN(sizeof(float)*size, "voxel dataset");
-
if (!BLI_exists(vd->source_path)) return;
fp = fopen(vd->source_path,"rb");
if (!fp) return;
+ read_voxeldata_header(fp, vd);
+ size = (vd->resolX)*(vd->resolY)*(vd->resolZ);
+ vd->dataset = MEM_mallocN(sizeof(float)*size, "voxel dataset");
+
//here improve the dataset loading function for more dataset types
if (vd->still) load_frame(fp, vd->dataset, size, vd->still_frame, sizeof(VoxelDataHeader));
else load_frame(fp, vd->dataset, size, re->r.cfra, sizeof(VoxelDataHeader));