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_sdl.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_sdl.c')
-rw-r--r-- | source/blender/python/intern/bpy_app_sdl.c | 130 |
1 files changed, 65 insertions, 65 deletions
diff --git a/source/blender/python/intern/bpy_app_sdl.c b/source/blender/python/intern/bpy_app_sdl.c index 09e13e4a116..7e3d02076f2 100644 --- a/source/blender/python/intern/bpy_app_sdl.c +++ b/source/blender/python/intern/bpy_app_sdl.c @@ -46,98 +46,98 @@ static PyTypeObject BlenderAppSDLType; static PyStructSequence_Field app_sdl_info_fields[] = { - {(char *)"supported", (char *)("Boolean, True when Blender is built with SDL support")}, - {(char *)"version", (char *)("The SDL version as a tuple of 3 numbers")}, - {(char *)"version_string", (char *)("The SDL version formatted as a string")}, - {(char *)"available", (char *)("Boolean, True when SDL is available. This is False when " - "either *supported* is False, or *dynload* is True and " - "Blender cannot find the correct library.")}, - {NULL}, + {(char *)"supported", (char *)("Boolean, True when Blender is built with SDL support")}, + {(char *)"version", (char *)("The SDL version as a tuple of 3 numbers")}, + {(char *)"version_string", (char *)("The SDL version formatted as a string")}, + {(char *)"available", + (char *)("Boolean, True when SDL is available. This is False when " + "either *supported* is False, or *dynload* is True and " + "Blender cannot find the correct library.")}, + {NULL}, }; static PyStructSequence_Desc app_sdl_info_desc = { - (char *)"bpy.app.sdl", /* name */ - (char *)"This module contains information about SDL blender is linked against", /* doc */ - app_sdl_info_fields, /* fields */ - ARRAY_SIZE(app_sdl_info_fields) - 1, + (char *)"bpy.app.sdl", /* name */ + (char *)"This module contains information about SDL blender is linked against", /* doc */ + app_sdl_info_fields, /* fields */ + ARRAY_SIZE(app_sdl_info_fields) - 1, }; static PyObject *make_sdl_info(void) { - PyObject *sdl_info; - int pos = 0; + PyObject *sdl_info; + int pos = 0; #ifdef WITH_SDL - bool sdl_available = false; - SDL_version version = {0, 0, 0}; + bool sdl_available = false; + SDL_version version = {0, 0, 0}; #endif - sdl_info = PyStructSequence_New(&BlenderAppSDLType); - if (sdl_info == NULL) { - return NULL; - } + sdl_info = PyStructSequence_New(&BlenderAppSDLType); + if (sdl_info == NULL) { + return NULL; + } -#define SetStrItem(str) \ - PyStructSequence_SET_ITEM(sdl_info, pos++, PyUnicode_FromString(str)) +#define SetStrItem(str) PyStructSequence_SET_ITEM(sdl_info, pos++, PyUnicode_FromString(str)) -#define SetObjItem(obj) \ - PyStructSequence_SET_ITEM(sdl_info, pos++, obj) +#define SetObjItem(obj) PyStructSequence_SET_ITEM(sdl_info, pos++, obj) #ifdef WITH_SDL - SetObjItem(PyBool_FromLong(1)); - -# ifdef WITH_SDL_DYNLOAD - if (sdlewInit() == SDLEW_SUCCESS) { - SDL_GetVersion(&version); - sdl_available = true; - } -# else // WITH_SDL_DYNLOAD=OFF - sdl_available = true; -# if SDL_MAJOR_VERSION >= 2 - SDL_GetVersion(&version); -# else - SDL_VERSION(&version); + SetObjItem(PyBool_FromLong(1)); + +# ifdef WITH_SDL_DYNLOAD + if (sdlewInit() == SDLEW_SUCCESS) { + SDL_GetVersion(&version); + sdl_available = true; + } +# else // WITH_SDL_DYNLOAD=OFF + sdl_available = true; +# if SDL_MAJOR_VERSION >= 2 + SDL_GetVersion(&version); +# else + SDL_VERSION(&version); +# endif # endif -# endif - - SetObjItem(PyC_Tuple_Pack_I32(version.major, version.minor, version.patch)); - if (sdl_available) { - SetObjItem(PyUnicode_FromFormat("%d.%d.%d", version.major, version.minor, version.patch)); - } - else { - SetStrItem("Unknown"); - } - SetObjItem(PyBool_FromLong(sdl_available)); - -#else // WITH_SDL=OFF - SetObjItem(PyBool_FromLong(0)); - SetObjItem(PyC_Tuple_Pack_I32(0, 0, 0)); - SetStrItem("Unknown"); - SetObjItem(PyBool_FromLong(0)); + + SetObjItem(PyC_Tuple_Pack_I32(version.major, version.minor, version.patch)); + if (sdl_available) { + SetObjItem(PyUnicode_FromFormat("%d.%d.%d", version.major, version.minor, version.patch)); + } + else { + SetStrItem("Unknown"); + } + SetObjItem(PyBool_FromLong(sdl_available)); + +#else // WITH_SDL=OFF + SetObjItem(PyBool_FromLong(0)); + SetObjItem(PyC_Tuple_Pack_I32(0, 0, 0)); + SetStrItem("Unknown"); + SetObjItem(PyBool_FromLong(0)); #endif - if (PyErr_Occurred()) { - Py_CLEAR(sdl_info); - return NULL; - } + if (PyErr_Occurred()) { + Py_CLEAR(sdl_info); + return NULL; + } #undef SetStrItem #undef SetObjItem - return sdl_info; + return sdl_info; } PyObject *BPY_app_sdl_struct(void) { - PyObject *ret; + PyObject *ret; - PyStructSequence_InitType(&BlenderAppSDLType, &app_sdl_info_desc); + PyStructSequence_InitType(&BlenderAppSDLType, &app_sdl_info_desc); - ret = make_sdl_info(); + ret = make_sdl_info(); - /* prevent user from creating new instances */ - BlenderAppSDLType.tp_init = NULL; - BlenderAppSDLType.tp_new = NULL; - BlenderAppSDLType.tp_hash = (hashfunc)_Py_HashPointer; /* without this we can't do set(sys.modules) [#29635] */ + /* prevent user from creating new instances */ + BlenderAppSDLType.tp_init = NULL; + BlenderAppSDLType.tp_new = NULL; + BlenderAppSDLType.tp_hash = (hashfunc) + _Py_HashPointer; /* without this we can't do set(sys.modules) [#29635] */ - return ret; + return ret; } |