Fix T60383: mesh merge type callback returned NULL
authorJacques Lucke <mail@jlucke.com>
Tue, 15 Jan 2019 17:27:21 +0000 (18:27 +0100)
committerJacques Lucke <mail@jlucke.com>
Tue, 15 Jan 2019 17:27:21 +0000 (18:27 +0100)
source/blender/editors/mesh/editmesh_tools.c

index 3af4708..b8dd46f 100644 (file)
@@ -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)