[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24535] trunk/blender/source/blender/ editors/space_view3d: Shift click on modifier works again.

[Martin Poirier]

Revision: 24535
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24535
Author:   theeth
Date:     2009-11-12 20:42:53 +0100 (Thu, 12 Nov 2009)

Log Message:
-----------
Shift click on modifier works again.

For some reason, adding a keymap entry with KM_SHIFT didn't work, had to use KM_ANY and passthrough invalid modifiers.

Left a note to investigate later.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/editors/space_view3d/view3d_ops.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2009-11-12 18:35:26 UTC (rev 24534)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2009-11-12 19:42:53 UTC (rev 24535)
@@ -2017,6 +2017,9 @@
 	if(!(v3d->twflag & V3D_USE_MANIPULATOR)) return OPERATOR_PASS_THROUGH;
 	if(!(v3d->twflag & V3D_DRAW_MANIPULATOR)) return OPERATOR_PASS_THROUGH;
 
+	/* only no modifier or shift */
+	if(event->keymodifier != 0 && event->keymodifier != KM_SHIFT) return OPERATOR_PASS_THROUGH;
+
 	/* note; otherwise opengl won't work */
 	view3d_operator_needs_opengl(C);
 

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_ops.c	2009-11-12 18:35:26 UTC (rev 24534)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_ops.c	2009-11-12 19:42:53 UTC (rev 24535)
@@ -115,7 +115,11 @@
 	/* only for region 3D window */
 	keymap= WM_keymap_find(keyconf, "View3D", SPACE_VIEW3D, 0);
 	
-	WM_keymap_verify_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, 0, 0); /* manipulator always on left mouse, not on action mouse*/
+	WM_keymap_verify_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_ANY, 0);
+	/*
+	 * Doesn't work with KM_SHIFT, have to use KM_ANY and filter in invoke
+	 * */
+	// WM_keymap_verify_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
 	
 	WM_keymap_verify_item(keymap, "VIEW3D_OT_cursor3d", ACTIONMOUSE, KM_PRESS, 0, 0);