diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-10-18 06:15:55 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-10-18 06:15:55 +0400 |
| commit | babf9b2d8898ee793381246c7d9a198c978de11b (patch) | |
| tree | e4fdf9220576b6163f3f0cc1e8d0a9f7930b7ca0 /source | |
| parent | eff008385b4acbd3ea8efac23184ab6a18eb57d9 (diff) | |
Another attempt to fix the problems with confirming transforms while snapping (LMB confirm, CTRL-key still held for snapping) and "ctrl-click" extrusion.
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
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index dc22e023856..2fa1ce8ceed 100644 --- 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 4c24d366162..c776aa4bc9a 100644 --- 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); |