[Bf-blender-cvs] [6e95d8484ca] master: Fix upside down tool menus
Campbell Barton
noreply at git.blender.org
Tue Mar 5 13:52:34 CET 2019
Commit: 6e95d8484caf5cd5c6b9e34ce662516e0e78ee88
Author: Campbell Barton
Date: Tue Mar 5 23:51:10 2019 +1100
Branches: master
https://developer.blender.org/rB6e95d8484caf5cd5c6b9e34ce662516e0e78ee88
Fix upside down tool menus
Regression from 4dd575e5ab55e153f8
===================================================================
M source/blender/editors/interface/interface_region_menu_popup.c
===================================================================
diff --git a/source/blender/editors/interface/interface_region_menu_popup.c b/source/blender/editors/interface/interface_region_menu_popup.c
index 52fd9efe2cd..43c94a5cb9d 100644
--- a/source/blender/editors/interface/interface_region_menu_popup.c
+++ b/source/blender/editors/interface/interface_region_menu_popup.c
@@ -224,7 +224,8 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
/* Flip layout because rna enum list ordered in reverse. */
if ((pup->but && pup->but->type != UI_BTYPE_PULLDOWN) &&
- (UI_but_menutype_get(pup->but) == NULL))
+ (UI_but_menutype_get(pup->but) == NULL) &&
+ (UI_but_is_tool(pup->but) == false))
{
UI_block_order_flip(block);
}
More information about the Bf-blender-cvs
mailing list