diff options
author | Hans Goudey <h.goudey@me.com> | 2022-10-04 01:37:25 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-10-04 01:38:16 +0300 |
commit | 97746129d5870beedc40e3c035c7982ce8a6bebc (patch) | |
tree | b819b8e7875e6684aad7ea1f6bb7922d4fa1c8fc /source/blender/freestyle/intern/python/Interface1D | |
parent | ed7f5713f8f9d605e3cd4cce42e40fb5c6bf4bf5 (diff) |
Cleanup: replace UNUSED macro with commented args in C++ code
This is the conventional way of dealing with unused arguments in C++,
since it works on all compilers.
Regex find and replace: `UNUSED\((\w+)\)` -> `/*$1*/`
Diffstat (limited to 'source/blender/freestyle/intern/python/Interface1D')
6 files changed, 70 insertions, 76 deletions
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp index db4ce6a8162..f73c4a8fed5 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp @@ -125,7 +125,7 @@ PyDoc_STRVAR(FEdge_first_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *FEdge_first_svertex_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_first_svertex_get(BPy_FEdge *self, void * /*closure*/) { SVertex *A = self->fe->vertexA(); if (A) { @@ -134,7 +134,7 @@ static PyObject *FEdge_first_svertex_get(BPy_FEdge *self, void *UNUSED(closure)) Py_RETURN_NONE; } -static int FEdge_first_svertex_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_first_svertex_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); @@ -149,7 +149,7 @@ PyDoc_STRVAR(FEdge_second_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *FEdge_second_svertex_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_second_svertex_get(BPy_FEdge *self, void * /*closure*/) { SVertex *B = self->fe->vertexB(); if (B) { @@ -158,7 +158,7 @@ static PyObject *FEdge_second_svertex_get(BPy_FEdge *self, void *UNUSED(closure) Py_RETURN_NONE; } -static int FEdge_second_svertex_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_second_svertex_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); @@ -174,7 +174,7 @@ PyDoc_STRVAR(FEdge_next_fedge_doc, "\n" ":type: :class:`FEdge`"); -static PyObject *FEdge_next_fedge_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_next_fedge_get(BPy_FEdge *self, void * /*closure*/) { FEdge *fe = self->fe->nextEdge(); if (fe) { @@ -183,7 +183,7 @@ static PyObject *FEdge_next_fedge_get(BPy_FEdge *self, void *UNUSED(closure)) Py_RETURN_NONE; } -static int FEdge_next_fedge_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_next_fedge_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_FEdge_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an FEdge"); @@ -199,7 +199,7 @@ PyDoc_STRVAR(FEdge_previous_fedge_doc, "\n" ":type: :class:`FEdge`"); -static PyObject *FEdge_previous_fedge_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_previous_fedge_get(BPy_FEdge *self, void * /*closure*/) { FEdge *fe = self->fe->previousEdge(); if (fe) { @@ -208,7 +208,7 @@ static PyObject *FEdge_previous_fedge_get(BPy_FEdge *self, void *UNUSED(closure) Py_RETURN_NONE; } -static int FEdge_previous_fedge_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_previous_fedge_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_FEdge_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an FEdge"); @@ -223,7 +223,7 @@ PyDoc_STRVAR(FEdge_viewedge_doc, "\n" ":type: :class:`ViewEdge`"); -static PyObject *FEdge_viewedge_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_viewedge_get(BPy_FEdge *self, void * /*closure*/) { ViewEdge *ve = self->fe->viewedge(); if (ve) { @@ -232,7 +232,7 @@ static PyObject *FEdge_viewedge_get(BPy_FEdge *self, void *UNUSED(closure)) Py_RETURN_NONE; } -static int FEdge_viewedge_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_viewedge_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_ViewEdge_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an ViewEdge"); @@ -247,12 +247,12 @@ PyDoc_STRVAR(FEdge_is_smooth_doc, "\n" ":type: bool"); -static PyObject *FEdge_is_smooth_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_is_smooth_get(BPy_FEdge *self, void * /*closure*/) { return PyBool_from_bool(self->fe->isSmooth()); } -static int FEdge_is_smooth_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_is_smooth_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!PyBool_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be boolean"); @@ -267,13 +267,13 @@ PyDoc_STRVAR(FEdge_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *FEdge_id_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_id_get(BPy_FEdge *self, void * /*closure*/) { Id id(self->fe->getId()); return BPy_Id_from_Id(id); // return a copy } -static int FEdge_id_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_id_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_Id_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an Id"); @@ -288,12 +288,12 @@ PyDoc_STRVAR(FEdge_nature_doc, "\n" ":type: :class:`Nature`"); -static PyObject *FEdge_nature_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_nature_get(BPy_FEdge *self, void * /*closure*/) { return BPy_Nature_from_Nature(self->fe->getNature()); } -static int FEdge_nature_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_nature_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_Nature_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a Nature"); diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp index 726e9f44956..1e69ae65605 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp @@ -146,7 +146,7 @@ PyDoc_STRVAR(FrsCurve_is_empty_doc, "\n" ":type: bool"); -static PyObject *FrsCurve_is_empty_get(BPy_FrsCurve *self, void *UNUSED(closure)) +static PyObject *FrsCurve_is_empty_get(BPy_FrsCurve *self, void * /*closure*/) { return PyBool_from_bool(self->c->empty()); } @@ -156,7 +156,7 @@ PyDoc_STRVAR(FrsCurve_segments_size_doc, "\n" ":type: int"); -static PyObject *FrsCurve_segments_size_get(BPy_FrsCurve *self, void *UNUSED(closure)) +static PyObject *FrsCurve_segments_size_get(BPy_FrsCurve *self, void * /*closure*/) { return PyLong_FromLong(self->c->nSegments()); } diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp index 1c1136bbae7..e9dcedef34e 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp @@ -351,12 +351,12 @@ PyDoc_STRVAR(Stroke_medium_type_doc, "\n" ":type: :class:`MediumType`"); -static PyObject *Stroke_medium_type_get(BPy_Stroke *self, void *UNUSED(closure)) +static PyObject *Stroke_medium_type_get(BPy_Stroke *self, void * /*closure*/) { return BPy_MediumType_from_MediumType(self->s->getMediumType()); } -static int Stroke_medium_type_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure)) +static int Stroke_medium_type_set(BPy_Stroke *self, PyObject *value, void * /*closure*/) { if (!BPy_MediumType_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a MediumType"); @@ -371,12 +371,12 @@ PyDoc_STRVAR(Stroke_texture_id_doc, "\n" ":type: int"); -static PyObject *Stroke_texture_id_get(BPy_Stroke *self, void *UNUSED(closure)) +static PyObject *Stroke_texture_id_get(BPy_Stroke *self, void * /*closure*/) { return PyLong_FromLong(self->s->getTextureId()); } -static int Stroke_texture_id_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure)) +static int Stroke_texture_id_set(BPy_Stroke *self, PyObject *value, void * /*closure*/) { uint i = PyLong_AsUnsignedLong(value); if (PyErr_Occurred()) { @@ -391,12 +391,12 @@ PyDoc_STRVAR(Stroke_tips_doc, "\n" ":type: bool"); -static PyObject *Stroke_tips_get(BPy_Stroke *self, void *UNUSED(closure)) +static PyObject *Stroke_tips_get(BPy_Stroke *self, void * /*closure*/) { return PyBool_from_bool(self->s->hasTips()); } -static int Stroke_tips_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure)) +static int Stroke_tips_set(BPy_Stroke *self, PyObject *value, void * /*closure*/) { if (!PyBool_Check(value)) { return -1; @@ -410,12 +410,12 @@ PyDoc_STRVAR(Stroke_length_2d_doc, "\n" ":type: float"); -static PyObject *Stroke_length_2d_get(BPy_Stroke *self, void *UNUSED(closure)) +static PyObject *Stroke_length_2d_get(BPy_Stroke *self, void * /*closure*/) { return PyFloat_FromDouble(self->s->getLength2D()); } -static int Stroke_length_2d_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure)) +static int Stroke_length_2d_set(BPy_Stroke *self, PyObject *value, void * /*closure*/) { float scalar; if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) { @@ -432,13 +432,13 @@ PyDoc_STRVAR(Stroke_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *Stroke_id_get(BPy_Stroke *self, void *UNUSED(closure)) +static PyObject *Stroke_id_get(BPy_Stroke *self, void * /*closure*/) { Id id(self->s->getId()); return BPy_Id_from_Id(id); // return a copy } -static int Stroke_id_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure)) +static int Stroke_id_set(BPy_Stroke *self, PyObject *value, void * /*closure*/) { if (!BPy_Id_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an Id"); diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp index 5a58a09d346..1ad8c503782 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp @@ -85,7 +85,7 @@ PyDoc_STRVAR(ViewEdge_first_viewvertex_doc, "\n" ":type: :class:`ViewVertex`"); -static PyObject *ViewEdge_first_viewvertex_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_first_viewvertex_get(BPy_ViewEdge *self, void * /*closure*/) { ViewVertex *v = self->ve->A(); if (v) { @@ -94,9 +94,7 @@ static PyObject *ViewEdge_first_viewvertex_get(BPy_ViewEdge *self, void *UNUSED( Py_RETURN_NONE; } -static int ViewEdge_first_viewvertex_set(BPy_ViewEdge *self, - PyObject *value, - void *UNUSED(closure)) +static int ViewEdge_first_viewvertex_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_ViewVertex_Check(value)) { return -1; @@ -110,7 +108,7 @@ PyDoc_STRVAR(ViewEdge_last_viewvertex_doc, "\n" ":type: :class:`ViewVertex`"); -static PyObject *ViewEdge_last_viewvertex_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_last_viewvertex_get(BPy_ViewEdge *self, void * /*closure*/) { ViewVertex *v = self->ve->B(); if (v) { @@ -119,7 +117,7 @@ static PyObject *ViewEdge_last_viewvertex_get(BPy_ViewEdge *self, void *UNUSED(c Py_RETURN_NONE; } -static int ViewEdge_last_viewvertex_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_last_viewvertex_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_ViewVertex_Check(value)) { return -1; @@ -133,7 +131,7 @@ PyDoc_STRVAR(ViewEdge_first_fedge_doc, "\n" ":type: :class:`FEdge`"); -static PyObject *ViewEdge_first_fedge_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_first_fedge_get(BPy_ViewEdge *self, void * /*closure*/) { FEdge *fe = self->ve->fedgeA(); if (fe) { @@ -142,7 +140,7 @@ static PyObject *ViewEdge_first_fedge_get(BPy_ViewEdge *self, void *UNUSED(closu Py_RETURN_NONE; } -static int ViewEdge_first_fedge_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_first_fedge_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_FEdge_Check(value)) { return -1; @@ -156,7 +154,7 @@ PyDoc_STRVAR(ViewEdge_last_fedge_doc, "\n" ":type: :class:`FEdge`"); -static PyObject *ViewEdge_last_fedge_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_last_fedge_get(BPy_ViewEdge *self, void * /*closure*/) { FEdge *fe = self->ve->fedgeB(); if (fe) { @@ -165,7 +163,7 @@ static PyObject *ViewEdge_last_fedge_get(BPy_ViewEdge *self, void *UNUSED(closur Py_RETURN_NONE; } -static int ViewEdge_last_fedge_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_last_fedge_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_FEdge_Check(value)) { return -1; @@ -179,7 +177,7 @@ PyDoc_STRVAR(ViewEdge_viewshape_doc, "\n" ":type: :class:`ViewShape`"); -static PyObject *ViewEdge_viewshape_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_viewshape_get(BPy_ViewEdge *self, void * /*closure*/) { ViewShape *vs = self->ve->viewShape(); if (vs) { @@ -188,7 +186,7 @@ static PyObject *ViewEdge_viewshape_get(BPy_ViewEdge *self, void *UNUSED(closure Py_RETURN_NONE; } -static int ViewEdge_viewshape_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_viewshape_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_ViewShape_Check(value)) { return -1; @@ -203,7 +201,7 @@ PyDoc_STRVAR(ViewEdge_occludee_doc, "\n" ":type: :class:`ViewShape`"); -static PyObject *ViewEdge_occludee_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_occludee_get(BPy_ViewEdge *self, void * /*closure*/) { ViewShape *vs = self->ve->aShape(); if (vs) { @@ -212,7 +210,7 @@ static PyObject *ViewEdge_occludee_get(BPy_ViewEdge *self, void *UNUSED(closure) Py_RETURN_NONE; } -static int ViewEdge_occludee_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_occludee_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_ViewShape_Check(value)) { return -1; @@ -226,7 +224,7 @@ PyDoc_STRVAR(ViewEdge_is_closed_doc, "\n" ":type: bool"); -static PyObject *ViewEdge_is_closed_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_is_closed_get(BPy_ViewEdge *self, void * /*closure*/) { return PyBool_from_bool(self->ve->isClosed()); } @@ -236,13 +234,13 @@ PyDoc_STRVAR(ViewEdge_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *ViewEdge_id_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_id_get(BPy_ViewEdge *self, void * /*closure*/) { Id id(self->ve->getId()); return BPy_Id_from_Id(id); // return a copy } -static int ViewEdge_id_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_id_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_Id_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an Id"); @@ -257,12 +255,12 @@ PyDoc_STRVAR(ViewEdge_nature_doc, "\n" ":type: :class:`Nature`"); -static PyObject *ViewEdge_nature_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_nature_get(BPy_ViewEdge *self, void * /*closure*/) { return BPy_Nature_from_Nature(self->ve->getNature()); } -static int ViewEdge_nature_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_nature_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_Nature_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a Nature"); @@ -277,12 +275,12 @@ PyDoc_STRVAR(ViewEdge_qi_doc, "\n" ":type: int"); -static PyObject *ViewEdge_qi_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_qi_get(BPy_ViewEdge *self, void * /*closure*/) { return PyLong_FromLong(self->ve->qi()); } -static int ViewEdge_qi_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_qi_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { int qi; @@ -298,14 +296,14 @@ PyDoc_STRVAR(ViewEdge_chaining_time_stamp_doc, "\n" ":type: int"); -static PyObject *ViewEdge_chaining_time_stamp_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_chaining_time_stamp_get(BPy_ViewEdge *self, void * /*closure*/) { return PyLong_FromLong(self->ve->getChainingTimeStamp()); } static int ViewEdge_chaining_time_stamp_set(BPy_ViewEdge *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { int timestamp; 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 e32910cf53d..0a4d1a5d32c 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp @@ -193,15 +193,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 +215,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,14 +239,14 @@ 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*/) { uint i = PyLong_AsUnsignedLong(value); if (PyErr_Occurred()) { @@ -263,14 +261,14 @@ 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*/) { uint i = PyLong_AsUnsignedLong(value); if (PyErr_Occurred()) { @@ -286,7 +284,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 +294,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 +306,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 +327,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; diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp index 93943dcda05..51ae9334f37 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp @@ -143,12 +143,12 @@ PyDoc_STRVAR(FEdgeSmooth_normal_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *FEdgeSmooth_normal_get(BPy_FEdgeSmooth *self, void *UNUSED(closure)) +static PyObject *FEdgeSmooth_normal_get(BPy_FEdgeSmooth *self, void * /*closure*/) { return Vector_CreatePyObject_cb((PyObject *)self, 3, FEdgeSmooth_mathutils_cb_index, 0); } -static int FEdgeSmooth_normal_set(BPy_FEdgeSmooth *self, PyObject *value, void *UNUSED(closure)) +static int FEdgeSmooth_normal_set(BPy_FEdgeSmooth *self, PyObject *value, void * /*closure*/) { float v[3]; if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) { @@ -164,14 +164,14 @@ PyDoc_STRVAR(FEdgeSmooth_material_index_doc, "\n" ":type: int"); -static PyObject *FEdgeSmooth_material_index_get(BPy_FEdgeSmooth *self, void *UNUSED(closure)) +static PyObject *FEdgeSmooth_material_index_get(BPy_FEdgeSmooth *self, void * /*closure*/) { return PyLong_FromLong(self->fes->frs_materialIndex()); } static int FEdgeSmooth_material_index_set(BPy_FEdgeSmooth *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { uint i = PyLong_AsUnsignedLong(value); if (PyErr_Occurred()) { @@ -186,7 +186,7 @@ PyDoc_STRVAR(FEdgeSmooth_material_doc, "\n" ":type: :class:`Material`"); -static PyObject *FEdgeSmooth_material_get(BPy_FEdgeSmooth *self, void *UNUSED(closure)) +static PyObject *FEdgeSmooth_material_get(BPy_FEdgeSmooth *self, void * /*closure*/) { return BPy_FrsMaterial_from_FrsMaterial(self->fes->frs_material()); } @@ -196,12 +196,12 @@ PyDoc_STRVAR(FEdgeSmooth_face_mark_doc, "\n" ":type: bool"); -static PyObject *FEdgeSmooth_face_mark_get(BPy_FEdgeSmooth *self, void *UNUSED(closure)) +static PyObject *FEdgeSmooth_face_mark_get(BPy_FEdgeSmooth *self, void * /*closure*/) { return PyBool_from_bool(self->fes->faceMark()); } -static int FEdgeSmooth_face_mark_set(BPy_FEdgeSmooth *self, PyObject *value, void *UNUSED(closure)) +static int FEdgeSmooth_face_mark_set(BPy_FEdgeSmooth *self, PyObject *value, void * /*closure*/) { if (!PyBool_Check(value)) { return -1; |