[Bf-blender-cvs] [20cccb1561f] blender-v2.79a-release: Fix bmesh.utils.face_join arg parsing

[Campbell Barton]

Commit: 20cccb1561fde33850e65358ca432648a4b9d65c
Author: Campbell Barton
Date:   Fri Jan 12 14:51:15 2018 +1100
Branches: blender-v2.79a-release
https://developer.blender.org/rB20cccb1561fde33850e65358ca432648a4b9d65c

Fix bmesh.utils.face_join arg parsing

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

M	source/blender/python/bmesh/bmesh_py_utils.c

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

diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c
index fc0cd9e475b..224c8295a9b 100644
--- a/source/blender/python/bmesh/bmesh_py_utils.c
+++ b/source/blender/python/bmesh/bmesh_py_utils.c
@@ -650,7 +650,7 @@ static PyObject *bpy_bm_utils_face_join(PyObject *UNUSED(self), PyObject *args)
 	bool do_remove = true;
 
 	if (!PyArg_ParseTuple(
-	        args, "O|i:face_join",
+	        args, "O|O&:face_join",
 	        &py_face_array,
 	        PyC_ParseBool, &do_remove))
 	{