diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 01:50:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 01:54:55 +0300 |
| commit | ae6e84471ab4fbf7c1f9b16b5184ca2b3040d65c (patch) | |
| tree | b4d0ce6b3b994b1f12c1e2bb3c252034a87264c7 /source/blender/editors/interface | |
| parent | 72369c638d936a76ba58c98b4b89626f6ff28f32 (diff) | |
| parent | c1d29ea7835c0f2ebd20531dfe3996c6bbce6b58 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index e608058dd99..76296b12898 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -2259,7 +2259,9 @@ void uiItemM(uiLayout *layout, const char *menuname, const char *name, int icon) if (layout->root->type == UI_LAYOUT_MENU && !icon) icon = ICON_BLANK1; - ui_item_menu(layout, name, icon, ui_item_menutype_func, mt, NULL, TIP_(mt->description), false); + ui_item_menu( + layout, name, icon, ui_item_menutype_func, mt, NULL, + mt->description ? TIP_(mt->description) : "", false); } /* popover */ diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 6009b0bdb81..81632b48c80 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1555,7 +1555,6 @@ static void VIEW2D_OT_smoothview(wmOperatorType *ot) { /* identifiers */ ot->name = "Smooth View 2D"; - ot->description = ""; ot->idname = "VIEW2D_OT_smoothview"; /* api callbacks */ |