[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23914] trunk/blender/source/blender/ editors: Reverting revision 23913.

Martin Poirier theeth at yahoo.com
Sun Oct 18 04:45:11 CEST 2009


Revision: 23914
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23914
Author:   theeth
Date:     2009-10-18 04:45:05 +0200 (Sun, 18 Oct 2009)

Log Message:
-----------
Reverting revision 23913.

Actions on press is used everywhere in Blender, lets not make an exception here because there's something missing in the event system.

Bug report and potential solution is here, if anyone wants to have a go at it: http://projects.blender.org/tracker/index.php?func=detail&aid=19510

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23913

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/mesh_ops.c
    trunk/blender/source/blender/editors/transform/transform.c

Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c	2009-10-18 02:15:55 UTC (rev 23913)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c	2009-10-18 02:45:05 UTC (rev 23914)
@@ -267,8 +267,10 @@
 	RNA_string_set(kmi->ptr, "name", "INFO_MT_mesh_add");
 	
 	WM_keymap_add_item(keymap, "MESH_OT_separate", PKEY, KM_PRESS, 0, 0);
-		/* KM_CTRL+KM_RELEASE is used here, since KM_CTRL+KM_PRESS is taken for lasso */
-	WM_keymap_add_item(keymap, "MESH_OT_dupli_extrude_cursor", LEFTMOUSE, KM_RELEASE, KM_CTRL, 0); 
+						/* use KM_RELEASE because same key is used for tweaks
+						 * TEMPORARY REMAP TO ALT+CTRL TO AVOID CONFLICT 
+						 * */
+	WM_keymap_add_item(keymap, "MESH_OT_dupli_extrude_cursor", LEFTMOUSE, KM_RELEASE, KM_CTRL|KM_ALT, 0);
 	
 	WM_keymap_add_item(keymap, "MESH_OT_delete", XKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_delete", DELKEY, KM_PRESS, 0, 0);

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2009-10-18 02:15:55 UTC (rev 23913)
+++ trunk/blender/source/blender/editors/transform/transform.c	2009-10-18 02:45:05 UTC (rev 23914)
@@ -536,8 +536,7 @@
 	
 	/* items for modal map */
 	WM_modalkeymap_add_item(keymap, ESCKEY,    KM_PRESS, KM_ANY, 0, TFM_MODAL_CANCEL);
-		/* only use KM_RELEASE, otherwise LMB-CTRL extrude will catch the release event when we finish and were snapping */
-	WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_RELEASE, KM_ANY, 0, TFM_MODAL_CONFIRM); 
+	WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_ANY, KM_ANY, 0, TFM_MODAL_CONFIRM);
 	WM_modalkeymap_add_item(keymap, RETKEY, KM_PRESS, KM_ANY, 0, TFM_MODAL_CONFIRM);
 	WM_modalkeymap_add_item(keymap, PADENTER, KM_PRESS, KM_ANY, 0, TFM_MODAL_CONFIRM);
 





More information about the Bf-blender-cvs mailing list