[Bf-blender-cvs] [92454ae100a] master: Fix assert failure when using Ctrl+Mousewheel on Object Mode button

[Julian Eisel]

Commit: 92454ae100a1bf8c1f41da5cd1abac27250474df
Author: Julian Eisel
Date:   Mon Sep 21 13:04:26 2020 +0200
Branches: master
https://developer.blender.org/rB92454ae100a1bf8c1f41da5cd1abac27250474df

Fix assert failure when using Ctrl+Mousewheel on Object Mode button

Do a proper check to see if the button supports Ctrl+Mousewheel cycling.

See T80659.

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

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 19261bd3db6..51a719199da 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -5651,7 +5651,7 @@ static int ui_do_but_BLOCK(bContext *C, uiBut *but, uiHandleButtonData *data, co
       button_activate_state(C, but, BUTTON_STATE_MENU_OPEN);
       return WM_UI_HANDLER_BREAK;
     }
-    if (but->type == UI_BTYPE_MENU) {
+    if (ui_but_supports_cycling(but)) {
       if (ELEM(event->type, WHEELDOWNMOUSE, WHEELUPMOUSE) && event->ctrl) {
         const int direction = (event->type == WHEELDOWNMOUSE) ? 1 : -1;