diff options
author | Sebastian Parborg <darkdefende@gmail.com> | 2019-06-26 18:55:00 +0300 |
---|---|---|
committer | Sebastian Parborg <darkdefende@gmail.com> | 2019-06-26 18:55:47 +0300 |
commit | 6e016a451e0000bbdda574476f7267733607f1ee (patch) | |
tree | 72b5205aae6d9a5686566ae30a7daa7cdf3467aa /source | |
parent | 81b11b795c33ce6e81ea0966e5fc4d11f8fb7c3a (diff) |
Revert "Fix T63921: Unable to use confirm on release for keyboard shortcuts"
This reverts commit 30bf48c9caee40ce457d58b5bfe7fc398b7e9891.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/transform/transform.c | 7 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 7c797d2d7f5..5b3f7d85b43 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1593,8 +1593,11 @@ int transformEvent(TransInfo *t, const wmEvent *event) } /* confirm transform if launch key is released after mouse move */ - if ((t->flag & T_RELEASE_CONFIRM) && event->type == t->launch_event) { - t->state = TRANS_CONFIRM; + if (t->flag & T_RELEASE_CONFIRM) { + /* XXX Keyrepeat bug in Xorg messes this up, will test when fixed */ + if ((event->type == t->launch_event) && ISMOUSE(t->launch_event)) { + t->state = TRANS_CONFIRM; + } } } diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 2d04e995af0..4a9584ed9be 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1692,8 +1692,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve } } else { - if (ISMOUSE(t->launch_event) && (U.flag & USER_RELEASECONFIRM)) { - /* Global "release confirm" on mouse bindings */ + if (U.flag & USER_RELEASECONFIRM) { t->flag |= T_RELEASE_CONFIRM; } } |