diff options
Diffstat (limited to 'source/blender/render/intern/source/voxeldata.c')
| -rw-r--r-- | source/blender/render/intern/source/voxeldata.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c index 57ff5f4237a..ce5561b3e34 100644 --- a/source/blender/render/intern/source/voxeldata.c +++ b/source/blender/render/intern/source/voxeldata.c @@ -309,7 +309,7 @@ static void init_frame_smoke(VoxelData *vd, float cfra) #endif } -static void cache_voxeldata(struct Render *re, Tex *tex) +void cache_voxeldata(Tex *tex, int scene_frame) { VoxelData *vd = tex->vd; FILE *fp; @@ -317,7 +317,7 @@ static void cache_voxeldata(struct Render *re, Tex *tex) char path[sizeof(vd->source_path)]; /* only re-cache if dataset needs updating */ - if ((vd->flag & TEX_VD_STILL) || (vd->cachedframe == re->r.cfra)) + if ((vd->flag & TEX_VD_STILL) || (vd->cachedframe == scene_frame)) if (vd->ok) return; /* clear out old cache, ready for new */ @@ -329,7 +329,7 @@ static void cache_voxeldata(struct Render *re, Tex *tex) if (vd->flag & TEX_VD_STILL) curframe = vd->still_frame; else - curframe = re->r.cfra; + curframe = scene_frame; BLI_strncpy(path, vd->source_path, sizeof(path)); @@ -338,7 +338,7 @@ static void cache_voxeldata(struct Render *re, Tex *tex) load_frame_image_sequence(vd, tex); return; case TEX_VD_SMOKE: - init_frame_smoke(vd, re->r.cfra); + init_frame_smoke(vd, scene_frame); return; case TEX_VD_BLENDERVOXEL: BLI_path_abs(path, G.main->name); @@ -373,7 +373,7 @@ void make_voxeldata(struct Render *re) /* XXX: should be doing only textures used in this render */ for (tex= re->main->tex.first; tex; tex= tex->id.next) { if(tex->id.us && tex->type==TEX_VOXELDATA) { - cache_voxeldata(re, tex); + cache_voxeldata(tex, re->r.cfra); } } |