diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-11-23 17:04:05 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-11-23 17:04:05 +0300 |
| commit | 4aeeee88198b97ede58b09188f588746b0dfe8f1 (patch) | |
| tree | cf85930993afffd00815a43eca0302ce121bc003 /source/blender/blenkernel/intern/smoke.c | |
| parent | 8f37be3c0bec16c4236135ee19cc7a1684daa13d (diff) | |
Cached smoke wasn't being drawn on file load before going to simulation start frame.
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index c1090326fd9..e649c442a2d 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1353,9 +1353,11 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM } } - if(!smd->domain->fluid && (framenr != startframe) && (cache->flag & PTCACHE_BAKED)==0) + if(!smd->domain->fluid && (framenr != startframe) && (smd->domain->flags & MOD_SMOKE_FILE_LOAD)==0 && (cache->flag & PTCACHE_BAKED)==0) return; + smd->domain->flags &= ~MOD_SMOKE_FILE_LOAD; + if(framenr < startframe) framenr = startframe; |