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>2019-05-27 08:30:48 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-27 08:33:12 +0300
commit552f5da3c4852cdcdfd745bf256de21a2d264f34 (patch)
treeb3d014feaef57f7fe7be9206ce9bdedf49d6ca31 /source/blender/editors/interface/interface_layout.c
parentab0e839f9a96841615f747a4481323b280baf7c4 (diff)
Mitigate T64346: Quick Favorites items cant be removed
For now don't show missing quick favorite menu items which are missing. Once menu editing is supported they could be displayed.
Diffstat (limited to 'source/blender/editors/interface/interface_layout.c')
-rw-r--r--source/blender/editors/interface/interface_layout.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index a3906879fd7..b89767171ab 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2773,14 +2773,8 @@ static uiBut *ui_item_menu(uiLayout *layout,
return but;
}
-void uiItemM(uiLayout *layout, const char *menuname, const char *name, int icon)
+void uiItemM_ptr(uiLayout *layout, MenuType *mt, const char *name, int icon)
{
- MenuType *mt = WM_menutype_find(menuname, false);
- if (mt == NULL) {
- RNA_warning("not found %s", menuname);
- return;
- }
-
if (!name) {
name = CTX_IFACE_(mt->translation_context, mt->label);
}
@@ -2799,6 +2793,16 @@ void uiItemM(uiLayout *layout, const char *menuname, const char *name, int icon)
false);
}
+void uiItemM(uiLayout *layout, const char *menuname, const char *name, int icon)
+{
+ MenuType *mt = WM_menutype_find(menuname, false);
+ if (mt == NULL) {
+ RNA_warning("not found %s", menuname);
+ return;
+ }
+ uiItemM_ptr(layout, mt, name, icon);
+}
+
void uiItemMContents(uiLayout *layout, const char *menuname)
{
MenuType *mt = WM_menutype_find(menuname, false);