diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-04-22 14:08:00 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-04-22 14:08:00 +0400 |
| commit | ea8ffd82018b5c522681793aa2f820c58b54a9d4 (patch) | |
| tree | 140e20682fbd502efa9a8351f613f72f51d37d7b /source/blender/src/buttons_object.c | |
| parent | d186ba591a1e7f434a1f8bf58cc1d144e30b3152 (diff) | |
Fix for bug #9491: cancelling bake didn't reset the simulation properly,
now it also keeps the already baked frames in the cache up to the point
is was cancelled.
Diffstat (limited to 'source/blender/src/buttons_object.c')
| -rw-r--r-- | source/blender/src/buttons_object.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 2489b5a1d16..9aee62be7c0 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -2130,10 +2130,8 @@ void pointcache_bake(PTCacheID *pid, int startframe) BKE_ptcache_id_time(pid, 0.0f, &cstart, &cend, NULL); cache->flag &= ~PTCACHE_BAKING; - if(startframe == cstart) - cache->flag &= ~PTCACHE_BAKED; - BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_AFTER, startframe-1); + BKE_ptcache_id_reset(pid, PTCACHE_RESET_OUTDATED); } else { for(base=G.scene->base.first; base; base= base->next) { @@ -2146,10 +2144,8 @@ void pointcache_bake(PTCacheID *pid, int startframe) BKE_ptcache_id_time(pid, 0.0f, &cstart, &cend, NULL); cache->flag &= ~PTCACHE_BAKING; - if(startframe == cstart) - cache->flag &= ~PTCACHE_BAKED; - BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_AFTER, startframe-1); + BKE_ptcache_id_reset(pid, PTCACHE_RESET_OUTDATED); } BLI_freelistN(&pidlist); |