diff options
| author | Jacques Lucke <mail@jlucke.com> | 2019-01-15 20:27:21 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2019-01-15 20:27:21 +0300 |
| commit | a0df26f0041062c8268e9e6f099ee7db42bf61b4 (patch) | |
| tree | 66d72822a46cdc303b801ece5057698b99a2cc89 /source/blender/editors/mesh | |
| parent | e4c78436c6a3bef0d30ff656a4758295f58b5ae4 (diff) | |
Fix T60383: mesh merge type callback returned NULL
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 3af4708ee9b..b8dd46f3cc3 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -2885,7 +2885,8 @@ static const EnumPropertyItem *merge_type_itemf(bContext *C, PointerRNA *UNUSED( return item; } - return NULL; + /* Get all items e.g. when creating keymap item. */ + return merge_type_items; } void MESH_OT_merge(wmOperatorType *ot) |