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/intern/bpy_app_openvdb.c | |
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/intern/bpy_app_openvdb.c')
-rw-r--r-- | source/blender/python/intern/bpy_app_openvdb.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/source/blender/python/intern/bpy_app_openvdb.c b/source/blender/python/intern/bpy_app_openvdb.c index 049cfba8bba..a3d02294c07 100644 --- a/source/blender/python/intern/bpy_app_openvdb.c +++ b/source/blender/python/intern/bpy_app_openvdb.c @@ -35,76 +35,76 @@ static PyTypeObject BlenderAppOVDBType; static PyStructSequence_Field app_openvdb_info_fields[] = { - {(char *)"supported", (char *)("Boolean, True when Blender is built with OpenVDB support")}, - {(char *)("version"), (char *)("The OpenVDB version as a tuple of 3 numbers")}, - {(char *)("version_string"), (char *)("The OpenVDB version formatted as a string")}, - {NULL}, + {(char *)"supported", (char *)("Boolean, True when Blender is built with OpenVDB support")}, + {(char *)("version"), (char *)("The OpenVDB version as a tuple of 3 numbers")}, + {(char *)("version_string"), (char *)("The OpenVDB version formatted as a string")}, + {NULL}, }; static PyStructSequence_Desc app_openvdb_info_desc = { - (char *)"bpy.app.openvdb", /* name */ - (char *)"This module contains information about OpenVDB blender is linked against", /* doc */ - app_openvdb_info_fields, /* fields */ - ARRAY_SIZE(app_openvdb_info_fields) - 1, + (char *)"bpy.app.openvdb", /* name */ + (char *)"This module contains information about OpenVDB blender is linked against", /* doc */ + app_openvdb_info_fields, /* fields */ + ARRAY_SIZE(app_openvdb_info_fields) - 1, }; static PyObject *make_openvdb_info(void) { - PyObject *openvdb_info; - int pos = 0; + PyObject *openvdb_info; + int pos = 0; #ifdef WITH_OPENVDB - int curversion; + int curversion; #endif - openvdb_info = PyStructSequence_New(&BlenderAppOVDBType); - if (openvdb_info == NULL) { - return NULL; - } + openvdb_info = PyStructSequence_New(&BlenderAppOVDBType); + if (openvdb_info == NULL) { + return NULL; + } #ifndef WITH_OPENVDB -#define SetStrItem(str) \ - PyStructSequence_SET_ITEM(openvdb_info, pos++, PyUnicode_FromString(str)) +# define SetStrItem(str) PyStructSequence_SET_ITEM(openvdb_info, pos++, PyUnicode_FromString(str)) #endif -#define SetObjItem(obj) \ - PyStructSequence_SET_ITEM(openvdb_info, pos++, obj) +#define SetObjItem(obj) PyStructSequence_SET_ITEM(openvdb_info, pos++, obj) #ifdef WITH_OPENVDB - curversion = OpenVDB_getVersionHex(); - SetObjItem(PyBool_FromLong(1)); - SetObjItem(PyC_Tuple_Pack_I32(curversion >> 24, (curversion >> 16) % 256, (curversion >> 8) % 256)); - SetObjItem(PyUnicode_FromFormat("%2d, %2d, %2d", - curversion >> 24, (curversion >> 16) % 256, (curversion >> 8) % 256)); + curversion = OpenVDB_getVersionHex(); + SetObjItem(PyBool_FromLong(1)); + SetObjItem( + PyC_Tuple_Pack_I32(curversion >> 24, (curversion >> 16) % 256, (curversion >> 8) % 256)); + SetObjItem(PyUnicode_FromFormat( + "%2d, %2d, %2d", curversion >> 24, (curversion >> 16) % 256, (curversion >> 8) % 256)); #else - SetObjItem(PyBool_FromLong(0)); - SetObjItem(PyC_Tuple_Pack_I32(0, 0, 0)); - SetStrItem("Unknown"); + SetObjItem(PyBool_FromLong(0)); + SetObjItem(PyC_Tuple_Pack_I32(0, 0, 0)); + SetStrItem("Unknown"); #endif - if (PyErr_Occurred()) { - Py_CLEAR(openvdb_info); - return NULL; - } + if (PyErr_Occurred()) { + Py_CLEAR(openvdb_info); + return NULL; + } #undef SetStrItem #undef SetObjItem - return openvdb_info; + return openvdb_info; } PyObject *BPY_app_openvdb_struct(void) { - PyObject *ret; + PyObject *ret; - PyStructSequence_InitType(&BlenderAppOVDBType, &app_openvdb_info_desc); + PyStructSequence_InitType(&BlenderAppOVDBType, &app_openvdb_info_desc); - ret = make_openvdb_info(); + ret = make_openvdb_info(); - /* prevent user from creating new instances */ - BlenderAppOVDBType.tp_init = NULL; - BlenderAppOVDBType.tp_new = NULL; - BlenderAppOVDBType.tp_hash = (hashfunc)_Py_HashPointer; /* without this we can't do set(sys.modules) [#29635] */ + /* prevent user from creating new instances */ + BlenderAppOVDBType.tp_init = NULL; + BlenderAppOVDBType.tp_new = NULL; + BlenderAppOVDBType.tp_hash = (hashfunc) + _Py_HashPointer; /* without this we can't do set(sys.modules) [#29635] */ - return ret; + return ret; } |