[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26014] trunk/blender/source/blender: Fix [#20129] emulate numpad

[Matt Ebb]

Revision: 26014
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26014
Author:   broken
Date:     2010-01-15 07:17:28 +0100 (Fri, 15 Jan 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/armature/editarmature.c
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c	2010-01-15 06:10:05 UTC (rev 26013)
+++ trunk/blender/source/blender/editors/armature/editarmature.c	2010-01-15 06:17:28 UTC (rev 26014)
@@ -1500,7 +1500,7 @@
 	/* 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 @@
 	/* 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;

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2010-01-15 06:10:05 UTC (rev 26013)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2010-01-15 06:17:28 UTC (rev 26014)
@@ -781,6 +781,16 @@
 		}
 	}
 
+#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) {