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/windowmanager | |
parent | 72369c638d936a76ba58c98b4b89626f6ff28f32 (diff) | |
parent | c1d29ea7835c0f2ebd20531dfe3996c6bbce6b58 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_menu_type.c | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operator_type.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_menu_type.c b/source/blender/windowmanager/intern/wm_menu_type.c index c8bce13b27c..020d08f35fa 100644 --- a/source/blender/windowmanager/intern/wm_menu_type.c +++ b/source/blender/windowmanager/intern/wm_menu_type.c @@ -61,6 +61,7 @@ MenuType *WM_menutype_find(const char *idname, bool quiet) bool WM_menutype_add(MenuType *mt) { + BLI_assert((mt->description == NULL) || (mt->description[0])); BLI_ghash_insert(menutypes_hash, mt->idname, mt); return true; } diff --git a/source/blender/windowmanager/intern/wm_operator_type.c b/source/blender/windowmanager/intern/wm_operator_type.c index 33613d97f03..54a09f7ce9a 100644 --- a/source/blender/windowmanager/intern/wm_operator_type.c +++ b/source/blender/windowmanager/intern/wm_operator_type.c @@ -120,6 +120,7 @@ static void wm_operatortype_append__end(wmOperatorType *ot) if (ot->name == NULL) { CLOG_ERROR(WM_LOG_OPERATORS, "Operator '%s' has no name property", ot->idname); } + BLI_assert((ot->description == NULL) || (ot->description[0])); /* Allow calling _begin without _end in operatortype creation. */ WM_operatortype_props_advanced_end(ot); |