[Bf-blender-cvs] [1195a4a040b] master: UI: add check for any kind of popup

[Campbell Barton]

Commit: 1195a4a040ba8ecffd3221f5aa38c7be5272124b
Author: Campbell Barton
Date:   Tue Jul 31 10:37:46 2018 +1000
Branches: master
https://developer.blender.org/rB1195a4a040ba8ecffd3221f5aa38c7be5272124b

UI: add check for any kind of popup

Fixes T56155 when merging into 2.8

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

M	source/blender/editors/interface/interface_context_menu.c
M	source/blender/editors/interface/interface_intern.h
M	source/blender/editors/interface/interface_query.c

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

diff --git a/source/blender/editors/interface/interface_context_menu.c b/source/blender/editors/interface/interface_context_menu.c
index 0306139bac0..54e755f6cc6 100644
--- a/source/blender/editors/interface/interface_context_menu.c
+++ b/source/blender/editors/interface/interface_context_menu.c
@@ -533,7 +533,7 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but)
 	}
 
 	/* Show header tools for header buttons. */
-	if (ui_block_is_menu(but->block) == false) {
+	if (ui_block_is_popup_any(but->block) == false) {
 		ARegion *ar = CTX_wm_region(C);
 		if (ar && (ar->regiontype == RGN_TYPE_HEADER)) {
 			uiItemMenuF(layout, IFACE_("Header"), ICON_NONE, ED_screens_header_tools_menu_create, NULL);
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index dc5e100b5f2..75f2efdf3aa 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -752,6 +752,7 @@ bool ui_but_is_toggle(const uiBut *but);
 
 extern bool ui_block_is_menu(const uiBlock *block) ATTR_WARN_UNUSED_RESULT;
 extern bool ui_block_is_pie_menu(const uiBlock *block) ATTR_WARN_UNUSED_RESULT;
+extern bool ui_block_is_popup_any(const uiBlock *block) ATTR_WARN_UNUSED_RESULT;
 
 /* interface_context_menu.c */
 bool ui_popup_context_menu_for_button(struct bContext *C, uiBut *but);
diff --git a/source/blender/editors/interface/interface_query.c b/source/blender/editors/interface/interface_query.c
index f7dbb9b14ed..1ad4a7d7f31 100644
--- a/source/blender/editors/interface/interface_query.c
+++ b/source/blender/editors/interface/interface_query.c
@@ -86,6 +86,14 @@ bool ui_block_is_pie_menu(const uiBlock *block)
 	return ((block->flag & UI_BLOCK_RADIAL) != 0);
 }
 
+bool ui_block_is_popup_any(const uiBlock *block)
+{
+	return (
+	        ui_block_is_menu(block) ||
+	        ui_block_is_pie_menu(block)
+	);
+}
+
 bool UI_block_is_empty(const uiBlock *block)
 {
 	for (const uiBut *but = block->buttons.first; but; but = but->next) {