From d8a80e5949e454d8e326f54abf0ef9a0bc3aeb83 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Thu, 3 Sep 2020 12:33:28 -0300 Subject: Revert "Fix T59358: Wrong status bar keymap for release confirms and right click select." This reverts commit 17905e89a72dcd816efb51b7403e6c01bc3e71e8. Fix T80429: Transform Tools cannot be cancelled rB17905e89 better filtered the key items that should appear in the status bar. But it is very restrictive since canceling is still possible in other cases. # Conflicts: # source/blender/editors/transform/transform.c --- source/blender/editors/transform/transform.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/transform/transform.c') diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 11f0e791d14..4beafc6d363 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -567,9 +567,9 @@ static bool transform_modal_item_poll(const wmOperator *op, int value) const TransInfo *t = op->customdata; switch (value) { case TFM_MODAL_CANCEL: { - if ((t->flag & T_RELEASE_CONFIRM) && ISMOUSE(t->launch_event)) { - return false; - } + /* TODO: Canceling with LMB is not possible when the operator is activated + * through tweak and the LMB is pressed. + * Therefore, this item should not appear in the status bar. */ break; } case TFM_MODAL_PROPSIZE: -- cgit v1.2.3