Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-03-05 15:51:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-05 15:51:57 +0300
commit6e95d8484caf5cd5c6b9e34ce662516e0e78ee88 (patch)
treef1871dd52278e182c65da4ce869e0e86df3a21ce /source/blender/editors/interface/interface_region_menu_popup.c
parent2a811e69554881d85e5311538b4406d5aae6a66d (diff)
Fix upside down tool menus
Regression from 4dd575e5ab55e153f8
Diffstat (limited to 'source/blender/editors/interface/interface_region_menu_popup.c')
-rw-r--r--source/blender/editors/interface/interface_region_menu_popup.c3
1 files changed, 2 insertions, 1 deletions
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);
}