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

Revert "Fix T63921: Unable to use confirm on release for keyboard shortcuts"

Browse Source 
This reverts commit 30bf48c9ca.
This commit is contained in:
Sebastian Parborg
2019-06-26 17:55:00 +02:00
parent 81b11b795c
commit 6e016a451e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}
}

3
source/blender/editors/transform/transform_generics.c
View File

@@ -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;
}
}