diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-12-19 15:19:43 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-19 15:19:43 +0400 |
commit | 319dc74f21a2ef1f2f903d8181b6f8c443313082 (patch) | |
tree | 63bac496228027fccd7acb6d5c1cba2669cc57cc | |
parent | 47c5b79d3e70f87b1ca81ff7a64f01b431f7e6bd (diff) |
svn merge ^/trunk/blender -c53172v2.65a
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c index f85c3347104..a43c5c18126 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.c +++ b/source/blender/python/bmesh/bmesh_py_utils.c @@ -106,7 +106,7 @@ static PyObject *bpy_bm_utils_vert_collapse_edge(PyObject *UNUSED(self), PyObjec PyDoc_STRVAR(bpy_bm_utils_vert_collapse_faces_doc, ".. method:: vert_collapse_faces(vert, edge, fac, join_faces)\n" "\n" -" Split an edge, return the newly created data.\n" +" Collapses a vertex that has only two manifold edges onto a vertex it shares an edge with.\n" "\n" " :arg vert: The vert that will be collapsed.\n" " :type vert: :class:`bmesh.types.BMVert`\n" @@ -163,7 +163,7 @@ static PyObject *bpy_bm_utils_vert_collapse_faces(PyObject *UNUSED(self), PyObje } else { PyErr_SetString(PyExc_ValueError, - "vert_collapse_edge(vert, edge): no new edge created, internal error"); + "vert_collapse_faces(vert, edge): no new edge created, internal error"); return NULL; } } |