diff options
author | Janne Karhu <jhkarh@gmail.com> | 2010-12-18 18:03:31 +0300 |
---|---|---|
committer | Janne Karhu <jhkarh@gmail.com> | 2010-12-18 18:03:31 +0300 |
commit | b58dbbd51b298acede888a4005d13982417a6bee (patch) | |
tree | 8c0ef0e7d3e2cb24100dc8d86686471cf633951e /source/blender/blenkernel/intern/smoke.c | |
parent | a93411629811ec20f576895c0cb515b9abd7ec19 (diff) |
Extreme makeover of pointcache code:
* Pointcache code was quite ugly looking and complicated, so here are mostly just cosmetic adjustments, but some improved logic also.
* Slight cleanup of pointcache ui too.
* Shouldn't have any functional changes what so ever, so poke me right away if something seems off.
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index adaab2046dc..babe4209a31 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1376,7 +1376,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM } /* try to read from cache */ - if(BKE_ptcache_read_cache(&pid, (float)framenr, scene->r.frs_sec) == PTCACHE_READ_EXACT) { + if(BKE_ptcache_read(&pid, (float)framenr, scene->r.frs_sec) == PTCACHE_READ_EXACT) { BKE_ptcache_validate(cache, framenr); smd->time = framenr; return; @@ -1407,7 +1407,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM smoke_turbulence_step(sds->wt, sds->fluid); } - BKE_ptcache_write_cache(&pid, startframe); + BKE_ptcache_write(&pid, startframe); } // set new time @@ -1439,7 +1439,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM BKE_ptcache_validate(cache, framenr); if(framenr != startframe) - BKE_ptcache_write_cache(&pid, framenr); + BKE_ptcache_write(&pid, framenr); tend(); //printf ( "Frame: %d, Time: %f\n", (int)smd->time, ( float ) tval() ); |