archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T55301: Transform confirm on release fails w/ MMB

Browse Source
This commit is contained in:
Campbell Barton
2018-06-08 08:48:21 +02:00
parent e3fe8ce00b
commit 20367898fe
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/transform/transform.c
View File

@@ -1504,7 +1504,7 @@ int transformEvent(TransInfo *t, const wmEvent *event)
/* confirm transform if launch key is released after mouse move */ /* confirm transform if launch key is released after mouse move */
if (t->flag & T_RELEASE_CONFIRM) { if (t->flag & T_RELEASE_CONFIRM) {
/* XXX Keyrepeat bug in Xorg messes this up, will test when fixed */ /* 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; t->state = TRANS_CONFIRM;
} }
} }
@@ -2066,14 +2066,8 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
t->mode = mode; t->mode = mode;
t->launch_event = event ? event->type : -1; /* Needed to translate tweak events to mouse buttons. */
t->launch_event = event ? WM_userdef_event_type_from_keymap_type(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;
}
// XXX Remove this when wm_operator_call_internal doesn't use window->eventstate (which can have type = 0) // XXX Remove this when wm_operator_call_internal doesn't use window->eventstate (which can have type = 0)
// For manipulator only, so assume LEFTMOUSE // For manipulator only, so assume LEFTMOUSE