diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/python/bmesh/bmesh_py_types.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/python/bmesh/bmesh_py_types.h')
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_types.h | 194 |
1 files changed, 102 insertions, 92 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types.h b/source/blender/python/bmesh/bmesh_py_types.h index 80646b7eb16..460e7f82222 100644 --- a/source/blender/python/bmesh/bmesh_py_types.h +++ b/source/blender/python/bmesh/bmesh_py_types.h @@ -38,65 +38,57 @@ extern PyTypeObject BPy_BMLoopSeq_Type; extern PyTypeObject BPy_BMIter_Type; -#define BPy_BMesh_Check(v) (Py_TYPE(v) == &BPy_BMesh_Type) -#define BPy_BMVert_Check(v) (Py_TYPE(v) == &BPy_BMVert_Type) -#define BPy_BMEdge_Check(v) (Py_TYPE(v) == &BPy_BMEdge_Type) -#define BPy_BMFace_Check(v) (Py_TYPE(v) == &BPy_BMFace_Type) -#define BPy_BMLoop_Check(v) (Py_TYPE(v) == &BPy_BMLoop_Type) -#define BPy_BMElemSeq_Check(v) (Py_TYPE(v) == &BPy_BMElemSeq_Type) -#define BPy_BMVertSeq_Check(v) (Py_TYPE(v) == &BPy_BMVertSeq_Type) -#define BPy_BMEdgeSeq_Check(v) (Py_TYPE(v) == &BPy_BMEdgeSeq_Type) -#define BPy_BMFaceSeq_Check(v) (Py_TYPE(v) == &BPy_BMFaceSeq_Type) -#define BPy_BMLoopSeq_Check(v) (Py_TYPE(v) == &BPy_BMLoopSeq_Type) -#define BPy_BMIter_Check(v) (Py_TYPE(v) == &BPy_BMIter_Type) +#define BPy_BMesh_Check(v) (Py_TYPE(v) == &BPy_BMesh_Type) +#define BPy_BMVert_Check(v) (Py_TYPE(v) == &BPy_BMVert_Type) +#define BPy_BMEdge_Check(v) (Py_TYPE(v) == &BPy_BMEdge_Type) +#define BPy_BMFace_Check(v) (Py_TYPE(v) == &BPy_BMFace_Type) +#define BPy_BMLoop_Check(v) (Py_TYPE(v) == &BPy_BMLoop_Type) +#define BPy_BMElemSeq_Check(v) (Py_TYPE(v) == &BPy_BMElemSeq_Type) +#define BPy_BMVertSeq_Check(v) (Py_TYPE(v) == &BPy_BMVertSeq_Type) +#define BPy_BMEdgeSeq_Check(v) (Py_TYPE(v) == &BPy_BMEdgeSeq_Type) +#define BPy_BMFaceSeq_Check(v) (Py_TYPE(v) == &BPy_BMFaceSeq_Type) +#define BPy_BMLoopSeq_Check(v) (Py_TYPE(v) == &BPy_BMLoopSeq_Type) +#define BPy_BMIter_Check(v) (Py_TYPE(v) == &BPy_BMIter_Type) /* trick since we know they share a hash function */ -#define BPy_BMElem_Check(v) (Py_TYPE(v)->tp_hash == BPy_BMVert_Type.tp_hash) +#define BPy_BMElem_Check(v) (Py_TYPE(v)->tp_hash == BPy_BMVert_Type.tp_hash) /* cast from _any_ bmesh type - they all have BMesh first */ typedef struct BPy_BMGeneric { - PyObject_VAR_HEAD - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ } BPy_BMGeneric; /* BPy_BMVert/BPy_BMEdge/BPy_BMFace/BPy_BMLoop can cast to this */ typedef struct BPy_BMElem { - PyObject_VAR_HEAD - struct BMesh *bm; /* keep first */ - struct BMElem *ele; + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ + struct BMElem *ele; } BPy_BMElem; typedef struct BPy_BMesh { - PyObject_VAR_HEAD - struct BMesh *bm; /* keep first */ - int flag; + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ + int flag; } BPy_BMesh; /* element types */ typedef struct BPy_BMVert { - PyObject_VAR_HEAD - struct BMesh *bm; /* keep first */ - struct BMVert *v; + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ + struct BMVert *v; } BPy_BMVert; typedef struct BPy_BMEdge { - PyObject_VAR_HEAD - struct BMesh *bm; /* keep first */ - struct BMEdge *e; + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ + struct BMEdge *e; } BPy_BMEdge; typedef struct BPy_BMFace { - PyObject_VAR_HEAD - struct BMesh *bm; /* keep first */ - struct BMFace *f; + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ + struct BMFace *f; } BPy_BMFace; typedef struct BPy_BMLoop { - PyObject_VAR_HEAD - struct BMesh *bm; /* keep first */ - struct BMLoop *l; + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ + struct BMLoop *l; } BPy_BMLoop; - /* iterators */ /* used for ... @@ -107,26 +99,24 @@ typedef struct BPy_BMLoop { * - BPy_BMLoopSeq_Type */ typedef struct BPy_BMElemSeq { - PyObject_VAR_HEAD - struct BMesh *bm; /* keep first */ + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ - /* if this is a sequence on an existing element, - * loops of faces for eg. - * If this variable is set, it will be used */ + /* if this is a sequence on an existing element, + * loops of faces for eg. + * If this variable is set, it will be used */ - /* we hold a reference to this. - * check in case the owner becomes invalid on access */ - /* TODO - make this a GC'd object!, will function OK without this though */ - BPy_BMElem *py_ele; + /* we hold a reference to this. + * check in case the owner becomes invalid on access */ + /* TODO - make this a GC'd object!, will function OK without this though */ + BPy_BMElem *py_ele; - /* iterator type */ - short itype; + /* iterator type */ + short itype; } BPy_BMElemSeq; typedef struct BPy_BMIter { - PyObject_VAR_HEAD - struct BMesh *bm; /* keep first */ - BMIter iter; + PyObject_VAR_HEAD struct BMesh *bm; /* keep first */ + BMIter iter; } BPy_BMIter; void BPy_BM_init_types(void); @@ -134,8 +124,8 @@ void BPy_BM_init_types(void); PyObject *BPyInit_bmesh_types(void); enum { - BPY_BMFLAG_NOP = 0, /* do nothing */ - BPY_BMFLAG_IS_WRAPPED = 1, /* the mesh is owned by editmode */ + BPY_BMFLAG_NOP = 0, /* do nothing */ + BPY_BMFLAG_IS_WRAPPED = 1, /* the mesh is owned by editmode */ }; PyObject *BPy_BMesh_CreatePyObject(BMesh *bm, int flag); @@ -150,18 +140,27 @@ PyObject *BPy_BMFaceSeq_CreatePyObject(BMesh *bm); PyObject *BPy_BMLoopSeq_CreatePyObject(BMesh *bm); PyObject *BPy_BMIter_CreatePyObject(BMesh *bm); -PyObject *BPy_BMElem_CreatePyObject(BMesh *bm, BMHeader *ele); /* just checks type and creates v/e/f/l */ - -void *BPy_BMElem_PySeq_As_Array_FAST( - BMesh **r_bm, PyObject *seq_fast, Py_ssize_t min, Py_ssize_t max, Py_ssize_t *r_size, - const char htype, - const bool do_unique_check, const bool do_bm_check, - const char *error_prefix); -void *BPy_BMElem_PySeq_As_Array( - BMesh **r_bm, PyObject *seq, Py_ssize_t min, Py_ssize_t max, Py_ssize_t *r_size, - const char htype, - const bool do_unique_check, const bool do_bm_check, - const char *error_prefix); +PyObject *BPy_BMElem_CreatePyObject(BMesh *bm, + BMHeader *ele); /* just checks type and creates v/e/f/l */ + +void *BPy_BMElem_PySeq_As_Array_FAST(BMesh **r_bm, + PyObject *seq_fast, + Py_ssize_t min, + Py_ssize_t max, + Py_ssize_t *r_size, + const char htype, + const bool do_unique_check, + const bool do_bm_check, + const char *error_prefix); +void *BPy_BMElem_PySeq_As_Array(BMesh **r_bm, + PyObject *seq, + Py_ssize_t min, + Py_ssize_t max, + Py_ssize_t *r_size, + const char htype, + const bool do_unique_check, + const bool do_bm_check, + const char *error_prefix); PyObject *BPy_BMElem_Array_As_Tuple(BMesh *bm, BMHeader **elem, Py_ssize_t elem_len); PyObject *BPy_BMVert_Array_As_Tuple(BMesh *bm, BMVert **elem, Py_ssize_t elem_len); @@ -169,47 +168,58 @@ PyObject *BPy_BMEdge_Array_As_Tuple(BMesh *bm, BMEdge **elem, Py_ssize_t elem_le PyObject *BPy_BMFace_Array_As_Tuple(BMesh *bm, BMFace **elem, Py_ssize_t elem_len); PyObject *BPy_BMLoop_Array_As_Tuple(BMesh *bm, BMLoop **elem, Py_ssize_t elem_len); -int BPy_BMElem_CheckHType(PyTypeObject *type, const char htype); -char *BPy_BMElem_StringFromHType_ex(const char htype, char ret[32]); -char *BPy_BMElem_StringFromHType(const char htype); +int BPy_BMElem_CheckHType(PyTypeObject *type, const char htype); +char *BPy_BMElem_StringFromHType_ex(const char htype, char ret[32]); +char *BPy_BMElem_StringFromHType(const char htype); // void bpy_bm_generic_invalidate(BPy_BMGeneric *self); -int bpy_bm_generic_valid_check(BPy_BMGeneric *self); -int bpy_bm_generic_valid_check_source(BMesh *bm_source, const char *error_prefix, void **args, unsigned int args_n) ATTR_NONNULL(1, 2); +int bpy_bm_generic_valid_check(BPy_BMGeneric *self); +int bpy_bm_generic_valid_check_source(BMesh *bm_source, + const char *error_prefix, + void **args, + unsigned int args_n) ATTR_NONNULL(1, 2); #define BPY_BM_CHECK_OBJ(obj) \ - if (UNLIKELY(bpy_bm_generic_valid_check((BPy_BMGeneric *)obj) == -1)) { return NULL; } (void)0 + if (UNLIKELY(bpy_bm_generic_valid_check((BPy_BMGeneric *)obj) == -1)) { \ + return NULL; \ + } \ + (void)0 #define BPY_BM_CHECK_INT(obj) \ - if (UNLIKELY(bpy_bm_generic_valid_check((BPy_BMGeneric *)obj) == -1)) { return -1; } (void)0 + if (UNLIKELY(bpy_bm_generic_valid_check((BPy_BMGeneric *)obj) == -1)) { \ + return -1; \ + } \ + (void)0 /* macros like BPY_BM_CHECK_OBJ/BPY_BM_CHECK_INT that ensure we're from the right BMesh */ -#define BPY_BM_CHECK_SOURCE_OBJ(bm, errmsg, ...) { \ - void *_args[] = {__VA_ARGS__}; \ - if (UNLIKELY(bpy_bm_generic_valid_check_source(bm, errmsg, _args, ARRAY_SIZE(_args)) == -1)) { \ - return NULL; \ - } \ -} (void)0 -#define BPY_BM_CHECK_SOURCE_INT(bm, errmsg, ...) { \ - void *_args[] = {__VA_ARGS__}; \ - if (UNLIKELY(bpy_bm_generic_valid_check_source(bm, errmsg, _args, ARRAY_SIZE(_args)) == -1)) { \ - return -1; \ - } \ -} (void)0 +#define BPY_BM_CHECK_SOURCE_OBJ(bm, errmsg, ...) \ + { \ + void *_args[] = {__VA_ARGS__}; \ + if (UNLIKELY(bpy_bm_generic_valid_check_source(bm, errmsg, _args, ARRAY_SIZE(_args)) == \ + -1)) { \ + return NULL; \ + } \ + } \ + (void)0 +#define BPY_BM_CHECK_SOURCE_INT(bm, errmsg, ...) \ + { \ + void *_args[] = {__VA_ARGS__}; \ + if (UNLIKELY(bpy_bm_generic_valid_check_source(bm, errmsg, _args, ARRAY_SIZE(_args)) == \ + -1)) { \ + return -1; \ + } \ + } \ + (void)0 #define BPY_BM_IS_VALID(obj) (LIKELY((obj)->bm != NULL)) -#define BM_ITER_BPY_BM_SEQ(ele, iter, bpy_bmelemseq) \ - for (BM_CHECK_TYPE_ELEM_ASSIGN(ele) = BM_iter_new( \ - iter, \ - (bpy_bmelemseq)->bm, \ - (bpy_bmelemseq)->itype, \ - (bpy_bmelemseq)->py_ele ? \ - ((BPy_BMElem *)(bpy_bmelemseq)->py_ele)->ele : \ - NULL \ - ); \ - ele; \ - BM_CHECK_TYPE_ELEM_ASSIGN(ele) = BM_iter_step(iter)) - +#define BM_ITER_BPY_BM_SEQ(ele, iter, bpy_bmelemseq) \ + for (BM_CHECK_TYPE_ELEM_ASSIGN(ele) = BM_iter_new( \ + iter, \ + (bpy_bmelemseq)->bm, \ + (bpy_bmelemseq)->itype, \ + (bpy_bmelemseq)->py_ele ? ((BPy_BMElem *)(bpy_bmelemseq)->py_ele)->ele : NULL); \ + ele; \ + BM_CHECK_TYPE_ELEM_ASSIGN(ele) = BM_iter_step(iter)) #ifdef __PY_CAPI_UTILS_H__ struct PyC_FlagSet; |