diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:50:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:50:13 +0300 |
| commit | 3d681108bf83970b06cc48a8752a2af14d6a2b71 (patch) | |
| tree | 7de21abafa416816bec2ae9b5393b90adfc2327c /source | |
| parent | 908b6960c01ffb1665af56ff6f03aaa3eac5366a (diff) | |
| parent | 20367898fe0d16e0c2391df3eb1fff120db2b09c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index a4d08b15a6d..b4f7e9256a3 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1520,7 +1520,7 @@ int transformEvent(TransInfo *t, const wmEvent *event) /* confirm transform if launch key is released after mouse move */ if (t->flag & T_RELEASE_CONFIRM) { /* XXX Keyrepeat bug in Xorg messes this up, will test when fixed */ - if (event->type == t->launch_event && (t->launch_event == LEFTMOUSE || t->launch_event == RIGHTMOUSE)) { + if ((event->type == t->launch_event) && ISMOUSE(t->launch_event)) { t->state = TRANS_CONFIRM; } } @@ -2140,14 +2140,8 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve t->mode = mode; - t->launch_event = event ? event->type : -1; - - if (t->launch_event == EVT_TWEAK_R) { - t->launch_event = RIGHTMOUSE; - } - else if (t->launch_event == EVT_TWEAK_L) { - t->launch_event = LEFTMOUSE; - } + /* Needed to translate tweak events to mouse buttons. */ + t->launch_event = event ? WM_userdef_event_type_from_keymap_type(event->type) : -1; // XXX Remove this when wm_operator_call_internal doesn't use window->eventstate (which can have type = 0) // For manipulator only, so assume LEFTMOUSE |