[Bf-blender-cvs] [18db6c5] master: Fix T38150: implementation mismatch in bmesh python

Bastien Montagne noreply at git.blender.org
Thu Jan 23 20:18:21 CET 2014


Commit: 18db6c58ec6b7a37eed58a532cbe2f51f1e5f073
Author: Bastien Montagne
Date:   Thu Jan 23 20:08:23 2014 +0100
https://developer.blender.org/rB18db6c58ec6b7a37eed58a532cbe2f51f1e5f073

Fix T38150: implementation mismatch in bmesh python

Hopefully this time all mismatches are fixed (quickly checked the whole BMesh API files,
found a few others in addition to those reported in T38150).

===================================================================

M	source/blender/python/bmesh/bmesh_py_types.c
M	source/blender/python/bmesh/bmesh_py_types_customdata.c
M	source/blender/python/bmesh/bmesh_py_types_meshdata.c

===================================================================

diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c
index 97d88c5..47aff88 100644
--- a/source/blender/python/bmesh/bmesh_py_types.c
+++ b/source/blender/python/bmesh/bmesh_py_types.c
@@ -231,7 +231,7 @@ static PyObject *bpy_bmloopseq_get(BPy_BMesh *self, void *UNUSED(closure))
 
 /* vert */
 PyDoc_STRVAR(bpy_bmvert_link_edges_doc,
-"Edges connected to this vertex (read-only).\n\n:type: :class:`BMElemSeq` of :class:`BMVert`"
+"Edges connected to this vertex (read-only).\n\n:type: :class:`BMElemSeq` of :class:`BMEdge`"
 );
 PyDoc_STRVAR(bpy_bmvert_link_faces_doc,
 "Faces connected to this vertex (read-only).\n\n:type: :class:`BMElemSeq` of :class:`BMFace`"
@@ -402,7 +402,7 @@ static PyObject *bpy_bmvert_is_wire_get(BPy_BMVert *self)
 }
 
 PyDoc_STRVAR(bpy_bmvert_is_boundary_doc,
-"True when this vertex connected to any boundary edges (read-only).\n\n:type: boolean"
+"True when this vertex is connected to boundary edges (read-only).\n\n:type: boolean"
 );
 static PyObject *bpy_bmvert_is_boundary_get(BPy_BMVert *self)
 {
@@ -433,7 +433,7 @@ static PyObject *bpy_bmedge_is_contiguous_get(BPy_BMEdge *self)
 }
 
 PyDoc_STRVAR(bpy_bmedge_is_convex_doc,
-"True when this edge joins 2 convex faces, depends on a valid face normal (read-only).\n\n:type: boolean"
+"True when this edge joins two convex faces, depends on a valid face normal (read-only).\n\n:type: boolean"
 );
 static PyObject *bpy_bmedge_is_convex_get(BPy_BMEdge *self)
 {
@@ -486,7 +486,7 @@ static int bpy_bmface_normal_set(BPy_BMFace *self, PyObject *value)
 }
 
 PyDoc_STRVAR(bpy_bmface_material_index_doc,
-"The faces material index.\n\n:type: int"
+"The face's material index.\n\n:type: int"
 );
 static PyObject *bpy_bmface_material_index_get(BPy_BMFace *self)
 {
@@ -524,7 +524,7 @@ static int bpy_bmface_material_index_set(BPy_BMFace *self, PyObject *value)
  * ^^^^ */
 
 PyDoc_STRVAR(bpy_bmloop_vert_doc,
-"The loops vertex (read-only).\n\n:type: :class:`BMVert`"
+"The loop's vertex (read-only).\n\n:type: :class:`BMVert`"
 );
 static PyObject *bpy_bmloop_vert_get(BPy_BMLoop *self)
 {
@@ -534,7 +534,7 @@ static PyObject *bpy_bmloop_vert_get(BPy_BMLoop *self)
 
 
 PyDoc_STRVAR(bpy_bmloop_edge_doc,
-"The loops edge (between this loop and the next), (read-only).\n\n:type: :class:`BMEdge`"
+"The loop's edge (between this loop and the next), (read-only).\n\n:type: :class:`BMEdge`"
 );
 static PyObject *bpy_bmloop_edge_get(BPy_BMLoop *self)
 {
@@ -1385,9 +1385,9 @@ static PyObject *bpy_bmvert_copy_from_face_interp(BPy_BMVert *self, PyObject *ar
 
 
 PyDoc_STRVAR(bpy_bmvert_calc_edge_angle_doc,
-".. method:: calc_edge_angle()\n"
+".. method:: calc_vert_angle()\n"
 "\n"
-"   Return the angle between this verts 2 connected edges.\n"
+"   Return the angle between this vert's two connected edges.\n"
 "\n"
 "   :return: Angle between edges in radians.\n"
 "   :rtype: float\n"
@@ -1716,7 +1716,7 @@ static PyObject *bpy_bmface_calc_center_bounds(BPy_BMFace *self)
 PyDoc_STRVAR(bpy_bmface_normal_update_doc,
 ".. method:: normal_update()\n"
 "\n"
-"   Update faces normal.\n"
+"   Update face's normal.\n"
 );
 static PyObject *bpy_bmface_normal_update(BPy_BMFace *self)
 {
@@ -2070,7 +2070,7 @@ static PyObject *bpy_bmvertseq_remove(BPy_BMElemSeq *self, BPy_BMVert *value)
 PyDoc_STRVAR(bpy_bmedgeseq_remove_doc,
 ".. method:: remove(edge)\n"
 "\n"
-"   Remove a edge.\n"
+"   Remove an edge.\n"
 );
 static PyObject *bpy_bmedgeseq_remove(BPy_BMElemSeq *self, BPy_BMEdge *value)
 {
@@ -2118,7 +2118,7 @@ static PyObject *bpy_bmfaceseq_remove(BPy_BMElemSeq *self, BPy_BMFace *value)
 PyDoc_STRVAR(bpy_bmedgeseq_get__method_doc,
 ".. method:: get(verts, fallback=None)\n"
 "\n"
-"   Return a edge which uses the **verts** passed.\n"
+"   Return an edge which uses the **verts** passed.\n"
 "\n"
 "   :arg verts: Sequence of verts.\n"
 "   :type verts: :class:`BMVert`\n"
@@ -2992,7 +2992,7 @@ PyDoc_STRVAR(bpy_bmface_doc,
 "The BMesh face with 3 or more sides\n"
 );
 PyDoc_STRVAR(bpy_bmloop_doc,
-"This is normally accessed from :class:`BMFace.loops` where each face corner represents a corner of a face.\n"
+"This is normally accessed from :class:`BMFace.loops` where each face loop represents a corner of the face.\n"
 );
 PyDoc_STRVAR(bpy_bmelemseq_doc,
 "General sequence type used for accessing any sequence of \n"
diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c
index dd4b407..4fbfbd8 100644
--- a/source/blender/python/bmesh/bmesh_py_types_customdata.c
+++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c
@@ -159,7 +159,7 @@ static PyObject *bpy_bmlayercollection_active_get(BPy_BMLayerItem *self, void *U
 
 
 PyDoc_STRVAR(bpy_bmlayercollection_is_singleton_doc,
-"This meshes vert sequence (read-only).\n\n:type: :class:`BMVertSeq`"
+"True if there can exists only one layer of this type (read-only).\n\n:type: boolean"
 );
 static PyObject *bpy_bmlayercollection_is_singleton_get(BPy_BMLayerItem *self, void *UNUSED(flag))
 {
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c
index 80b07a9..b935dbc 100644
--- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c
+++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c
@@ -643,13 +643,13 @@ static PyObject *bpy_bmdeformvert_keys(BPy_BMDeformVert *self)
 }
 
 PyDoc_STRVAR(bpy_bmdeformvert_values_doc,
-".. method:: items()\n"
+".. method:: values()\n"
 "\n"
-"   Return (group, weight) pairs for this vertex\n"
-"   (matching pythons dict.items() functionality).\n"
+"   Return the weights of the deform vertex\n"
+"   (matching pythons dict.values() functionality).\n"
 "\n"
-"   :return: (key, value) pairs for each deform weight of this vertex.\n"
-"   :rtype: list of tuples\n"
+"   :return: The weights that influence this vertex\n"
+"   :rtype: list of floats\n"
 );
 static PyObject *bpy_bmdeformvert_values(BPy_BMDeformVert *self)
 {
@@ -666,13 +666,13 @@ static PyObject *bpy_bmdeformvert_values(BPy_BMDeformVert *self)
 }
 
 PyDoc_STRVAR(bpy_bmdeformvert_items_doc,
-".. method:: values()\n"
+".. method:: items()\n"
 "\n"
-"   Return the weights of the deform vertex\n"
-"   (matching pythons dict.values() functionality).\n"
+"   Return (group, weight) pairs for this vertex\n"
+"   (matching pythons dict.items() functionality).\n"
 "\n"
-"   :return: The weights that influence this vertex\n"
-"   :rtype: list of floats\n"
+"   :return: (key, value) pairs for each deform weight of this vertex.\n"
+"   :rtype: list of tuples\n"
 );
 static PyObject *bpy_bmdeformvert_items(BPy_BMDeformVert *self)
 {




More information about the Bf-blender-cvs mailing list