Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T47303: Voxel texture disappears after first frame

Browse Source 
Failed reads didn't update the voxel 'ok' tag,
making successive reads fail (even on existing frames).
This commit is contained in:
Campbell Barton
2016-02-03 17:33:51 +11:00
parent 3416428e0b
commit 94d1674ddc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/render/intern/source/voxeldata.c
View File

@@ -371,7 +371,6 @@ static void init_frame_hair(VoxelData *vd, int UNUSED(cfra))
{ {
Object *ob; Object *ob;
ModifierData *md; ModifierData *md;
bool found = false;
vd->dataset = NULL; vd->dataset = NULL;
if (vd->object == NULL) return; if (vd->object == NULL) return;
@@ -381,11 +380,9 @@ static void init_frame_hair(VoxelData *vd, int UNUSED(cfra))
ParticleSystemModifierData *pmd = (ParticleSystemModifierData *)md; ParticleSystemModifierData *pmd = (ParticleSystemModifierData *)md;
if (pmd->psys && pmd->psys->clmd) { if (pmd->psys && pmd->psys->clmd) {
found |= BPH_cloth_solver_get_texture_data(ob, pmd->psys->clmd, vd); vd->ok |= BPH_cloth_solver_get_texture_data(ob, pmd->psys->clmd, vd);
} }
} }
vd->ok = found;
} }
void cache_voxeldata(Tex *tex, int scene_frame) void cache_voxeldata(Tex *tex, int scene_frame)
@@ -414,6 +411,9 @@ void cache_voxeldata(Tex *tex, int scene_frame)
BLI_strncpy(path, vd->source_path, sizeof(path)); BLI_strncpy(path, vd->source_path, sizeof(path));
/* each type is responsible for setting to true */
vd->ok = false;
switch (vd->file_format) { switch (vd->file_format) {
case TEX_VD_IMAGE_SEQUENCE: case TEX_VD_IMAGE_SEQUENCE:
load_frame_image_sequence(vd, tex); load_frame_image_sequence(vd, tex);