Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/python/intern/bpy_app_icons.c
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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_icons.c')
-rw-r--r--source/blender/python/intern/bpy_app_icons.c244
1 files changed, 121 insertions, 123 deletions
diff --git a/source/blender/python/intern/bpy_app_icons.c b/source/blender/python/intern/bpy_app_icons.c
index 863d11ff84d..2e688609961 100644
--- a/source/blender/python/intern/bpy_app_icons.c
+++ b/source/blender/python/intern/bpy_app_icons.c
@@ -33,151 +33,149 @@
#include "bpy_app_icons.h"
/* We may want to load direct from file. */
-PyDoc_STRVAR(bpy_app_icons_new_triangles_doc,
-".. function:: new_triangles(range, coords, colors)"
-"\n"
-" Create a new icon from triangle geometry.\n"
-"\n"
-" :arg range: Pair of ints.\n"
-" :type range: tuple.\n"
-" :arg coords: Sequence of bytes (6 floats for one triangle) for (X, Y) coordinates.\n"
-" :type coords: byte sequence.\n"
-" :arg colors: Sequence of ints (12 for one triangles) for RGBA.\n"
-" :type colors: byte sequence.\n"
-" :return: Unique icon value (pass to interface ``icon_value`` argument).\n"
-" :rtype: int\n"
-);
+PyDoc_STRVAR(
+ bpy_app_icons_new_triangles_doc,
+ ".. function:: new_triangles(range, coords, colors)"
+ "\n"
+ " Create a new icon from triangle geometry.\n"
+ "\n"
+ " :arg range: Pair of ints.\n"
+ " :type range: tuple.\n"
+ " :arg coords: Sequence of bytes (6 floats for one triangle) for (X, Y) coordinates.\n"
+ " :type coords: byte sequence.\n"
+ " :arg colors: Sequence of ints (12 for one triangles) for RGBA.\n"
+ " :type colors: byte sequence.\n"
+ " :return: Unique icon value (pass to interface ``icon_value`` argument).\n"
+ " :rtype: int\n");
static PyObject *bpy_app_icons_new_triangles(PyObject *UNUSED(self), PyObject *args, PyObject *kw)
{
- /* bytes */
- uchar coords_range[2];
- PyObject *py_coords, *py_colors;
-
- static const char *_keywords[] = {"range", "coords", "colors", NULL};
- static _PyArg_Parser _parser = {"(BB)SS:new_triangles", _keywords, 0};
- if (!_PyArg_ParseTupleAndKeywordsFast(
- args, kw, &_parser,
- &coords_range[0], &coords_range[1], &py_coords, &py_colors))
- {
- return NULL;
- }
-
- const int coords_len = PyBytes_GET_SIZE(py_coords);
- const int tris_len = coords_len / 6;
- if (tris_len * 6 != coords_len) {
- PyErr_SetString(PyExc_ValueError, "coords must be multiple of 6");
- return NULL;
- }
- if (PyBytes_GET_SIZE(py_colors) != 2 * coords_len) {
- PyErr_SetString(PyExc_ValueError, "colors must be twice size of coords");
- return NULL;
- }
-
- int coords_size = sizeof(uchar[2]) * tris_len * 3;
- int colors_size = sizeof(uchar[4]) * tris_len * 3;
- uchar (*coords)[2] = MEM_mallocN(coords_size, __func__);
- uchar (*colors)[4] = MEM_mallocN(colors_size, __func__);
-
- memcpy(coords, PyBytes_AS_STRING(py_coords), coords_size);
- memcpy(colors, PyBytes_AS_STRING(py_colors), colors_size);
-
- struct Icon_Geom *geom = MEM_mallocN(sizeof(*geom), __func__);
- geom->coords_len = tris_len;
- geom->coords_range[0] = coords_range[0];
- geom->coords_range[1] = coords_range[1];
- geom->coords = coords;
- geom->colors = colors;
- geom->icon_id = 0;
- int icon_id = BKE_icon_geom_ensure(geom);
- return PyLong_FromLong(icon_id);
+ /* bytes */
+ uchar coords_range[2];
+ PyObject *py_coords, *py_colors;
+
+ static const char *_keywords[] = {"range", "coords", "colors", NULL};
+ static _PyArg_Parser _parser = {"(BB)SS:new_triangles", _keywords, 0};
+ if (!_PyArg_ParseTupleAndKeywordsFast(
+ args, kw, &_parser, &coords_range[0], &coords_range[1], &py_coords, &py_colors)) {
+ return NULL;
+ }
+
+ const int coords_len = PyBytes_GET_SIZE(py_coords);
+ const int tris_len = coords_len / 6;
+ if (tris_len * 6 != coords_len) {
+ PyErr_SetString(PyExc_ValueError, "coords must be multiple of 6");
+ return NULL;
+ }
+ if (PyBytes_GET_SIZE(py_colors) != 2 * coords_len) {
+ PyErr_SetString(PyExc_ValueError, "colors must be twice size of coords");
+ return NULL;
+ }
+
+ int coords_size = sizeof(uchar[2]) * tris_len * 3;
+ int colors_size = sizeof(uchar[4]) * tris_len * 3;
+ uchar(*coords)[2] = MEM_mallocN(coords_size, __func__);
+ uchar(*colors)[4] = MEM_mallocN(colors_size, __func__);
+
+ memcpy(coords, PyBytes_AS_STRING(py_coords), coords_size);
+ memcpy(colors, PyBytes_AS_STRING(py_colors), colors_size);
+
+ struct Icon_Geom *geom = MEM_mallocN(sizeof(*geom), __func__);
+ geom->coords_len = tris_len;
+ geom->coords_range[0] = coords_range[0];
+ geom->coords_range[1] = coords_range[1];
+ geom->coords = coords;
+ geom->colors = colors;
+ geom->icon_id = 0;
+ int icon_id = BKE_icon_geom_ensure(geom);
+ return PyLong_FromLong(icon_id);
}
PyDoc_STRVAR(bpy_app_icons_new_triangles_from_file_doc,
-".. function:: new_triangles_from_file(filename)"
-"\n"
-" Create a new icon from triangle geometry.\n"
-"\n"
-" :arg filename: File path.\n"
-" :type filename: string.\n"
-" :return: Unique icon value (pass to interface ``icon_value`` argument).\n"
-" :rtype: int\n"
-);
-static PyObject *bpy_app_icons_new_triangles_from_file(PyObject *UNUSED(self), PyObject *args, PyObject *kw)
+ ".. function:: new_triangles_from_file(filename)"
+ "\n"
+ " Create a new icon from triangle geometry.\n"
+ "\n"
+ " :arg filename: File path.\n"
+ " :type filename: string.\n"
+ " :return: Unique icon value (pass to interface ``icon_value`` argument).\n"
+ " :rtype: int\n");
+static PyObject *bpy_app_icons_new_triangles_from_file(PyObject *UNUSED(self),
+ PyObject *args,
+ PyObject *kw)
{
- /* bytes */
- char *filename;
-
- static const char *_keywords[] = {"filename", NULL};
- static _PyArg_Parser _parser = {"s:new_triangles_from_file", _keywords, 0};
- if (!_PyArg_ParseTupleAndKeywordsFast(
- args, kw, &_parser,
- &filename))
- {
- return NULL;
- }
-
- struct Icon_Geom *geom = BKE_icon_geom_from_file(filename);
- if (geom == NULL) {
- PyErr_SetString(PyExc_ValueError, "Unable to load from file");
- return NULL;
- }
- int icon_id = BKE_icon_geom_ensure(geom);
- return PyLong_FromLong(icon_id);
+ /* bytes */
+ char *filename;
+
+ static const char *_keywords[] = {"filename", NULL};
+ static _PyArg_Parser _parser = {"s:new_triangles_from_file", _keywords, 0};
+ if (!_PyArg_ParseTupleAndKeywordsFast(args, kw, &_parser, &filename)) {
+ return NULL;
+ }
+
+ struct Icon_Geom *geom = BKE_icon_geom_from_file(filename);
+ if (geom == NULL) {
+ PyErr_SetString(PyExc_ValueError, "Unable to load from file");
+ return NULL;
+ }
+ int icon_id = BKE_icon_geom_ensure(geom);
+ return PyLong_FromLong(icon_id);
}
PyDoc_STRVAR(bpy_app_icons_release_doc,
-".. function:: release(icon_id)"
-"\n"
-" Release the icon.\n"
-);
+ ".. function:: release(icon_id)"
+ "\n"
+ " Release the icon.\n");
static PyObject *bpy_app_icons_release(PyObject *UNUSED(self), PyObject *args, PyObject *kw)
{
- int icon_id;
- static const char *_keywords[] = {"icon_id", NULL};
- static _PyArg_Parser _parser = {"i:release", _keywords, 0};
- if (!_PyArg_ParseTupleAndKeywordsFast(
- args, kw, &_parser,
- &icon_id))
- {
- return NULL;
- }
-
- if (!BKE_icon_delete_unmanaged(icon_id)) {
- PyErr_SetString(PyExc_ValueError, "invalid icon_id");
- return NULL;
- }
- Py_RETURN_NONE;
+ int icon_id;
+ static const char *_keywords[] = {"icon_id", NULL};
+ static _PyArg_Parser _parser = {"i:release", _keywords, 0};
+ if (!_PyArg_ParseTupleAndKeywordsFast(args, kw, &_parser, &icon_id)) {
+ return NULL;
+ }
+
+ if (!BKE_icon_delete_unmanaged(icon_id)) {
+ PyErr_SetString(PyExc_ValueError, "invalid icon_id");
+ return NULL;
+ }
+ Py_RETURN_NONE;
}
static struct PyMethodDef M_AppIcons_methods[] = {
- {"new_triangles", (PyCFunction)bpy_app_icons_new_triangles,
- METH_VARARGS | METH_KEYWORDS, bpy_app_icons_new_triangles_doc},
- {"new_triangles_from_file", (PyCFunction)bpy_app_icons_new_triangles_from_file,
- METH_VARARGS | METH_KEYWORDS, bpy_app_icons_new_triangles_from_file_doc},
- {"release", (PyCFunction)bpy_app_icons_release,
- METH_VARARGS | METH_KEYWORDS, bpy_app_icons_release_doc},
- {NULL, NULL, 0, NULL},
+ {"new_triangles",
+ (PyCFunction)bpy_app_icons_new_triangles,
+ METH_VARARGS | METH_KEYWORDS,
+ bpy_app_icons_new_triangles_doc},
+ {"new_triangles_from_file",
+ (PyCFunction)bpy_app_icons_new_triangles_from_file,
+ METH_VARARGS | METH_KEYWORDS,
+ bpy_app_icons_new_triangles_from_file_doc},
+ {"release",
+ (PyCFunction)bpy_app_icons_release,
+ METH_VARARGS | METH_KEYWORDS,
+ bpy_app_icons_release_doc},
+ {NULL, NULL, 0, NULL},
};
static struct PyModuleDef M_AppIcons_module_def = {
- PyModuleDef_HEAD_INIT,
- "bpy.app.icons", /* m_name */
- NULL, /* m_doc */
- 0, /* m_size */
- M_AppIcons_methods, /* m_methods */
- NULL, /* m_reload */
- NULL, /* m_traverse */
- NULL, /* m_clear */
- NULL, /* m_free */
+ PyModuleDef_HEAD_INIT,
+ "bpy.app.icons", /* m_name */
+ NULL, /* m_doc */
+ 0, /* m_size */
+ M_AppIcons_methods, /* m_methods */
+ NULL, /* m_reload */
+ NULL, /* m_traverse */
+ NULL, /* m_clear */
+ NULL, /* m_free */
};
PyObject *BPY_app_icons_module(void)
{
- PyObject *sys_modules = PyImport_GetModuleDict();
+ PyObject *sys_modules = PyImport_GetModuleDict();
- PyObject *mod = PyModule_Create(&M_AppIcons_module_def);
+ PyObject *mod = PyModule_Create(&M_AppIcons_module_def);
- PyDict_SetItem(sys_modules, PyModule_GetNameObject(mod), mod);
+ PyDict_SetItem(sys_modules, PyModule_GetNameObject(mod), mod);
- return mod;
+ return mod;
}