From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: 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 --- .../UnaryFunction0D_Material/BPy_MaterialF0D.cpp | 138 ++++++++++----------- .../UnaryFunction0D_Material/BPy_MaterialF0D.h | 6 +- 2 files changed, 72 insertions(+), 72 deletions(-) (limited to 'source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material') diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp index 8333a7dad74..6fb65b8f132 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp @@ -31,84 +31,84 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char MaterialF0D___doc__[] = -"Class hierarchy: :class:`freestyle.types.UnaryFunction0D` > :class:`freestyle.types.UnaryFunction0DMaterial` > :class:`MaterialF0D`\n" -"\n" -".. method:: __init__()\n" -"\n" -" Builds a MaterialF0D object.\n" -"\n" -".. method:: __call__(it)\n" -"\n" -" Returns the material of the object evaluated at the\n" -" :class:`freestyle.types.Interface0D` pointed by the\n" -" Interface0DIterator. This evaluation can be ambiguous (in the case of\n" -" a :class:`freestyle.types.TVertex` for example. This functor tries to\n" -" remove this ambiguity using the context offered by the 1D element to\n" -" which the Interface0DIterator belongs to and by arbitrary choosing the\n" -" material of the face that lies on its left when following the 1D\n" -" element if there are two different materials on each side of the\n" -" point. However, there still can be problematic cases, and the user\n" -" willing to deal with this cases in a specific way should implement its\n" -" own getMaterial functor.\n" -"\n" -" :arg it: An Interface0DIterator object.\n" -" :type it: :class:`freestyle.types.Interface0DIterator`\n" -" :return: The material of the object evaluated at the pointed\n" -" Interface0D.\n" -" :rtype: :class:`freestyle.types.Material`\n"; + "Class hierarchy: :class:`freestyle.types.UnaryFunction0D` > " + ":class:`freestyle.types.UnaryFunction0DMaterial` > :class:`MaterialF0D`\n" + "\n" + ".. method:: __init__()\n" + "\n" + " Builds a MaterialF0D object.\n" + "\n" + ".. method:: __call__(it)\n" + "\n" + " Returns the material of the object evaluated at the\n" + " :class:`freestyle.types.Interface0D` pointed by the\n" + " Interface0DIterator. This evaluation can be ambiguous (in the case of\n" + " a :class:`freestyle.types.TVertex` for example. This functor tries to\n" + " remove this ambiguity using the context offered by the 1D element to\n" + " which the Interface0DIterator belongs to and by arbitrary choosing the\n" + " material of the face that lies on its left when following the 1D\n" + " element if there are two different materials on each side of the\n" + " point. However, there still can be problematic cases, and the user\n" + " willing to deal with this cases in a specific way should implement its\n" + " own getMaterial functor.\n" + "\n" + " :arg it: An Interface0DIterator object.\n" + " :type it: :class:`freestyle.types.Interface0DIterator`\n" + " :return: The material of the object evaluated at the pointed\n" + " Interface0D.\n" + " :rtype: :class:`freestyle.types.Material`\n"; static int MaterialF0D___init__(BPy_MaterialF0D *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {NULL}; + static const char *kwlist[] = {NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist)) - return -1; - self->py_uf0D_material.uf0D_material = new Functions0D::MaterialF0D(); - self->py_uf0D_material.uf0D_material->py_uf0D = (PyObject *)self; - return 0; + if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist)) + return -1; + self->py_uf0D_material.uf0D_material = new Functions0D::MaterialF0D(); + self->py_uf0D_material.uf0D_material->py_uf0D = (PyObject *)self; + return 0; } /*-----------------------BPy_MaterialF0D type definition ------------------------------*/ PyTypeObject MaterialF0D_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "MaterialF0D", /* tp_name */ - sizeof(BPy_MaterialF0D), /* tp_basicsize */ - 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - MaterialF0D___doc__, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - &UnaryFunction0DMaterial_Type, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)MaterialF0D___init__, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ + PyVarObject_HEAD_INIT(NULL, 0) "MaterialF0D", /* tp_name */ + sizeof(BPy_MaterialF0D), /* tp_basicsize */ + 0, /* tp_itemsize */ + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + MaterialF0D___doc__, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + &UnaryFunction0DMaterial_Type, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)MaterialF0D___init__, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ }; /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h index 10f7b11eb32..f1520fa63ee 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h @@ -31,14 +31,14 @@ extern "C" { extern PyTypeObject MaterialF0D_Type; -#define BPy_MaterialF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&MaterialF0D_Type)) +#define BPy_MaterialF0D_Check(v) \ + (PyObject_IsInstance((PyObject *)v, (PyObject *)&MaterialF0D_Type)) /*---------------------------Python BPy_MaterialF0D structure definition----------*/ typedef struct { - BPy_UnaryFunction0DMaterial py_uf0D_material; + BPy_UnaryFunction0DMaterial py_uf0D_material; } BPy_MaterialF0D; - /////////////////////////////////////////////////////////////////////////////////////////// #ifdef __cplusplus -- cgit v1.2.3