[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25945] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: Fix for Martin's fix, caused file selector to stop working.
Matt Ebb
matt at mke3.net
Wed Jan 13 03:59:46 CET 2010
Revision: 25945
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25945
Author: broken
Date: 2010-01-13 03:59:42 +0100 (Wed, 13 Jan 2010)
Log Message:
-----------
Fix for Martin's fix, caused file selector to stop working.
Fileselect handlers are added to window's modalhandlers, and contain references to
other areas/regions/etc... Still seems a little bit dodgy, but fixes file selectors for now.
Modified Paths:
--------------
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2010-01-13 02:01:34 UTC (rev 25944)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2010-01-13 02:59:42 UTC (rev 25945)
@@ -1625,10 +1625,12 @@
wmEventHandler *handler, *nexthandler;
for(handler = handlers->first; handler; handler= nexthandler) {
- nexthandler = handler->next;
- if (handler->ui_area == area || handler->op_area == area) {
- BLI_remlink(handlers, handler);
- wm_event_free_handler(handler);
+ if (handler->type != WM_HANDLER_FILESELECT) {
+ nexthandler = handler->next;
+ if (handler->ui_area == area || handler->op_area == area) {
+ BLI_remlink(handlers, handler);
+ wm_event_free_handler(handler);
+ }
}
}
}
More information about the Bf-blender-cvs
mailing list