[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44804] trunk/blender/source/blender: bmesh py api - correct class references in docs and rename mesh conversion funcs to ne less confusing .
Campbell Barton
ideasman42 at gmail.com
Sun Mar 11 05:07:35 CET 2012
Revision: 44804
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44804
Author: campbellbarton
Date: 2012-03-11 04:07:22 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
bmesh py api - correct class references in docs and rename mesh conversion funcs to ne less confusing.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.h
trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
trunk/blender/source/blender/python/bmesh/bmesh_py_api.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c 2012-03-11 02:45:27 UTC (rev 44803)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c 2012-03-11 04:07:22 UTC (rev 44804)
@@ -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 @@
}
}
-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;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.h 2012-03-11 02:45:27 UTC (rev 44803)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.h 2012-03-11 04:07:22 UTC (rev 44804)
@@ -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__ */
Modified: trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c 2012-03-11 02:45:27 UTC (rev 44803)
+++ trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c 2012-03-11 04:07:22 UTC (rev 44804)
@@ -57,7 +57,7 @@
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 @@
/* 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);
}
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_api.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_api.c 2012-03-11 02:45:27 UTC (rev 44803)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_api.c 2012-03-11 04:07:22 UTC (rev 44804)
@@ -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))
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types.c 2012-03-11 02:45:27 UTC (rev 44803)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types.c 2012-03-11 04:07:22 UTC (rev 44804)
@@ -621,7 +621,7 @@
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 @@
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;
}
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c 2012-03-11 02:45:27 UTC (rev 44803)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c 2012-03-11 04:07:22 UTC (rev 44804)
@@ -49,11 +49,11 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
" 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 @@
" 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)
{
More information about the Bf-blender-cvs
mailing list