diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-12-20 18:42:48 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-12-20 18:42:48 +0300 |
| commit | 1550573360241ef5be0839d2652e9e092f510b63 (patch) | |
| tree | 9574cc3ac1f0f38922d4aa7858c87a93276311ac /source/blender/windowmanager/intern | |
| parent | 08db8198c489b9664ba14bf4bd15e63efe096c58 (diff) | |
2.5
- View3D: selecting added. Note it nicely respects user preset, by using
the keymap define SELECTMOUSE.
- Added missing initialize of default vector font, so text draws.
Diffstat (limited to 'source/blender/windowmanager/intern')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 086d6f3e794..16b7e15612d 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -426,8 +426,18 @@ void WM_event_remove_handlers(bContext *C, ListBase *handlers) static int wm_eventmatch(wmEvent *winevent, wmKeymapItem *kmi) { + int kmitype= kmi->type; - if(winevent->type!=kmi->type) return 0; + /* first do default mappings */ + if(kmitype==SELECTMOUSE) { + if(U.flag & USER_LMOUSESELECT) + kmitype= LEFTMOUSE; + else + kmitype= RIGHTMOUSE; + } + + /* the matching rules */ + if(winevent->type!=kmitype) return 0; if(kmi->val!=KM_ANY) if(winevent->val!=kmi->val) return 0; |