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

Revert "Cleanup: add semicolon after PyObject_VAR_HEAD"

Browse Source 
This reverts commit a01bcfa636.

This causes MSVC2019 build to fail with error C2059

Unfortunately this means we have to put up with bad formatting
in Python structs.
This commit is contained in:
Campbell Barton
2019-05-03 18:09:04 +10:00
parent 688c7240be
commit 41a63556cf
14 changed files with 37 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/python/generic/idprop_py_api.h
View File

@@ -37,22 +37,19 @@ extern PyTypeObject BPy_IDGroup_Type;
#define BPy_IDGroup_CheckExact(v) (Py_TYPE(v) == &BPy_IDGroup_Type)
typedef struct BPy_IDProperty {
PyObject_VAR_HEAD;
struct ID *id; /* can be NULL */
struct IDProperty *prop; /* must be second member */
PyObject_VAR_HEAD struct ID *id; /* can be NULL */
struct IDProperty *prop; /* must be second member */
struct IDProperty *parent;
PyObject *data_wrap;
} BPy_IDProperty;
typedef struct BPy_IDArray {
PyObject_VAR_HEAD;
struct ID *id; /* can be NULL */
struct IDProperty *prop; /* must be second member */
PyObject_VAR_HEAD struct ID *id; /* can be NULL */
struct IDProperty *prop; /* must be second member */
} BPy_IDArray;
typedef struct BPy_IDGroup_Iter {
PyObject_VAR_HEAD;
BPy_IDProperty *group;
PyObject_VAR_HEAD BPy_IDProperty *group;
struct IDProperty *cur;
int mode;
} BPy_IDGroup_Iter;