diff options
| -rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_pointcache.c | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 002e8c9de0f..35e0441739e 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -2607,6 +2607,8 @@ void BKE_ptcache_make_cache(PTCacheBaker* baker) thread_data.break_operation = FALSE; thread_data.thread_ended = FALSE; old_progress = -1; + + WM_cursor_wait(1); if(G.background) { ptcache_make_cache_thread((void*)&thread_data); @@ -2690,6 +2692,8 @@ void BKE_ptcache_make_cache(PTCacheBaker* baker) else if (baker->progressend) baker->progressend(baker->progresscontext); + WM_cursor_wait(0); + /* TODO: call redraw all windows somehow */ } /* Helpers */ diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 9e39862cf5d..519a85fe39a 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -83,7 +83,7 @@ void bake_console_progress(void *UNUSED(arg), int nr) void bake_console_progress_end(void *UNUSED(arg)) { - printf("\n"); + printf("\rbake: done!\n"); } static int ptcache_bake_all_exec(bContext *C, wmOperator *op) @@ -103,7 +103,10 @@ static int ptcache_bake_all_exec(bContext *C, wmOperator *op) baker.break_test = cache_break_test; baker.break_data = NULL; - if (win) { + /* Disabled for now as this doesn't work properly, + * and pointcache baking will be reimplemented with + * the job system soon anyways. */ + if (win && 0) { baker.progressbar = (void (*)(void *, int))WM_timecursor; baker.progressend = (void (*)(void *))WM_cursor_restore; baker.progresscontext = win; @@ -201,7 +204,10 @@ static int ptcache_bake_exec(bContext *C, wmOperator *op) baker.break_test = cache_break_test; baker.break_data = NULL; - if (win) { + /* Disabled for now as this doesn't work properly, + * and pointcache baking will be reimplemented with + * the job system soon anyways. */ + if (win && 0) { baker.progressbar = (void (*)(void *, int))WM_timecursor; baker.progressend = (void (*)(void *))WM_cursor_restore; baker.progresscontext = win; |