[Bf-blender-cvs] [b96f1f80916] master: UI: use Ctrl-TrackPad to cycle values

Yevgeny Makarov noreply at git.blender.org
Fri Oct 9 05:05:16 CEST 2020


Commit: b96f1f80916ac6e2707adfc6cd5503bcf795e006
Author: Yevgeny Makarov
Date:   Fri Oct 9 13:59:32 2020 +1100
Branches: master
https://developer.blender.org/rBb96f1f80916ac6e2707adfc6cd5503bcf795e006

UI: use Ctrl-TrackPad to cycle values

Minor change missing from 9bfea67751dc59554c8928802b4e1f04278ab537

Ref D8530

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

M	source/blender/editors/interface/interface_handlers.c

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

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index def6e0d480d..8448acaaceb 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4998,7 +4998,7 @@ static int ui_do_but_NUM(
     }
 
     /* XXX hardcoded keymap check.... */
-    if (type == MOUSEPAN && event->alt) {
+    if (type == MOUSEPAN && event->ctrl) {
       /* allow accumulating values, otherwise scrolling gets preference */
       retval = WM_UI_HANDLER_BREAK;
     }
@@ -5310,7 +5310,7 @@ static int ui_do_but_SLI(
     }
 
     /* XXX hardcoded keymap check.... */
-    if (type == MOUSEPAN && event->alt) {
+    if (type == MOUSEPAN && event->ctrl) {
       /* allow accumulating values, otherwise scrolling gets preference */
       retval = WM_UI_HANDLER_BREAK;
     }



More information about the Bf-blender-cvs mailing list