diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-03 11:09:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-03 11:09:52 +0300 |
commit | 41a63556cffb13d38135fcb152b266c0fe72cef2 (patch) | |
tree | a671800325a919d4104c4527b7cb6b9362dc1190 /source/blender/python/bmesh/bmesh_py_types.h | |
parent | 688c7240be33df94658b18bce7c9535e74d7f577 (diff) |
Revert "Cleanup: add semicolon after PyObject_VAR_HEAD"
This reverts commit a01bcfa6366f893fbc8fdbf537d91ece4832ea03.
This causes MSVC2019 build to fail with error C2059
Unfortunately this means we have to put up with bad formatting
in Python structs.
Diffstat (limited to 'source/blender/python/bmesh/bmesh_py_types.h')
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_types.h | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types.h b/source/blender/python/bmesh/bmesh_py_types.h index e37a88a53b0..460e7f82222 100644 --- a/source/blender/python/bmesh/bmesh_py_types.h +++ b/source/blender/python/bmesh/bmesh_py_types.h @@ -54,45 +54,38 @@ 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; @@ -106,8 +99,7 @@ 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. @@ -123,8 +115,7 @@ 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; |