diff options
author | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
---|---|---|
committer | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
commit | 5a17c9bcbca737525fa535ceb45f9769a34a4df7 (patch) | |
tree | c7867d25494d053d11837d04b1ab8b86526a189d /source/blender/blenkernel/intern/blender_user_menu.c | |
parent | 9887b38692e3bcf7ba613ca947fd76e299c58cbd (diff) | |
parent | 20046defd735684a42750c4cb68d20d78ad5180c (diff) |
Merge branch 'blender2.8' into temp-tab_drag_droptemp-tab_drag_drop
Diffstat (limited to 'source/blender/blenkernel/intern/blender_user_menu.c')
-rw-r--r-- | source/blender/blenkernel/intern/blender_user_menu.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/blender_user_menu.c b/source/blender/blenkernel/intern/blender_user_menu.c index 387776aa144..3ec46e23cd1 100644 --- a/source/blender/blenkernel/intern/blender_user_menu.c +++ b/source/blender/blenkernel/intern/blender_user_menu.c @@ -76,14 +76,17 @@ bUserMenuItem *BKE_blender_user_menu_item_add(ListBase *lb, int type) { uint size; - if (type == USER_MENU_TYPE_OPERATOR) { + if (type == USER_MENU_TYPE_SEP) { + size = sizeof(bUserMenuItem); + } + else if (type == USER_MENU_TYPE_OPERATOR) { size = sizeof(bUserMenuItem_Op); } else if (type == USER_MENU_TYPE_MENU) { size = sizeof(bUserMenuItem_Menu); } - else if (type == USER_MENU_TYPE_SEP) { - size = sizeof(bUserMenuItem); + else if (type == USER_MENU_TYPE_PROP) { + size = sizeof(bUserMenuItem_Prop); } else { BLI_assert(0); |