[Bf-blender-cvs] [6dc4664] gooseberry: Merge branch 'master' into gooseberry
Antony Riakiotakis
noreply at git.blender.org
Wed Jan 28 11:49:45 CET 2015
Commit: 6dc4664efb3c21845dcb1a700f25b689b7931024
Author: Antony Riakiotakis
Date: Wed Jan 28 11:49:39 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB6dc4664efb3c21845dcb1a700f25b689b7931024
Merge branch 'master' into gooseberry
===================================================================
===================================================================
diff --cc source/blender/windowmanager/wm_event_system.h
index 322c9929,f89177a..b21d265
--- a/source/blender/windowmanager/wm_event_system.h
+++ b/source/blender/windowmanager/wm_event_system.h
@@@ -67,13 -65,8 +67,10 @@@ typedef struct wmEventHandler
struct ARegion *ui_region; /* for derived/modal handlers */
struct ARegion *ui_menu; /* for derived/modal handlers */
- /* fileselect handler re-uses modal operator data */
- struct bScreen *filescreen; /* screen it started in, to validate exec */
-
/* drop box handler */
ListBase *dropboxes;
+ /* widget handler */
+ struct wmWidgetMap *widgetmap;
} wmEventHandler;
More information about the Bf-blender-cvs
mailing list