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>2018-07-31 03:42:19 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-07-31 03:42:19 +0300
commit56754226deb0433654ec1a866c756b60ea176dd5 (patch)
treec2a38b6dab94ec7377640b1c269d92c7494d2fa1 /source/blender/editors/interface/interface_query.c
parent06e9d1683b76fa6c236f589671121c752e5cb374 (diff)
parent1195a4a040ba8ecffd3221f5aa38c7be5272124b (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_query.c')
-rw-r--r--source/blender/editors/interface/interface_query.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_query.c b/source/blender/editors/interface/interface_query.c
index 66f63fef82d..8893a5e17cc 100644
--- a/source/blender/editors/interface/interface_query.c
+++ b/source/blender/editors/interface/interface_query.c
@@ -114,6 +114,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) {