[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50929] trunk/blender/source/blender/ editors: Fix #32658: left mouse button selection did not work well in the graph and mask

[Brecht Van Lommel]

Revision: 50929
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50929
Author:   blendix
Date:     2012-09-27 15:30:20 +0000 (Thu, 27 Sep 2012)
Log Message:
-----------
Fix #32658: left mouse button selection did not work well in the graph and mask
editors. Ctrl+Click to add a point and vertex slide now work with right mouse
button in this case, consistent with the 3D view.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mask/mask_edit.c
    trunk/blender/source/blender/editors/space_graph/graph_ops.c

Modified: trunk/blender/source/blender/editors/mask/mask_edit.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_edit.c	2012-09-27 15:30:13 UTC (rev 50928)
+++ trunk/blender/source/blender/editors/mask/mask_edit.c	2012-09-27 15:30:20 UTC (rev 50929)
@@ -436,8 +436,8 @@
 	ED_keymap_proportional_maskmode(keyconf, keymap);
 
 	/* geometry */
-	WM_keymap_add_item(keymap, "MASK_OT_add_vertex_slide", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "MASK_OT_add_feather_vertex_slide", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "MASK_OT_add_vertex_slide", ACTIONMOUSE, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "MASK_OT_add_feather_vertex_slide", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "MASK_OT_delete", XKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "MASK_OT_delete", DELKEY, KM_PRESS, 0, 0);
 
@@ -486,7 +486,7 @@
 
 	/* shape */
 	WM_keymap_add_item(keymap, "MASK_OT_cyclic_toggle", CKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_add_item(keymap, "MASK_OT_slide_point", LEFTMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "MASK_OT_slide_point", ACTIONMOUSE, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "MASK_OT_handle_type_set", VKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "MASK_OT_normals_make_consistent", NKEY, KM_PRESS, KM_CTRL, 0);
 	// WM_keymap_add_item(keymap, "MASK_OT_feather_weight_clear", SKEY, KM_PRESS, KM_ALT, 0);

Modified: trunk/blender/source/blender/editors/space_graph/graph_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_ops.c	2012-09-27 15:30:13 UTC (rev 50928)
+++ trunk/blender/source/blender/editors/space_graph/graph_ops.c	2012-09-27 15:30:20 UTC (rev 50929)
@@ -372,7 +372,7 @@
 	
 	/* insertkey */
 	WM_keymap_add_item(keymap, "GRAPH_OT_keyframe_insert", IKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "GRAPH_OT_click_insert", LEFTMOUSE, KM_CLICK, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "GRAPH_OT_click_insert", ACTIONMOUSE, KM_CLICK, KM_CTRL, 0);
 	
 	/* copy/paste */
 	WM_keymap_add_item(keymap, "GRAPH_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0);