[Bf-blender-cvs] [56754226deb] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Tue Jul 31 02:51:15 CEST 2018


Commit: 56754226deb0433654ec1a866c756b60ea176dd5
Author: Campbell Barton
Date:   Tue Jul 31 10:42:19 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB56754226deb0433654ec1a866c756b60ea176dd5

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/interface/interface_context_menu.c
index 240649c8ab0,54e755f6cc6..d00ab70562c
--- a/source/blender/editors/interface/interface_context_menu.c
+++ b/source/blender/editors/interface/interface_context_menu.c
@@@ -687,35 -532,8 +687,35 @@@ bool ui_popup_context_menu_for_button(b
  		uiItemS(layout);
  	}
  
 +	/* Favorites Menu */
 +	if (ui_but_is_user_menu_compatible(C, but)) {
 +		uiBlock *block = uiLayoutGetBlock(layout);
 +		const int w = uiLayoutGetWidth(layout);
 +		uiBut *but2;
 +
 +		but2 = uiDefIconTextBut(
 +		        block, UI_BTYPE_BUT, 0, ICON_MENU_PANEL,
 +		        CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Add to Favorites Menu"),
 +		        0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0,
 +		        "Add to a user defined context menu (stored in the user preferences)");
 +		UI_but_func_set(but2, popup_user_menu_add_or_replace_func, but, NULL);
 +
 +		bUserMenu *um = ED_screen_user_menu_find(C);
 +		if (um) {
 +			bUserMenuItem *umi = ui_but_user_menu_find(C, but, um);
 +			if (umi != NULL) {
 +				but2 = uiDefIconTextBut(
 +				        block, UI_BTYPE_BUT, 0, ICON_CANCEL,
 +				        CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove from Favorites Menu"),
 +				        0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
 +				UI_but_func_set(but2, popup_user_menu_remove_func, um, umi);
 +			}
 +		}
 +		uiItemS(layout);
 +	}
 +
  	/* 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);



More information about the Bf-blender-cvs mailing list