Another attempt to fix the problems with confirming transforms while snapping (LMB...

Made the confirm keymap for transforms use KM_RELEASE instead of KM_ANY (I didn't see any case where this failed yet?), and restored the "ctrl-click" as it was before r23903

diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index dc22e023856b1fb9a309310777e4e898f37d5d39..2fa1ce8ceedb3cb711f6e9365a94f2ef03606576 100644 (file)
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -267,10 +267,8 @@ void ED_keymap_mesh(wmKeyConfig *keyconf)
        RNA_string_set(kmi->ptr, "name", "INFO_MT_mesh_add");
        
        WM_keymap_add_item(keymap, "MESH_OT_separate", PKEY, KM_PRESS, 0, 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);
+               /* 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); 
        
        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);

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 4c24d36616229452db218666952d73b2b0296e28..c776aa4bc9af655d0314ad866c8431e421ac1170 100644 (file)
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -536,7 +536,8 @@ void transform_modal_keymap(wmKeyConfig *keyconf)
        
        /* items for modal map */
        WM_modalkeymap_add_item(keymap, ESCKEY,    KM_PRESS, KM_ANY, 0, TFM_MODAL_CANCEL);
-       WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_ANY, KM_ANY, 0, TFM_MODAL_CONFIRM);
+               /* 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, RETKEY, KM_PRESS, KM_ANY, 0, TFM_MODAL_CONFIRM);
        WM_modalkeymap_add_item(keymap, PADENTER, KM_PRESS, KM_ANY, 0, TFM_MODAL_CONFIRM);