diff options
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.h | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_mesh_conv.c | 4 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_api.c | 4 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types.c | 4 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_utils.c | 52 |
6 files changed, 36 insertions, 36 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index 7b0a59d2ca1..3b7f5182d2d 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -49,7 +49,7 @@ #include "MEM_guardedalloc.h" /* Mesh -> BMesh */ -void BM_mesh_to_bmesh(BMesh *bm, Mesh *me, int set_key, int act_key_nr) +void BM_mesh_bm_from_me(BMesh *bm, Mesh *me, int set_key, int act_key_nr) { MVert *mvert; BLI_array_declare(verts); @@ -421,7 +421,7 @@ BM_INLINE void bmesh_quick_edgedraw_flag(MEdge *med, BMEdge *e) } } -void BM_mesh_from_bmesh(BMesh *bm, Mesh *me, int dotess) +void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, int dotess) { MLoop *mloop; MPoly *mpoly; diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.h b/source/blender/bmesh/intern/bmesh_mesh_conv.h index f1b820767d4..f9c51584081 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.h +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.h @@ -34,7 +34,7 @@ struct Mesh; -void BM_mesh_to_bmesh(BMesh *bm, struct Mesh *me, int set_key, int act_key_nr); -void BM_mesh_from_bmesh(BMesh *bm, struct Mesh *me, int dotess); +void BM_mesh_bm_from_me(BMesh *bm, struct Mesh *me, int set_key, int act_key_nr); +void BM_mesh_bm_to_me(BMesh *bm, struct Mesh *me, int dotess); #endif /* __BMESH_MESH_CONV_H__ */ diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index 3e0fc881bfa..651093806b6 100644 --- a/source/blender/bmesh/operators/bmo_mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c @@ -57,7 +57,7 @@ void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) Mesh *me = BMO_slot_ptr_get(op, "mesh"); int set_key = BMO_slot_bool_get(op, "set_shapekey"); - BM_mesh_to_bmesh(bm, me, set_key, ob->shapenr - 1); + BM_mesh_bm_from_me(bm, me, set_key, ob->shapenr - 1); if (me->key && ob->shapenr > me->key->totkey) { ob->shapenr = me->key->totkey - 1; @@ -79,5 +79,5 @@ void bmo_bmesh_to_mesh_exec(BMesh *bm, BMOperator *op) /* Object *ob = BMO_slot_ptr_get(op, "object"); */ int dotess = !BMO_slot_bool_get(op, "notessellation"); - BM_mesh_from_bmesh(bm, me, dotess); + BM_mesh_bm_to_me(bm, me, dotess); } diff --git a/source/blender/python/bmesh/bmesh_py_api.c b/source/blender/python/bmesh/bmesh_py_api.c index 280bab26c4b..51c4acda45e 100644 --- a/source/blender/python/bmesh/bmesh_py_api.c +++ b/source/blender/python/bmesh/bmesh_py_api.c @@ -51,8 +51,8 @@ PyDoc_STRVAR(bpy_bm_new_doc, ".. method:: new()\n" "\n" -" :return: Retyrn a new, empty mesh.\n" -" :rtype: :class:`BMesh`\n" +" :return: Return a new, empty BMesh.\n" +" :rtype: :class:`bmesh.types.BMesh`\n" ); static PyObject *bpy_bm_new(PyObject *UNUSED(self)) diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index eefe3ccbe02..075e4889515 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -621,7 +621,7 @@ static PyObject *bpy_bmesh_to_mesh(BPy_BMesh *self, PyObject *args) bm = self->bm; - BM_mesh_from_bmesh(bm, me, FALSE); + BM_mesh_bm_to_me(bm, me, FALSE); /* we could have the user do this but if they forget blender can easy crash * since the references arrays for the objects derived meshes are now invalid */ @@ -660,7 +660,7 @@ static PyObject *bpy_bmesh_from_mesh(BPy_BMesh *self, PyObject *args, PyObject * bm = self->bm; - BM_mesh_to_bmesh(bm, me, use_shape_key, shape_key_index + 1); + BM_mesh_bm_from_me(bm, me, use_shape_key, shape_key_index + 1); Py_RETURN_NONE; } diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c index 8e9537f1d86..a41d5e7f766 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.c +++ b/source/blender/python/bmesh/bmesh_py_utils.c @@ -49,11 +49,11 @@ PyDoc_STRVAR(bpy_bm_utils_vert_collapse_edge_doc, " Collapse a vertex into an edge.\n" "\n" " :arg vert: The vert that will be collapsed.\n" -" :type vert: :class:`BMVert`\n" +" :type vert: :class:`bmesh.types.BMVert`\n" " :arg edge: The edge to collapse into.\n" -" :type edge: :class:`BMEdge`\n" +" :type edge: :class:`bmesh.types.BMEdge`\n" " :return: The resulting edge from the collapse operation.\n" -" :rtype: :class:`BMEdge`\n" +" :rtype: :class:`bmesh.types.BMEdge`\n" ); static PyObject *bpy_bm_utils_vert_collapse_edge(PyObject *UNUSED(self), PyObject *args) { @@ -109,13 +109,13 @@ PyDoc_STRVAR(bpy_bm_utils_vert_collapse_faces_doc, " Split an edge, return the newly created data.\n" "\n" " :arg vert: The vert that will be collapsed.\n" -" :type vert: :class:`BMVert`\n" +" :type vert: :class:`bmesh.types.BMVert`\n" " :arg edge: The edge to collapse into.\n" -" :type edge: :class:`BMEdge`\n" +" :type edge: :class:`bmesh.types.BMEdge`\n" " :arg fac: The factor to use when merging customdata [0 - 1].\n" " :type fac: float\n" " :return: The resulting edge from the collapse operation.\n" -" :rtype: :class:`BMEdge`\n" +" :rtype: :class:`bmesh.types.BMEdge`\n" ); static PyObject *bpy_bm_utils_vert_collapse_faces(PyObject *UNUSED(self), PyObject *args) { @@ -175,7 +175,7 @@ PyDoc_STRVAR(bpy_bm_utils_vert_dissolve_doc, " Dissolve this vertex (will be removed).\n" "\n" " :arg vert: The vert to be dissolved.\n" -" :type vert: :class:`BMVert`\n" +" :type vert: :class:`bmesh.types.BMVert`\n" " :return: True when the vertex dissolve is successful.\n" " :rtype: boolean\n" ); @@ -204,11 +204,11 @@ PyDoc_STRVAR(bpy_bm_utils_vert_separate_doc, " Separate this vertex at every edge.\n" "\n" " :arg vert: The vert to be separated.\n" -" :type vert: :class:`BMVert`\n" +" :type vert: :class:`bmesh.types.BMVert`\n" " :arg edges: The edges to separated.\n" -" :type edges: :class:`BMEdge`\n" +" :type edges: :class:`bmesh.types.BMEdge`\n" " :return: The newly separated verts (including the vertex passed).\n" -" :rtype: tuple of :class:`BMVert`\n" +" :rtype: tuple of :class:`bmesh.types.BMVert`\n" ); static PyObject *bpy_bm_utils_vert_separate(PyObject *UNUSED(self), PyObject *args) { @@ -266,9 +266,9 @@ PyDoc_STRVAR(bpy_bm_utils_edge_split_doc, " Split an edge, return the newly created data.\n" "\n" " :arg edge: The edge to split.\n" -" :type edge: :class:`BMEdge`\n" +" :type edge: :class:`bmesh.types.BMEdge`\n" " :arg vert: One of the verts on the edge, defines the split direction.\n" -" :type vert: :class:`BMVert`\n" +" :type vert: :class:`bmesh.types.BMVert`\n" " :arg fac: The point on the edge where the new vert will be created [0 - 1].\n" " :type fac: float\n" " :return: The newly created (edge, vert) pair.\n" @@ -329,11 +329,11 @@ PyDoc_STRVAR(bpy_bm_utils_edge_rotate_doc, " If rotating the edge fails, None will be returned.\n" "\n" " :arg edge: The edge to rotate.\n" -" :type edge: :class:`BMEdge`\n" +" :type edge: :class:`bmesh.types.BMEdge`\n" " :arg ccw: When True the edge will be rotated counter clockwise.\n" " :type ccw: boolean\n" " :return: The newly rotated edge.\n" -" :rtype: :class:`BMEdge`\n" +" :rtype: :class:`bmesh.types.BMEdge`\n" ); static PyObject *bpy_bm_utils_edge_rotate(PyObject *UNUSED(self), PyObject *args) { @@ -371,13 +371,13 @@ PyDoc_STRVAR(bpy_bm_utils_face_split_doc, " Split an edge, return the newly created data.\n" "\n" " :arg face: The face to cut.\n" -" :type face: :class:`BMFace`\n" +" :type face: :class:`bmesh.types.BMFace`\n" " :arg vert_a: First vertex to cut in the face (face must contain the vert).\n" -" :type vert_a: :class:`BMVert`\n" +" :type vert_a: :class:`bmesh.types.BMVert`\n" " :arg vert_b: Second vertex to cut in the face (face must contain the vert).\n" -" :type vert_b: :class:`BMVert`\n" +" :type vert_b: :class:`bmesh.types.BMVert`\n" " :arg edge_example: Optional edge argument, newly created edge will copy settings from this one.\n" -" :type edge_example: :class:`BMEdge`\n" +" :type edge_example: :class:`bmesh.types.BMEdge`\n" ); static PyObject *bpy_bm_utils_face_split(PyObject *UNUSED(self), PyObject *args) { @@ -448,9 +448,9 @@ PyDoc_STRVAR(bpy_bm_utils_face_join_doc, " Joins a sequence of faces.\n" "\n" " :arg faces: Sequence of faces.\n" -" :type faces: :class:`BMFace`\n" +" :type faces: :class:`bmesh.types.BMFace`\n" " :return: The newly created face or None on failure.\n" -" :rtype: :class:`BMFace`\n" +" :rtype: :class:`bmesh.types.BMFace`\n" ); static PyObject *bpy_bm_utils_face_join(PyObject *UNUSED(self), PyObject *value) { @@ -488,11 +488,11 @@ PyDoc_STRVAR(bpy_bm_utils_face_vert_separate_doc, " Rip a vertex in a face away and add a new vertex.\n" "\n" " :arg face: The face to separate.\n" -" :type face: :class:`BMFace`\n" +" :type face: :class:`bmesh.types.BMFace`\n" " :arg vert: A vertex in the face to separate.\n" -" :type vert: :class:`BMVert`\n" +" :type vert: :class:`bmesh.types.BMVert`\n" " :return vert: The newly created vertex or None of failure.\n" -" :rtype vert: :class:`BMVert`\n" +" :rtype vert: :class:`bmesh.types.BMVert`\n" "\n" " .. note::\n" "\n" @@ -550,7 +550,7 @@ PyDoc_STRVAR(bpy_bm_utils_face_flip_doc, " Flip the faces direction.\n" "\n" " :arg face: Face to flip.\n" -" :type face: :class:`BMFace`\n" +" :type face: :class:`bmesh.types.BMFace`\n" ); static PyObject *bpy_bm_utils_face_flip(PyObject *UNUSED(self), BPy_BMFace *value) { @@ -576,9 +576,9 @@ PyDoc_STRVAR(bpy_bm_utils_loop_separate_doc, " Rip a vertex in a face away and add a new vertex.\n" "\n" " :arg loop: The to separate.\n" -" :type loop: :class:`BMFace`\n" +" :type loop: :class:`bmesh.types.BMFace`\n" " :return vert: The newly created vertex or None of failure.\n" -" :rtype vert: :class:`BMVert`\n" +" :rtype vert: :class:`bmesh.types.BMVert`\n" ); static PyObject *bpy_bm_utils_loop_separate(PyObject *UNUSED(self), BPy_BMLoop *value) { |