Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-03-14 16:38:33 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-03-14 16:38:33 +0300
commit2a9bc888d0b5dfbea12ccd5024d6d90770aaa396 (patch)
tree64707711ecae0b1fff4226b13215fdede1fa3c5b /source/blender/python/bmesh
parenta12d42712bae8906e289ebe2200c7189f68a5db3 (diff)
Fix T47784: BMesh.from_object broken keyword args
Diffstat (limited to 'source/blender/python/bmesh')
-rw-r--r--source/blender/python/bmesh/bmesh_py_types.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c
index 833e8e32147..ce8f1247919 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,