From 319dc74f21a2ef1f2f903d8181b6f8c443313082 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 19 Dec 2012 11:19:43 +0000 Subject: svn merge ^/trunk/blender -c53172 --- source/blender/python/bmesh/bmesh_py_utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '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 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; } } -- cgit v1.2.3