diff options
| author | Matt Ebb <matt@mke3.net> | 2009-12-04 07:28:50 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-12-04 07:28:50 +0300 |
| commit | a358b6386d8022f71160ccdb714e596ec63670a6 (patch) | |
| tree | fa0731d959820848be3f934ee5dad7da0a13247d /source/blender/blenkernel/intern/pointcache.c | |
| parent | 45955fef18c57a5d5633b88e823a9bb9d86b38e4 (diff) | |
* Fix for incorrect disabling after baking cloth sim
* Fix for time cursor getting 'stuck' after baking point caches
Diffstat (limited to 'source/blender/blenkernel/intern/pointcache.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index c2798b4a746..cc7b942a6bb 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -2232,6 +2232,7 @@ void BKE_ptcache_quick_cache_all(Scene *scene) baker.break_test=NULL; baker.pid=NULL; baker.progressbar=NULL; + baker.progressend=NULL; baker.progresscontext=NULL; baker.render=0; baker.anim_init = 0; @@ -2360,6 +2361,7 @@ void BKE_ptcache_make_cache(PTCacheBaker* baker) if(baker->break_test && baker->break_test(baker->break_data)) break; } + baker->progressend(baker->progresscontext); /* clear baking flag */ if(pid) { @@ -2400,7 +2402,7 @@ void BKE_ptcache_make_cache(PTCacheBaker* baker) scene->r.framelen = frameleno; CFRA = cfrao; - + if(bake) /* already on cfra unless baking */ scene_update_for_newframe(scene, scene->lay); |