From 8db6b1e2ddf342a5cf6bf1f42359ccbfee1ab958 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 5 Jun 2019 13:27:41 +0200 Subject: Fix empty name shown for operators opening menus without a title For some cases like the edit mode context menu we don't currently have a fixed title since it's dynamic. This should be improved, but we should at least still show Call Menu if there is no menu title. --- source/blender/windowmanager/intern/wm_operator_type.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source/blender') diff --git a/source/blender/windowmanager/intern/wm_operator_type.c b/source/blender/windowmanager/intern/wm_operator_type.c index 1cec9848104..5c9093168bd 100644 --- a/source/blender/windowmanager/intern/wm_operator_type.c +++ b/source/blender/windowmanager/intern/wm_operator_type.c @@ -586,12 +586,13 @@ static void wm_operatortype_free_macro(wmOperatorType *ot) const char *WM_operatortype_name(struct wmOperatorType *ot, struct PointerRNA *properties) { + const char *name = NULL; + if (ot->get_name && properties) { - return ot->get_name(ot, properties); - } - else { - return RNA_struct_ui_name(ot->srna); + name = ot->get_name(ot, properties); } + + return (name && name[0]) ? name : RNA_struct_ui_name(ot->srna); } /** \} */ -- cgit v1.2.3