Fix T44275: CTRL+LMB to extrude to mouse position conflicts with snapped
extruding More practical description of the bug: extruding with ctrl to use snapping and confirming the action added another extrusion to the mouse position. This was caused from the second event that is now sent if a key release happens within the click timeout. It triggers the "Extrude to Cursor" operator since it is called by CTRL+LMB wich is exactly the event that is sent in this case. I'm not totally happy with this workaround since it changes the Confirm/ Abort event for all transformation actions to key release which *might* result in more conflicts (fingers crossed this isn't the case). If this happens we might need to write some special transformation handling for extrusion. This is an example of the difficulties we get from loading too much functions on the same keys - we need to be careful with that!
This commit is contained in:
parent
ab2d05d958
commit
af23e8d44a
Notes:
blender-bot
2023-02-14 09:16:47 +01:00
Referenced by issue #44275, Using "Ctrl" to acquire snap target and left-click to confirm is broken since the sticky-keys commit
|
@ -510,7 +510,10 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
|
|||
float min[3], max[3];
|
||||
bool done = false;
|
||||
bool use_proj;
|
||||
|
||||
|
||||
if (ELEM(event->click_type, KM_CLICK, KM_HOLD))
|
||||
return OPERATOR_CANCELLED;
|
||||
|
||||
em_setup_viewcontext(C, &vc);
|
||||
|
||||
ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
|
||||
|
|
|
@ -407,7 +407,7 @@ void ED_keymap_mesh(wmKeyConfig *keyconf)
|
|||
/* Vertex Slide */
|
||||
WM_keymap_add_item(keymap, "TRANSFORM_OT_vert_slide", VKEY, KM_PRESS, KM_SHIFT, 0);
|
||||
/* use KM_CLICK because same key is used for tweaks */
|
||||
kmi = WM_keymap_add_item(keymap, "MESH_OT_dupli_extrude_cursor", ACTIONMOUSE, KM_CLICK, KM_CTRL, 0);
|
||||
kmi = WM_keymap_add_item(keymap, "MESH_OT_dupli_extrude_cursor", ACTIONMOUSE, KM_RELEASE, KM_CTRL, 0);
|
||||
RNA_boolean_set(kmi->ptr, "rotate_source", true);
|
||||
kmi = WM_keymap_add_item(keymap, "MESH_OT_dupli_extrude_cursor", ACTIONMOUSE, KM_PRESS, KM_SHIFT | KM_CTRL, 0);
|
||||
RNA_boolean_set(kmi->ptr, "rotate_source", false);
|
||||
|
|
|
@ -866,10 +866,10 @@ wmKeyMap *transform_modal_keymap(wmKeyConfig *keyconf)
|
|||
keymap = WM_modalkeymap_add(keyconf, "Transform Modal Map", modal_items);
|
||||
|
||||
/* 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_PRESS, 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);
|
||||
WM_modalkeymap_add_item(keymap, ESCKEY, KM_RELEASE, KM_ANY, 0, TFM_MODAL_CANCEL);
|
||||
WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_RELEASE, KM_ANY, 0, TFM_MODAL_CONFIRM);
|
||||
WM_modalkeymap_add_item(keymap, RETKEY, KM_RELEASE, KM_ANY, 0, TFM_MODAL_CONFIRM);
|
||||
WM_modalkeymap_add_item(keymap, PADENTER, KM_RELEASE, KM_ANY, 0, TFM_MODAL_CONFIRM);
|
||||
|
||||
WM_modalkeymap_add_item(keymap, GKEY, KM_PRESS, 0, 0, TFM_MODAL_TRANSLATE);
|
||||
WM_modalkeymap_add_item(keymap, RKEY, KM_PRESS, 0, 0, TFM_MODAL_ROTATE);
|
||||
|
|
Loading…
Reference in New Issue