archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix [#20129] emulate numpad

Browse Source 
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.
This commit is contained in:
Matt Ebb
2010-01-15 06:17:28 +00:00
parent 87c5ed37a5
commit bd6ce45ef4
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/armature/editarmature.c
View File

@@ -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;

10
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -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) {