[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52977] trunk/blender/source/blender/ windowmanager: Bugfix - own collection.
Ton Roosendaal
ton at blender.org
Thu Dec 13 17:21:09 CET 2012
Revision: 52977
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52977
Author: ton
Date: 2012-12-13 16:21:08 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
Bugfix - own collection.
Very occasionally Timer Events could still get handled, after stopping
a timer - especially with the timer event still in the queue.
This patch disables such events. Introduced a EVENT_NONE to make sure
it gets ignored everywhere.
Modified Paths:
--------------
trunk/blender/source/blender/windowmanager/intern/wm_window.c
trunk/blender/source/blender/windowmanager/wm_event_types.h
Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c 2012-12-13 14:33:14 UTC (rev 52976)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c 2012-12-13 16:21:08 UTC (rev 52977)
@@ -1129,7 +1129,8 @@
wmEvent *event;
for (event = win->queue.first; event; event = event->next) {
if (event->customdata == wt) {
- //event->customdata = NULL;
+ event->customdata = NULL;
+ event->type = EVENT_NONE; /* timer users customdata, dont want NULL == NULL */
}
}
}
Modified: trunk/blender/source/blender/windowmanager/wm_event_types.h
===================================================================
--- trunk/blender/source/blender/windowmanager/wm_event_types.h 2012-12-13 14:33:14 UTC (rev 52976)
+++ trunk/blender/source/blender/windowmanager/wm_event_types.h 2012-12-13 16:21:08 UTC (rev 52977)
@@ -53,6 +53,8 @@
#define MOUSEX 4
#define MOUSEY 5
+/* non-event, for example disabled timer */
+#define EVENT_NONE 0
/* MOUSE : 0x00x */
#define LEFTMOUSE 1
#define MIDDLEMOUSE 2
More information about the Bf-blender-cvs
mailing list