[Bf-blender-cvs] [a0df26f0041] master: Fix T60383: mesh merge type callback returned NULL

[Jacques Lucke]

Commit: a0df26f0041062c8268e9e6f099ee7db42bf61b4
Author: Jacques Lucke
Date:   Tue Jan 15 18:27:21 2019 +0100
Branches: master
https://developer.blender.org/rBa0df26f0041062c8268e9e6f099ee7db42bf61b4

Fix T60383: mesh merge type callback returned NULL

===================================================================

M	source/blender/editors/mesh/editmesh_tools.c

===================================================================

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)