[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33451] trunk/blender/source/blender: Bugfix #24568

[Ton Roosendaal]

Revision: 33451
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33451
Author:   ton
Date:     2010-12-03 19:26:42 +0100 (Fri, 03 Dec 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/physics/physics_pointcache.c
    trunk/blender/source/blender/windowmanager/intern/wm_cursors.c

Modified: trunk/blender/source/blender/editors/physics/physics_pointcache.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_pointcache.c	2010-12-03 17:31:34 UTC (rev 33450)
+++ trunk/blender/source/blender/editors/physics/physics_pointcache.c	2010-12-03 18:26:42 UTC (rev 33451)
@@ -106,7 +106,7 @@
 	/* 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 @@
 	/* 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;

Modified: trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_cursors.c	2010-12-03 17:31:34 UTC (rev 33450)
+++ trunk/blender/source/blender/windowmanager/intern/wm_cursors.c	2010-12-03 18:26:42 UTC (rev 33451)
@@ -216,13 +216,15 @@
 	{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];