diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2009-10-02 15:09:05 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2009-10-02 15:09:05 +0400 |
commit | fbb47e86044be300357eda6d5ade98b97d5654e9 (patch) | |
tree | 0d010dff531ca07ffcbaaff391cde4e472a44c39 /source | |
parent | aa2cd95c1b1d8875444ae41112ca9ca06aa2950a (diff) |
Smoke:
* Dissolve is back
* Obstacles coming back (some bugs left i think)
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 4f7a8cda81b..36168a201d7 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1183,7 +1183,11 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM // simulate the actual smoke (c++ code in intern/smoke) // DG: interesting commenting this line + deactivating loading of noise files if(framenr!=startframe) + { + if(sds->flags & MOD_SMOKE_DISSOLVE) + smoke_dissolve(sds->fluid, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG); smoke_step(sds->fluid, smd->time); + } // create shadows before writing cache so we get nice shadows for sstartframe, too if(get_lamp(scene, light)) @@ -1194,7 +1198,11 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM if(sds->wt) { if(framenr!=startframe) + { + if(sds->flags & MOD_SMOKE_DISSOLVE) + smoke_dissolve_wavelet(sds->wt, sds->diss_speed, sds->flags & MOD_SMOKE_DISSOLVE_LOG); smoke_turbulence_step(sds->wt, sds->fluid); + } cache_wt->flag |= PTCACHE_SIMULATION_VALID; cache_wt->simframe= framenr; |