diff options
Diffstat (limited to 'source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp index 840f49ff345..aae8d5514c9 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp @@ -9,6 +9,8 @@ #include "../../BPy_Convert.h" #include "../../Interface0D/BPy_SVertex.h" +#include "BLI_sys_types.h" + #ifdef __cplusplus extern "C" { #endif @@ -178,7 +180,7 @@ static Mathutils_Callback FEdgeSharp_mathutils_cb = { FEdgeSharp_mathutils_set_index, }; -static unsigned char FEdgeSharp_mathutils_cb_index = -1; +static uchar FEdgeSharp_mathutils_cb_index = -1; void FEdgeSharp_mathutils_register_callback() { @@ -193,15 +195,13 @@ PyDoc_STRVAR(FEdgeSharp_normal_right_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *FEdgeSharp_normal_right_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_normal_right_get(BPy_FEdgeSharp *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 3, FEdgeSharp_mathutils_cb_index, MATHUTILS_SUBTYPE_NORMAL_A); } -static int FEdgeSharp_normal_right_set(BPy_FEdgeSharp *self, - PyObject *value, - void *UNUSED(closure)) +static int FEdgeSharp_normal_right_set(BPy_FEdgeSharp *self, PyObject *value, void * /*closure*/) { float v[3]; if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) { @@ -217,13 +217,13 @@ PyDoc_STRVAR(FEdgeSharp_normal_left_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *FEdgeSharp_normal_left_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_normal_left_get(BPy_FEdgeSharp *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 3, FEdgeSharp_mathutils_cb_index, MATHUTILS_SUBTYPE_NORMAL_B); } -static int FEdgeSharp_normal_left_set(BPy_FEdgeSharp *self, PyObject *value, void *UNUSED(closure)) +static int FEdgeSharp_normal_left_set(BPy_FEdgeSharp *self, PyObject *value, void * /*closure*/) { float v[3]; if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) { @@ -241,16 +241,16 @@ PyDoc_STRVAR(FEdgeSharp_material_index_right_doc, "\n" ":type: int"); -static PyObject *FEdgeSharp_material_index_right_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_material_index_right_get(BPy_FEdgeSharp *self, void * /*closure*/) { return PyLong_FromLong(self->fes->aFrsMaterialIndex()); } static int FEdgeSharp_material_index_right_set(BPy_FEdgeSharp *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { - unsigned int i = PyLong_AsUnsignedLong(value); + uint i = PyLong_AsUnsignedLong(value); if (PyErr_Occurred()) { return -1; } @@ -263,16 +263,16 @@ PyDoc_STRVAR(FEdgeSharp_material_index_left_doc, "\n" ":type: int"); -static PyObject *FEdgeSharp_material_index_left_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_material_index_left_get(BPy_FEdgeSharp *self, void * /*closure*/) { return PyLong_FromLong(self->fes->bFrsMaterialIndex()); } static int FEdgeSharp_material_index_left_set(BPy_FEdgeSharp *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { - unsigned int i = PyLong_AsUnsignedLong(value); + uint i = PyLong_AsUnsignedLong(value); if (PyErr_Occurred()) { return -1; } @@ -286,7 +286,7 @@ PyDoc_STRVAR(FEdgeSharp_material_right_doc, "\n" ":type: :class:`Material`"); -static PyObject *FEdgeSharp_material_right_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_material_right_get(BPy_FEdgeSharp *self, void * /*closure*/) { return BPy_FrsMaterial_from_FrsMaterial(self->fes->aFrsMaterial()); } @@ -296,7 +296,7 @@ PyDoc_STRVAR(FEdgeSharp_material_left_doc, "\n" ":type: :class:`Material`"); -static PyObject *FEdgeSharp_material_left_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_material_left_get(BPy_FEdgeSharp *self, void * /*closure*/) { return BPy_FrsMaterial_from_FrsMaterial(self->fes->bFrsMaterial()); } @@ -308,14 +308,14 @@ PyDoc_STRVAR(FEdgeSharp_face_mark_right_doc, "\n" ":type: bool"); -static PyObject *FEdgeSharp_face_mark_right_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_face_mark_right_get(BPy_FEdgeSharp *self, void * /*closure*/) { return PyBool_from_bool(self->fes->aFaceMark()); } static int FEdgeSharp_face_mark_right_set(BPy_FEdgeSharp *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!PyBool_Check(value)) { return -1; @@ -329,14 +329,12 @@ PyDoc_STRVAR(FEdgeSharp_face_mark_left_doc, "\n" ":type: bool"); -static PyObject *FEdgeSharp_face_mark_left_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_face_mark_left_get(BPy_FEdgeSharp *self, void * /*closure*/) { return PyBool_from_bool(self->fes->bFaceMark()); } -static int FEdgeSharp_face_mark_left_set(BPy_FEdgeSharp *self, - PyObject *value, - void *UNUSED(closure)) +static int FEdgeSharp_face_mark_left_set(BPy_FEdgeSharp *self, PyObject *value, void * /*closure*/) { if (!PyBool_Check(value)) { return -1; |