diff options
author | Ton Roosendaal <ton@blender.org> | 2010-12-03 21:26:42 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2010-12-03 21:26:42 +0300 |
commit | 45922c91508883dadd1befd205602e7183ce8392 (patch) | |
tree | 89d486d140de43507e0be3bf24d3f9d7060edb22 /source/blender | |
parent | 990b487c730ac192405682fa45232f6542cdd14c (diff) |
Bugfix #24568
The old blocking "time cursor" wasn't working anymore.
Commit 32798 overlooked that the initialization was
needed.
Now bakes show it again. Note to self: it seems to flash
slightly (like 2.49), need to check on it one day.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/physics/physics_pointcache.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_cursors.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 519a85fe39a..8843cf2849a 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -106,7 +106,7 @@ static int ptcache_bake_all_exec(bContext *C, wmOperator *op) /* Disabled for now as this doesn't work properly, * and pointcache baking will be reimplemented with * the job system soon anyways. */ - if (win && 0) { + if (win) { baker.progressbar = (void (*)(void *, int))WM_timecursor; baker.progressend = (void (*)(void *))WM_cursor_restore; baker.progresscontext = win; @@ -207,7 +207,7 @@ static int ptcache_bake_exec(bContext *C, wmOperator *op) /* Disabled for now as this doesn't work properly, * and pointcache baking will be reimplemented with * the job system soon anyways. */ - if (win && 0) { + if (win) { baker.progressbar = (void (*)(void *, int))WM_timecursor; baker.progressend = (void (*)(void *))WM_cursor_restore; baker.progresscontext = win; diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 966bc8b3285..43352f4efd2 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -216,13 +216,15 @@ void WM_timecursor(wmWindow *win, int nr) {0, 60, 66, 66, 60, 66, 66, 60}, {0, 56, 68, 68, 120, 64, 68, 56} }; - unsigned char mask[16][2]= {{0}}; + unsigned char mask[16][2]; unsigned char bitmap[16][2]= {{0}}; int i, idx; if(win->lastcursor == 0) win->lastcursor= win->cursor; + memset(&mask, 0xFF, sizeof(mask)); + /* print number bottom right justified */ for (idx= 3; nr && idx>=0; idx--) { char *digit= number_bitmaps[nr%10]; |