archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-12-12 12:55:20 +11:00
parent 16fc62e15f e757c4a3be
commit 49490e5cfb
203 changed files with 1195 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/python/bmesh/bmesh_py_ops_call.c
View File

@@ -67,10 +67,10 @@ static int bpy_bm_op_as_py_error(BMesh *bm)
/**
* \brief Utility function to check BMVert/BMEdge/BMFace's
*
* \param value
* \param bm Check the \a value against this.
* \param htype Test \a value matches this type.
* \param descr Description text.
* \param value:
* \param bm: Check the \a value against this.
* \param htype: Test \a value matches this type.
* \param descr: Description text.
*/
static int bpy_slot_from_py_elem_check(
BPy_BMElem *value, BMesh *bm, const char htype,
@@ -105,11 +105,11 @@ static int bpy_slot_from_py_elem_check(
/**
* \brief Utility function to check BMVertSeq/BMEdgeSeq/BMFaceSeq's
*
* \param value Caller must check its a BMeshSeq
* \param bm Check the \a value against this.
* \param htype_py The type(s) of \a value.
* \param htype_bmo The type(s) supported by the target slot.
* \param descr Description text.
* \param value: Caller must check its a BMeshSeq
* \param bm: Check the \a value against this.
* \param htype_py: The type(s) of \a value.
* \param htype_bmo: The type(s) supported by the target slot.
* \param descr: Description text.
*/
static int bpy_slot_from_py_elemseq_check(
BPy_BMGeneric *value, BMesh *bm,