[Bf-blender-cvs] [6e016a451e0] master: Revert "Fix T63921: Unable to use confirm on release for keyboard shortcuts"

Sebastian Parborg noreply at git.blender.org
Wed Jun 26 17:55:55 CEST 2019


Commit: 6e016a451e0000bbdda574476f7267733607f1ee
Author: Sebastian Parborg
Date:   Wed Jun 26 17:55:00 2019 +0200
Branches: master
https://developer.blender.org/rB6e016a451e0000bbdda574476f7267733607f1ee

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

This reverts commit 30bf48c9caee40ce457d58b5bfe7fc398b7e9891.

===================================================================

M	source/blender/editors/transform/transform.c
M	source/blender/editors/transform/transform_generics.c

===================================================================

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



More information about the Bf-blender-cvs mailing list