diff options
author | Matt Ebb <matt@mke3.net> | 2010-01-15 09:17:28 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-01-15 09:17:28 +0300 |
commit | bd6ce45ef48abaa43e14a41d988ad3c42a485261 (patch) | |
tree | 5f238764f60e5f2e0f699002b745a064a1624b55 /source/blender | |
parent | 87c5ed37a5aee2b9d5db3408add9d9254f032b3f (diff) |
Fix [#20129] emulate numpad
Converted Command+LMB to send a RMB click event on Mac OS X, if Emulate 3 Button Mouse is switched on.
Also fixes for previous commit, didn't all go through.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 42ac4b8b6b5..410da6662aa 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -1500,7 +1500,7 @@ void POSE_OT_select_linked(wmOperatorType *ot) /* api callbacks */ ot->exec= NULL; ot->invoke= pose_select_connected_invoke; - ot->poll= select_linked_poll; + ot->poll= pose_select_linked_poll; /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -1599,7 +1599,7 @@ void ARMATURE_OT_select_linked(wmOperatorType *ot) /* api callbacks */ ot->exec= NULL; ot->invoke= armature_select_linked_invoke; - ot->poll= ED_operator_editarmature; + ot->poll= armature_select_linked_poll; /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 775d8c2b4ab..15adb33d527 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -781,6 +781,16 @@ static void wm_eventemulation(wmEvent *event) } } +#ifdef __APPLE__ + /* rightmouse emulation */ + if(U.flag & USER_TWOBUTTONMOUSE) { + if(event->type == LEFTMOUSE && event->oskey) { + event->type = RIGHTMOUSE; + event->oskey = 0; + } + } +#endif + /* numpad emulation */ if(U.flag & USER_NONUMPAD) { switch(event->type) { |