Commit: bcfa73dfd3a853a25f94b2dec66e6322a7720f91
Author: Campbell Barton
Date: Tue Mar 15 00:38:33 2016 +1100
Branches: blender-v2.77-release
https://developer.blender.org/rBbcfa73dfd3a853a25f94b2dec66e6322a7720f91
Fix T47784: BMesh.from_object broken keyword args
===================================================================
M source/blender/python/bmesh/bmesh_py_types.c
===================================================================
diff --git a/source/blender/python/bmesh/bmesh_py_types.c
b/source/blender/python/bmesh/bmesh_py_types.c
index 833e8e3..ce8f124 100644
--- a/source/blender/python/bmesh/bmesh_py_types.c
+++ b/source/blender/python/bmesh/bmesh_py_types.c
@@ -937,8 +937,9 @@ PyDoc_STRVAR(bpy_bmesh_from_object_doc,
" :arg face_normals: Calculate face normals.\n"
" :type face_normals: boolean\n"
);
-static PyObject *bpy_bmesh_from_object(BPy_BMesh *self, PyObject *args)
+static PyObject *bpy_bmesh_from_object(BPy_BMesh *self, PyObject *args,
PyObject *kw)
{
+ static const char *kwlist[] = {"object", "scene", "deform", "render",
"cage", "face_normals", NULL};
PyObject *py_object;
PyObject *py_scene;
Object *ob;
@@ -953,8 +954,8 @@ static PyObject *bpy_bmesh_from_object(BPy_BMesh *self,
PyObject *args)
BPY_BM_CHECK_OBJ(self);
- if (!PyArg_ParseTuple(
- args, "OO|O&O&O&O&:from_object",
+ if (!PyArg_ParseTupleAndKeywords(
+ args, kw, "OO|O&O&O&O&:from_object", (char **)kwlist,
&py_object, &py_scene,
PyC_ParseBool, &use_deform,
PyC_ParseBool, &use_render,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
