diff options
Diffstat (limited to 'source/blender/editors/transform/transform.c')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index d5d22a670f1..13684708f8e 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1032,10 +1032,13 @@ int transformEvent(TransInfo *t, wmEvent *event) } /* confirm transform if launch key is released after mouse move */ - /* XXX Keyrepeat bug in Xorg fucks this up, will test when fixed */ - if (event->type == t->launch_event && (t->launch_event == LEFTMOUSE || t->launch_event == RIGHTMOUSE) && t->state != TRANS_STARTING) + if (t->flag & T_RELEASE_CONFIRM || t->state != TRANS_STARTING) { - t->state = TRANS_CONFIRM; + /* XXX Keyrepeat bug in Xorg fucks this up, will test when fixed */ + if (event->type == t->launch_event && (t->launch_event == LEFTMOUSE || t->launch_event == RIGHTMOUSE)) + { + t->state = TRANS_CONFIRM; + } } } @@ -1443,16 +1446,13 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int t->launch_event = event ? event->type : -1; - if (U.flag & USER_DRAGIMMEDIATE) + if (t->launch_event == EVT_TWEAK_R) { - if (t->launch_event == EVT_TWEAK_R) - { - t->launch_event = RIGHTMOUSE; - } - else if (t->launch_event == EVT_TWEAK_L) - { - t->launch_event = LEFTMOUSE; - } + t->launch_event = RIGHTMOUSE; + } + else if (t->launch_event == EVT_TWEAK_L) + { + t->launch_event = LEFTMOUSE; } // XXX Remove this when wm_operator_call_internal doesn't use window->eventstate (which can have type = 0) |