[Bf-blender-cvs] [9b1ca19] master: Fix RMB menu in popup, included 'Header' submenu

[Campbell Barton]

Commit: 9b1ca19396e4fb76d1f93469b2425682a8fba69e
Author: Campbell Barton
Date:   Tue May 26 16:23:26 2015 +1000
Branches: master
https://developer.blender.org/rB9b1ca19396e4fb76d1f93469b2425682a8fba69e

Fix RMB menu in popup, included 'Header' submenu

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

M	source/blender/editors/interface/interface_handlers.c

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

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index f90c3af..4179da9 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6658,7 +6658,7 @@ static bool ui_but_menu(bContext *C, uiBut *but)
 	}
 
 	/* Show header tools for header buttons. */
-	{
+	if (ui_block_is_menu(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);