[Bf-blender-cvs] [0c955ed6eab] blender2.8: Fix T56155: Header shows in popover context menu

[Campbell Barton]

Commit: 0c955ed6eab2544ebad8823e509cc348b33c3556
Author: Campbell Barton
Date:   Tue Jul 31 10:45:35 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB0c955ed6eab2544ebad8823e509cc348b33c3556

Fix T56155: Header shows in popover context menu

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

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

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

diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 4f260c35797..d4fccc48bfc 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -831,6 +831,7 @@ bool ui_but_is_toggle(const uiBut *but);
 bool ui_but_is_popover_once_compat(const uiBut *but);
 
 extern bool ui_block_is_menu(const uiBlock *block) ATTR_WARN_UNUSED_RESULT;
+extern bool ui_block_is_popover(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;
 
diff --git a/source/blender/editors/interface/interface_query.c b/source/blender/editors/interface/interface_query.c
index 8893a5e17cc..d0f7e1341de 100644
--- a/source/blender/editors/interface/interface_query.c
+++ b/source/blender/editors/interface/interface_query.c
@@ -109,6 +109,11 @@ bool ui_block_is_menu(const uiBlock *block)
 	        ((block->flag & UI_BLOCK_KEEP_OPEN) == 0));
 }
 
+bool ui_block_is_popover(const uiBlock *block)
+{
+	return (block->flag & UI_BLOCK_POPOVER) != 0;
+}
+
 bool ui_block_is_pie_menu(const uiBlock *block)
 {
 	return ((block->flag & UI_BLOCK_RADIAL) != 0);
@@ -118,6 +123,7 @@ bool ui_block_is_popup_any(const uiBlock *block)
 {
 	return (
 	        ui_block_is_menu(block) ||
+	        ui_block_is_popover(block) ||
 	        ui_block_is_pie_menu(block)
 	);
 }