Commit: 29d7358ff67c0e591626d54a294b4a832d481633
Author: Campbell Barton
Date:   Tue Jun 19 19:20:46 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB29d7358ff67c0e591626d54a294b4a832d481633

UI: fix ctrl wheel while over the opposite side

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

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 f1916e90525..5f4bf39a9bd 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4333,11 +4333,13 @@ static int ui_do_but_NUM(
                        retval = WM_UI_HANDLER_BREAK; /* allow accumulating 
values, otherwise scrolling gets preference */
                else if (type == WHEELDOWNMOUSE && event->ctrl) {
                        mx = but->rect.xmin;
+                       but->drawflag &= ~UI_BUT_ACTIVE_RIGHT;
                        but->drawflag |= UI_BUT_ACTIVE_LEFT;
                        click = 1;
                }
                else if (type == WHEELUPMOUSE && event->ctrl) {
                        mx = but->rect.xmax;
+                       but->drawflag &= ~UI_BUT_ACTIVE_LEFT;
                        but->drawflag |= UI_BUT_ACTIVE_RIGHT;
                        click = 1;
                }

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to