Cleanup: add semicolon after PyObject_VAR_HEAD

clang-format doesn't expand macros,
add semicolon to prevent misleading formatting.
This commit is contained in:
Campbell Barton
2019-05-03 12:26:29 +10:00
parent b8226a3ae1
commit a01bcfa636
14 changed files with 63 additions and 37 deletions

View File

@@ -54,38 +54,45 @@ extern PyTypeObject BPy_BMIter_Type;
/* 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 */
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 */
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 */
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 */
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 */
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 */
PyObject_VAR_HEAD;
struct BMesh *bm; /* keep first */
struct BMLoop *l;
} BPy_BMLoop;
@@ -99,7 +106,8 @@ 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.
@@ -115,7 +123,8 @@ typedef struct BPy_BMElemSeq {
} BPy_BMElemSeq;
typedef struct BPy_BMIter {
PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
PyObject_VAR_HEAD;
struct BMesh *bm; /* keep first */
BMIter iter;
} BPy_BMIter;

View File

@@ -39,20 +39,23 @@ extern PyTypeObject BPy_BMLayerItem_Type;
/* all layers for vert/edge/face/loop */
typedef struct BPy_BMLayerAccess {
PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
PyObject_VAR_HEAD;
struct BMesh *bm; /* keep first */
char htype;
} BPy_BMLayerAccess;
/* access different layer types deform/uv/vertexcolor */
typedef struct BPy_BMLayerCollection {
PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
PyObject_VAR_HEAD;
struct BMesh *bm; /* keep first */
char htype;
int type; /* customdata type - CD_XXX */
} BPy_BMLayerCollection;
/* access a specific layer directly */
typedef struct BPy_BMLayerItem {
PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
PyObject_VAR_HEAD;
struct BMesh *bm; /* keep first */
char htype;
int type; /* customdata type - CD_XXX */
int index; /* index of this layer type */

View File

@@ -48,7 +48,8 @@
#define BPy_BMLoopUV_Check(v) (Py_TYPE(v) == &BPy_BMLoopUV_Type)
typedef struct BPy_BMLoopUV {
PyObject_VAR_HEAD MLoopUV *data;
PyObject_VAR_HEAD;
MLoopUV *data;
} BPy_BMLoopUV;
PyDoc_STRVAR(bpy_bmloopuv_uv_doc,
@@ -167,7 +168,8 @@ PyObject *BPy_BMLoopUV_CreatePyObject(struct MLoopUV *mloopuv)
#define BPy_BMVertSkin_Check(v) (Py_TYPE(v) == &BPy_BMVertSkin_Type)
typedef struct BPy_BMVertSkin {
PyObject_VAR_HEAD MVertSkin *data;
PyObject_VAR_HEAD;
MVertSkin *data;
} BPy_BMVertSkin;
PyDoc_STRVAR(bpy_bmvertskin_radius_doc,
@@ -405,7 +407,8 @@ PyObject *BPy_BMLoopColor_CreatePyObject(struct MLoopCol *data)
#define BPy_BMDeformVert_Check(v) (Py_TYPE(v) == &BPy_BMDeformVert_Type)
typedef struct BPy_BMDeformVert {
PyObject_VAR_HEAD MDeformVert *data;
PyObject_VAR_HEAD;
MDeformVert *data;
} BPy_BMDeformVert;
/* Mapping Protocols

View File

@@ -30,7 +30,8 @@ extern PyTypeObject BPy_BMDeformVert_Type;
#define BPy_BMLoopUV_Check(v) (Py_TYPE(v) == &BPy_BMLoopUV_Type)
typedef struct BPy_BMGenericMeshData {
PyObject_VAR_HEAD void *data;
PyObject_VAR_HEAD;
void *data;
} BPy_BMGenericMeshData;
struct MDeformVert;

View File

@@ -33,11 +33,13 @@ extern PyTypeObject BPy_BMEditSelIter_Type;
#define BPy_BMSelectHistoryIter_Check(v) (Py_TYPE(v) == &BPy_BMEditSelIter_Type)
typedef struct BPy_BMEditSelSeq {
PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
PyObject_VAR_HEAD;
struct BMesh *bm; /* keep first */
} BPy_BMEditSelSeq;
typedef struct BPy_BMEditSelIter {
PyObject_VAR_HEAD struct BMesh *bm; /* keep first */
PyObject_VAR_HEAD;
struct BMesh *bm; /* keep first */
struct BMEditSelection *ese;
} BPy_BMEditSelIter;