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*/`

44 files changed, 217 insertions, 241 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
index 6669c021f27..6b23565a23e 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
@@ -120,7 +120,7 @@ PyDoc_STRVAR(BinaryPredicate0D_name_doc,
              "\n"
              ":type: str");
 
-static PyObject *BinaryPredicate0D_name_get(BPy_BinaryPredicate0D *self, void *UNUSED(closure))
+static PyObject *BinaryPredicate0D_name_get(BPy_BinaryPredicate0D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
 }
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
index 496900a712b..9e3e5979871 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
@@ -155,7 +155,7 @@ PyDoc_STRVAR(BinaryPredicate1D_name_doc,
              "\n"
              ":type: str");
 
-static PyObject *BinaryPredicate1D_name_get(BPy_BinaryPredicate1D *self, void *UNUSED(closure))
+static PyObject *BinaryPredicate1D_name_get(BPy_BinaryPredicate1D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
 }
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
index 7eccf0403ae..7f71bbf1fdd 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
@@ -296,13 +296,13 @@ PyDoc_STRVAR(FrsMaterial_line_doc,
              "\n"
              ":type: :class:`mathutils.Vector`");
 
-static PyObject *FrsMaterial_line_get(BPy_FrsMaterial *self, void *UNUSED(closure))
+static PyObject *FrsMaterial_line_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
       (PyObject *)self, 4, FrsMaterial_mathutils_cb_index, MATHUTILS_SUBTYPE_LINE);
 }
 
-static int FrsMaterial_line_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure))
+static int FrsMaterial_line_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/)
 {
   float color[4];
   if (mathutils_array_parse(color, 4, 4, value, "value must be a 4-dimensional vector") == -1) {
@@ -317,13 +317,13 @@ PyDoc_STRVAR(FrsMaterial_diffuse_doc,
              "\n"
              ":type: :class:`mathutils.Vector`");
 
-static PyObject *FrsMaterial_diffuse_get(BPy_FrsMaterial *self, void *UNUSED(closure))
+static PyObject *FrsMaterial_diffuse_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
       (PyObject *)self, 4, FrsMaterial_mathutils_cb_index, MATHUTILS_SUBTYPE_DIFFUSE);
 }
 
-static int FrsMaterial_diffuse_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure))
+static int FrsMaterial_diffuse_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/)
 {
   float color[4];
   if (mathutils_array_parse(color, 4, 4, value, "value must be a 4-dimensional vector") == -1) {
@@ -338,13 +338,13 @@ PyDoc_STRVAR(FrsMaterial_specular_doc,
              "\n"
              ":type: :class:`mathutils.Vector`");
 
-static PyObject *FrsMaterial_specular_get(BPy_FrsMaterial *self, void *UNUSED(closure))
+static PyObject *FrsMaterial_specular_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
       (PyObject *)self, 4, FrsMaterial_mathutils_cb_index, MATHUTILS_SUBTYPE_SPECULAR);
 }
 
-static int FrsMaterial_specular_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure))
+static int FrsMaterial_specular_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/)
 {
   float color[4];
   if (mathutils_array_parse(color, 4, 4, value, "value must be a 4-dimensional vector") == -1) {
@@ -359,13 +359,13 @@ PyDoc_STRVAR(FrsMaterial_ambient_doc,
              "\n"
              ":type: :class:`mathutils.Color`");
 
-static PyObject *FrsMaterial_ambient_get(BPy_FrsMaterial *self, void *UNUSED(closure))
+static PyObject *FrsMaterial_ambient_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
       (PyObject *)self, 4, FrsMaterial_mathutils_cb_index, MATHUTILS_SUBTYPE_AMBIENT);
 }
 
-static int FrsMaterial_ambient_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure))
+static int FrsMaterial_ambient_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/)
 {
   float color[4];
   if (mathutils_array_parse(color, 4, 4, value, "value must be a 4-dimensional vector") == -1) {
@@ -380,13 +380,13 @@ PyDoc_STRVAR(FrsMaterial_emission_doc,
              "\n"
              ":type: :class:`mathutils.Color`");
 
-static PyObject *FrsMaterial_emission_get(BPy_FrsMaterial *self, void *UNUSED(closure))
+static PyObject *FrsMaterial_emission_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
       (PyObject *)self, 4, FrsMaterial_mathutils_cb_index, MATHUTILS_SUBTYPE_EMISSION);
 }
 
-static int FrsMaterial_emission_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure))
+static int FrsMaterial_emission_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/)
 {
   float color[4];
   if (mathutils_array_parse(color, 4, 4, value, "value must be a 4-dimensional vector") == -1) {
@@ -401,12 +401,12 @@ PyDoc_STRVAR(FrsMaterial_shininess_doc,
              "\n"
              ":type: float");
 
-static PyObject *FrsMaterial_shininess_get(BPy_FrsMaterial *self, void *UNUSED(closure))
+static PyObject *FrsMaterial_shininess_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->m->shininess());
 }
 
-static int FrsMaterial_shininess_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure))
+static int FrsMaterial_shininess_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/)
 {
   float scalar;
   if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) {
@@ -423,12 +423,12 @@ PyDoc_STRVAR(FrsMaterial_priority_doc,
              "\n"
              ":type: int");
 
-static PyObject *FrsMaterial_priority_get(BPy_FrsMaterial *self, void *UNUSED(closure))
+static PyObject *FrsMaterial_priority_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->m->priority());
 }
 
-static int FrsMaterial_priority_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure))
+static int FrsMaterial_priority_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/)
 {
   int scalar;
   if ((scalar = PyLong_AsLong(value)) == -1 && PyErr_Occurred()) {
diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp
index fd665f56189..dc6592769b8 100644
--- a/source/blender/freestyle/intern/python/BPy_Id.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Id.cpp
@@ -109,12 +109,12 @@ PyDoc_STRVAR(Id_first_doc,
              "\n"
              ":type: int");
 
-static PyObject *Id_first_get(BPy_Id *self, void *UNUSED(closure))
+static PyObject *Id_first_get(BPy_Id *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->id->getFirst());
 }
 
-static int Id_first_set(BPy_Id *self, PyObject *value, void *UNUSED(closure))
+static int Id_first_set(BPy_Id *self, PyObject *value, void * /*closure*/)
 {
   int scalar;
   if ((scalar = PyLong_AsLong(value)) == -1 && PyErr_Occurred()) {
@@ -130,12 +130,12 @@ PyDoc_STRVAR(Id_second_doc,
              "\n"
              ":type: int");
 
-static PyObject *Id_second_get(BPy_Id *self, void *UNUSED(closure))
+static PyObject *Id_second_get(BPy_Id *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->id->getSecond());
 }
 
-static int Id_second_set(BPy_Id *self, PyObject *value, void *UNUSED(closure))
+static int Id_second_set(BPy_Id *self, PyObject *value, void * /*closure*/)
 {
   int scalar;
   if ((scalar = PyLong_AsLong(value)) == -1 && PyErr_Occurred()) {
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
index c87e58e954b..083fdbf58db 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
@@ -159,7 +159,7 @@ PyDoc_STRVAR(Interface0D_name_doc,
              "\n"
              ":type: str");
 
-static PyObject *Interface0D_name_get(BPy_Interface0D *self, void *UNUSED(closure))
+static PyObject *Interface0D_name_get(BPy_Interface0D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
 }
@@ -169,7 +169,7 @@ PyDoc_STRVAR(Interface0D_point_3d_doc,
              "\n"
              ":type: :class:`mathutils.Vector`");
 
-static PyObject *Interface0D_point_3d_get(BPy_Interface0D *self, void *UNUSED(closure))
+static PyObject *Interface0D_point_3d_get(BPy_Interface0D *self, void * /*closure*/)
 {
   Vec3f p(self->if0D->getPoint3D());
   if (PyErr_Occurred()) {
@@ -183,7 +183,7 @@ PyDoc_STRVAR(Interface0D_projected_x_doc,
              "\n"
              ":type: float");
 
-static PyObject *Interface0D_projected_x_get(BPy_Interface0D *self, void *UNUSED(closure))
+static PyObject *Interface0D_projected_x_get(BPy_Interface0D *self, void * /*closure*/)
 {
   real x = self->if0D->getProjectedX();
   if (PyErr_Occurred()) {
@@ -197,7 +197,7 @@ PyDoc_STRVAR(Interface0D_projected_y_doc,
              "\n"
              ":type: float");
 
-static PyObject *Interface0D_projected_y_get(BPy_Interface0D *self, void *UNUSED(closure))
+static PyObject *Interface0D_projected_y_get(BPy_Interface0D *self, void * /*closure*/)
 {
   real y = self->if0D->getProjectedY();
   if (PyErr_Occurred()) {
@@ -211,7 +211,7 @@ PyDoc_STRVAR(Interface0D_projected_z_doc,
              "\n"
              ":type: float");
 
-static PyObject *Interface0D_projected_z_get(BPy_Interface0D *self, void *UNUSED(closure))
+static PyObject *Interface0D_projected_z_get(BPy_Interface0D *self, void * /*closure*/)
 {
   real z = self->if0D->getProjectedZ();
   if (PyErr_Occurred()) {
@@ -225,7 +225,7 @@ PyDoc_STRVAR(Interface0D_point_2d_doc,
              "\n"
              ":type: :class:`mathutils.Vector`");
 
-static PyObject *Interface0D_point_2d_get(BPy_Interface0D *self, void *UNUSED(closure))
+static PyObject *Interface0D_point_2d_get(BPy_Interface0D *self, void * /*closure*/)
 {
   Vec2f p(self->if0D->getPoint2D());
   if (PyErr_Occurred()) {
@@ -239,7 +239,7 @@ PyDoc_STRVAR(Interface0D_id_doc,
              "\n"
              ":type: :class:`Id`");
 
-static PyObject *Interface0D_id_get(BPy_Interface0D *self, void *UNUSED(closure))
+static PyObject *Interface0D_id_get(BPy_Interface0D *self, void * /*closure*/)
 {
   Id id(self->if0D->getId());
   if (PyErr_Occurred()) {
@@ -253,7 +253,7 @@ PyDoc_STRVAR(Interface0D_nature_doc,
              "\n"
              ":type: :class:`Nature`");
 
-static PyObject *Interface0D_nature_get(BPy_Interface0D *self, void *UNUSED(closure))
+static PyObject *Interface0D_nature_get(BPy_Interface0D *self, void * /*closure*/)
 {
   Nature::VertexNature nature = self->if0D->getNature();
   if (PyErr_Occurred()) {
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index 1a353c2174f..d636fb4e6b8 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -234,7 +234,7 @@ PyDoc_STRVAR(Interface1D_name_doc,
              "\n"
              ":type: str");
 
-static PyObject *Interface1D_name_get(BPy_Interface1D *self, void *UNUSED(closure))
+static PyObject *Interface1D_name_get(BPy_Interface1D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
 }
@@ -244,7 +244,7 @@ PyDoc_STRVAR(Interface1D_id_doc,
              "\n"
              ":type: :class:`Id`");
 
-static PyObject *Interface1D_id_get(BPy_Interface1D *self, void *UNUSED(closure))
+static PyObject *Interface1D_id_get(BPy_Interface1D *self, void * /*closure*/)
 {
   Id id(self->if1D->getId());
   if (PyErr_Occurred()) {
@@ -258,7 +258,7 @@ PyDoc_STRVAR(Interface1D_nature_doc,
              "\n"
              ":type: :class:`Nature`");
 
-static PyObject *Interface1D_nature_get(BPy_Interface1D *self, void *UNUSED(closure))
+static PyObject *Interface1D_nature_get(BPy_Interface1D *self, void * /*closure*/)
 {
   Nature::VertexNature nature = self->if1D->getNature();
   if (PyErr_Occurred()) {
@@ -272,7 +272,7 @@ PyDoc_STRVAR(Interface1D_length_2d_doc,
              "\n"
              ":type: float");
 
-static PyObject *Interface1D_length_2d_get(BPy_Interface1D *self, void *UNUSED(closure))
+static PyObject *Interface1D_length_2d_get(BPy_Interface1D *self, void * /*closure*/)
 {
   real length = self->if1D->getLength2D();
   if (PyErr_Occurred()) {
@@ -286,14 +286,12 @@ PyDoc_STRVAR(Interface1D_time_stamp_doc,
              "\n"
              ":type: int");
 
-static PyObject *Interface1D_time_stamp_get(BPy_Interface1D *self, void *UNUSED(closure))
+static PyObject *Interface1D_time_stamp_get(BPy_Interface1D *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->if1D->getTimeStamp());
 }
 
-static int Interface1D_time_stamp_set(BPy_Interface1D *self,
-                                      PyObject *value,
-                                      void *UNUSED(closure))
+static int Interface1D_time_stamp_set(BPy_Interface1D *self, PyObject *value, void * /*closure*/)
 {
   int timestamp;
 
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
index 35e6dd5536e..b167faa15e5 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -177,7 +177,7 @@ PyDoc_STRVAR(Iterator_name_doc,
              "\n"
              ":type: str");
 
-static PyObject *Iterator_name_get(BPy_Iterator *self, void *UNUSED(closure))
+static PyObject *Iterator_name_get(BPy_Iterator *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
 }
@@ -187,7 +187,7 @@ PyDoc_STRVAR(Iterator_is_begin_doc,
              "\n"
              ":type: bool");
 
-static PyObject *Iterator_is_begin_get(BPy_Iterator *self, void *UNUSED(closure))
+static PyObject *Iterator_is_begin_get(BPy_Iterator *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->it->isBegin());
 }
@@ -197,7 +197,7 @@ PyDoc_STRVAR(Iterator_is_end_doc,
              "\n"
              ":type: bool");
 
-static PyObject *Iterator_is_end_get(BPy_Iterator *self, void *UNUSED(closure))
+static PyObject *Iterator_is_end_get(BPy_Iterator *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->it->isEnd());
 }
diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp
index 5e504772786..7fb647119e6 100644
--- a/source/blender/freestyle/intern/python/BPy_SShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp
@@ -155,13 +155,13 @@ PyDoc_STRVAR(SShape_id_doc,
              "\n"
              ":type: :class:`Id`");
 
-static PyObject *SShape_id_get(BPy_SShape *self, void *UNUSED(closure))
+static PyObject *SShape_id_get(BPy_SShape *self, void * /*closure*/)
 {
   Id id(self->ss->getId());
   return BPy_Id_from_Id(id);  // return a copy
 }
 
-static int SShape_id_set(BPy_SShape *self, PyObject *value, void *UNUSED(closure))
+static int SShape_id_set(BPy_SShape *self, PyObject *value, void * /*closure*/)
 {
   if (!BPy_Id_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an Id");
@@ -176,12 +176,12 @@ PyDoc_STRVAR(SShape_name_doc,
              "\n"
              ":type: str");
 
-static PyObject *SShape_name_get(BPy_SShape *self, void *UNUSED(closure))
+static PyObject *SShape_name_get(BPy_SShape *self, void * /*closure*/)
 {
   return PyUnicode_FromString(self->ss->getName().c_str());
 }
 
-static int SShape_name_set(BPy_SShape *self, PyObject *value, void *UNUSED(closure))
+static int SShape_name_set(BPy_SShape *self, PyObject *value, void * /*closure*/)
 {
   if (!PyUnicode_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be a string");
@@ -197,13 +197,13 @@ PyDoc_STRVAR(SShape_bbox_doc,
              "\n"
              ":type: :class:`BBox`");
 
-static PyObject *SShape_bbox_get(BPy_SShape *self, void *UNUSED(closure))
+static PyObject *SShape_bbox_get(BPy_SShape *self, void * /*closure*/)
 {
   BBox<Vec3r> bb(self->ss->bbox());
   return BPy_BBox_from_BBox(bb);  // return a copy
 }
 
-static int SShape_bbox_set(BPy_SShape *self, PyObject *value, void *UNUSED(closure))
+static int SShape_bbox_set(BPy_SShape *self, PyObject *value, void * /*closure*/)
 {
   if (!BPy_BBox_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be a BBox");
@@ -218,7 +218,7 @@ PyDoc_STRVAR(SShape_vertices_doc,
              "\n"
              ":type: List of :class:`SVertex` objects");
 
-static PyObject *SShape_vertices_get(BPy_SShape *self, void *UNUSED(closure))
+static PyObject *SShape_vertices_get(BPy_SShape *self, void * /*closure*/)
 {
 
   vector<SVertex *> vertices = self->ss->getVertexList();
@@ -238,7 +238,7 @@ PyDoc_STRVAR(SShape_edges_doc,
              "\n"
              ":type: List of :class:`FEdge` objects");
 
-static PyObject *SShape_edges_get(BPy_SShape *self, void *UNUSED(closure))
+static PyObject *SShape_edges_get(BPy_SShape *self, void * /*closure*/)
 {
 
   vector<FEdge *> edges = self->ss->getEdgeList();
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
index 86d7a726883..c68c30f9602 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
@@ -545,14 +545,14 @@ PyDoc_STRVAR(StrokeAttribute_alpha_doc,
              "\n"
              ":type: float");
 
-static PyObject *StrokeAttribute_alpha_get(BPy_StrokeAttribute *self, void *UNUSED(closure))
+static PyObject *StrokeAttribute_alpha_get(BPy_StrokeAttribute *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sa->getAlpha());
 }
 
 static int StrokeAttribute_alpha_set(BPy_StrokeAttribute *self,
                                      PyObject *value,
-                                     void *UNUSED(closure))
+                                     void * /*closure*/)
 {
   float scalar;
   if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) {
@@ -569,7 +569,7 @@ PyDoc_STRVAR(StrokeAttribute_color_doc,
              "\n"
              ":type: :class:`mathutils.Color`");
 
-static PyObject *StrokeAttribute_color_get(BPy_StrokeAttribute *self, void *UNUSED(closure))
+static PyObject *StrokeAttribute_color_get(BPy_StrokeAttribute *self, void * /*closure*/)
 {
   return Color_CreatePyObject_cb(
       (PyObject *)self, StrokeAttribute_mathutils_cb_index, MATHUTILS_SUBTYPE_COLOR);
@@ -577,7 +577,7 @@ static PyObject *StrokeAttribute_color_get(BPy_StrokeAttribute *self, void *UNUS
 
 static int StrokeAttribute_color_set(BPy_StrokeAttribute *self,
                                      PyObject *value,
-                                     void *UNUSED(closure))
+                                     void * /*closure*/)
 {
   float v[3];
   if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) {
@@ -594,7 +594,7 @@ PyDoc_STRVAR(StrokeAttribute_thickness_doc,
              "\n"
              ":type: :class:`mathutils.Vector`");
 
-static PyObject *StrokeAttribute_thickness_get(BPy_StrokeAttribute *self, void *UNUSED(closure))
+static PyObject *StrokeAttribute_thickness_get(BPy_StrokeAttribute *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
       (PyObject *)self, 2, StrokeAttribute_mathutils_cb_index, MATHUTILS_SUBTYPE_THICKNESS);
@@ -602,7 +602,7 @@ static PyObject *StrokeAttribute_thickness_get(BPy_StrokeAttribute *self, void *
 
 static int StrokeAttribute_thickness_set(BPy_StrokeAttribute *self,
                                          PyObject *value,
-                                         void *UNUSED(closure))
+                                         void * /*closure*/)
 {
   float v[2];
   if (mathutils_array_parse(v, 2, 2, value, "value must be a 2-dimensional vector") == -1) {
@@ -617,14 +617,14 @@ PyDoc_STRVAR(StrokeAttribute_visible_doc,
              "\n"
              ":type: bool");
 
-static PyObject *StrokeAttribute_visible_get(BPy_StrokeAttribute *self, void *UNUSED(closure))
+static PyObject *StrokeAttribute_visible_get(BPy_StrokeAttribute *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->sa->isVisible());
 }
 
 static int StrokeAttribute_visible_set(BPy_StrokeAttribute *self,
                                        PyObject *value,
-                                       void *UNUSED(closure))
+                                       void * /*closure*/)
 {
   if (!PyBool_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be boolean");
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
index 2e1e7157b83..f9e1d0e86d3 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
@@ -253,7 +253,7 @@ PyDoc_STRVAR(StrokeShader_name_doc,
              "\n"
              ":type: str");
 
-static PyObject *StrokeShader_name_get(BPy_StrokeShader *self, void *UNUSED(closure))
+static PyObject *StrokeShader_name_get(BPy_StrokeShader *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
 }
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
index 20941df20be..cf70c989054 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
@@ -91,7 +91,7 @@ PyDoc_STRVAR(UnaryFunction0D_name_doc,
              "\n"
              ":type: str");
 
-static PyObject *UnaryFunction0D_name_get(BPy_UnaryFunction0D *self, void *UNUSED(closure))
+static PyObject *UnaryFunction0D_name_get(BPy_UnaryFunction0D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
 }
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
index 6c2877428a7..65604de1f83 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
@@ -85,7 +85,7 @@ PyDoc_STRVAR(UnaryFunction1D_name_doc,
              "\n"
              ":type: str");
 
-static PyObject *UnaryFunction1D_name_get(BPy_UnaryFunction1D *self, void *UNUSED(closure))
+static PyObject *UnaryFunction1D_name_get(BPy_UnaryFunction1D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
 }
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
index fe70658fd17..b8169aae9cd 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
@@ -134,7 +134,7 @@ PyDoc_STRVAR(UnaryPredicate0D_name_doc,
              "\n"
              ":type: str");
 
-static PyObject *UnaryPredicate0D_name_get(BPy_UnaryPredicate0D *self, void *UNUSED(closure))
+static PyObject *UnaryPredicate0D_name_get(BPy_UnaryPredicate0D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
 }
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
index a42f8bc6963..94ff12a4b56 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
@@ -192,7 +192,7 @@ PyDoc_STRVAR(UnaryPredicate1D_name_doc,
              "\n"
              ":type: str");
 
-static PyObject *UnaryPredicate1D_name_get(BPy_UnaryPredicate1D *self, void *UNUSED(closure))
+static PyObject *UnaryPredicate1D_name_get(BPy_UnaryPredicate1D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
 }
diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
index 075e5220e43..bc000c5f1a7 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
@@ -141,12 +141,12 @@ PyDoc_STRVAR(ViewMap_scene_bbox_doc,
              "\n"
              ":type: :class:`BBox`");
 
-static PyObject *ViewMap_scene_bbox_get(BPy_ViewMap *self, void *UNUSED(closure))
+static PyObject *ViewMap_scene_bbox_get(BPy_ViewMap *self, void * /*closure*/)
 {
   return BPy_BBox_from_BBox(self->vm->getScene3dBBox());
 }
 
-static int ViewMap_scene_bbox_set(BPy_ViewMap *self, PyObject *value, void *UNUSED(closure))
+static int ViewMap_scene_bbox_set(BPy_ViewMap *self, PyObject *value, void * /*closure*/)
 {
   if (!BPy_BBox_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be a BBox");
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
index 319058ea719..77c3c708103 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
@@ -163,7 +163,7 @@ PyDoc_STRVAR(ViewShape_sshape_doc,
              "\n"
              ":type: :class:`SShape`");
 
-static PyObject *ViewShape_sshape_get(BPy_ViewShape *self, void *UNUSED(closure))
+static PyObject *ViewShape_sshape_get(BPy_ViewShape *self, void * /*closure*/)
 {
   SShape *ss = self->vs->sshape();
   if (!ss) {
@@ -172,7 +172,7 @@ static PyObject *ViewShape_sshape_get(BPy_ViewShape *self, void *UNUSED(closure)
   return BPy_SShape_from_SShape(*ss);
 }
 
-static int ViewShape_sshape_set(BPy_ViewShape *self, PyObject *value, void *UNUSED(closure))
+static int ViewShape_sshape_set(BPy_ViewShape *self, PyObject *value, void * /*closure*/)
 {
   if (!BPy_SShape_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an SShape");
@@ -195,7 +195,7 @@ PyDoc_STRVAR(ViewShape_vertices_doc,
              "\n"
              ":type: List of :class:`ViewVertex` objects");
 
-static PyObject *ViewShape_vertices_get(BPy_ViewShape *self, void *UNUSED(closure))
+static PyObject *ViewShape_vertices_get(BPy_ViewShape *self, void * /*closure*/)
 {
   vector<ViewVertex *> vertices = self->vs->vertices();
   vector<ViewVertex *>::iterator it;
@@ -208,7 +208,7 @@ static PyObject *ViewShape_vertices_get(BPy_ViewShape *self, void *UNUSED(closur
   return py_vertices;
 }
 
-static int ViewShape_vertices_set(BPy_ViewShape *self, PyObject *value, void *UNUSED(closure))
+static int ViewShape_vertices_set(BPy_ViewShape *self, PyObject *value, void * /*closure*/)
 {
   PyObject *item;
   vector<ViewVertex *> v;
@@ -238,7 +238,7 @@ PyDoc_STRVAR(ViewShape_edges_doc,
              "\n"
              ":type: List of :class:`ViewEdge` objects");
 
-static PyObject *ViewShape_edges_get(BPy_ViewShape *self, void *UNUSED(closure))
+static PyObject *ViewShape_edges_get(BPy_ViewShape *self, void * /*closure*/)
 {
   vector<ViewEdge *> edges = self->vs->edges();
   vector<ViewEdge *>::iterator it;
@@ -251,7 +251,7 @@ static PyObject *ViewShape_edges_get(BPy_ViewShape *self, void *UNUSED(closure))
   return py_edges;
 }
 
-static int ViewShape_edges_set(BPy_ViewShape *self, PyObject *value, void *UNUSED(closure))
+static int ViewShape_edges_set(BPy_ViewShape *self, PyObject *value, void * /*closure*/)
 {
   PyObject *item;
   vector<ViewEdge *> v;
@@ -281,7 +281,7 @@ PyDoc_STRVAR(ViewShape_name_doc,
              "\n"
              ":type: str");
 
-static PyObject *ViewShape_name_get(BPy_ViewShape *self, void *UNUSED(closure))
+static PyObject *ViewShape_name_get(BPy_ViewShape *self, void * /*closure*/)
 {
   return PyUnicode_FromString(self->vs->getName().c_str());
 }
@@ -291,7 +291,7 @@ PyDoc_STRVAR(ViewShape_library_path_doc,
              "\n"
              ":type: str, or None if the ViewShape is not part of a library");
 
-static PyObject *ViewShape_library_path_get(BPy_ViewShape *self, void *UNUSED(closure))
+static PyObject *ViewShape_library_path_get(BPy_ViewShape *self, void * /*closure*/)
 {
   return PyUnicode_FromString(self->vs->getLibraryPath().c_str());
 }
@@ -301,7 +301,7 @@ PyDoc_STRVAR(ViewShape_id_doc,
              "\n"
              ":type: :class:`Id`");
 
-static PyObject *ViewShape_id_get(BPy_ViewShape *self, void *UNUSED(closure))
+static PyObject *ViewShape_id_get(BPy_ViewShape *self, void * /*closure*/)
 {
   Id id(self->vs->getId());
   return BPy_Id_from_Id(id);  // return a copy
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
index 2b6d40e1710..a4067be3dc1 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
@@ -123,7 +123,7 @@ PyDoc_STRVAR(CurvePoint_first_svertex_doc,
              "\n"
              ":type: :class:`SVertex`");
 
-static PyObject *CurvePoint_first_svertex_get(BPy_CurvePoint *self, void *UNUSED(closure))
+static PyObject *CurvePoint_first_svertex_get(BPy_CurvePoint *self, void * /*closure*/)
 {
   SVertex *A = self->cp->A();
   if (A) {
@@ -132,9 +132,7 @@ static PyObject *CurvePoint_first_svertex_get(BPy_CurvePoint *self, void *UNUSED
   Py_RETURN_NONE;
 }
 
-static int CurvePoint_first_svertex_set(BPy_CurvePoint *self,
-                                        PyObject *value,
-                                        void *UNUSED(closure))
+static int CurvePoint_first_svertex_set(BPy_CurvePoint *self, PyObject *value, void * /*closure*/)
 {
   if (!BPy_SVertex_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an SVertex");
@@ -149,7 +147,7 @@ PyDoc_STRVAR(CurvePoint_second_svertex_doc,
              "\n"
              ":type: :class:`SVertex`");
 
-static PyObject *CurvePoint_second_svertex_get(BPy_CurvePoint *self, void *UNUSED(closure))
+static PyObject *CurvePoint_second_svertex_get(BPy_CurvePoint *self, void * /*closure*/)
 {
   SVertex *B = self->cp->B();
   if (B) {
@@ -158,9 +156,7 @@ static PyObject *CurvePoint_second_svertex_get(BPy_CurvePoint *self, void *UNUSE
   Py_RETURN_NONE;
 }
 
-static int CurvePoint_second_svertex_set(BPy_CurvePoint *self,
-                                         PyObject *value,
-                                         void *UNUSED(closure))
+static int CurvePoint_second_svertex_set(BPy_CurvePoint *self, PyObject *value, void * /*closure*/)
 {
   if (!BPy_SVertex_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an SVertex");
@@ -176,7 +172,7 @@ PyDoc_STRVAR(CurvePoint_fedge_doc,
              "\n"
              ":type: :class:`FEdge`");
 
-static PyObject *CurvePoint_fedge_get(BPy_CurvePoint *self, void *UNUSED(closure))
+static PyObject *CurvePoint_fedge_get(BPy_CurvePoint *self, void * /*closure*/)
 {
   SVertex *A = self->cp->A();
   Interface0D *B = (Interface0D *)self->cp->B();
@@ -192,12 +188,12 @@ PyDoc_STRVAR(CurvePoint_t2d_doc,
              "\n"
              ":type: float");
 
-static PyObject *CurvePoint_t2d_get(BPy_CurvePoint *self, void *UNUSED(closure))
+static PyObject *CurvePoint_t2d_get(BPy_CurvePoint *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->cp->t2d());
 }
 
-static int CurvePoint_t2d_set(BPy_CurvePoint *self, PyObject *value, void *UNUSED(closure))
+static int CurvePoint_t2d_set(BPy_CurvePoint *self, PyObject *value, void * /*closure*/)
 {
   float scalar;
   if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) {
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
index 09202127ad2..cb84b7e82ba 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
@@ -265,13 +265,13 @@ PyDoc_STRVAR(SVertex_point_3d_doc,
              "\n"
              ":type: :class:`mathutils.Vector`");
 
-static PyObject *SVertex_point_3d_get(BPy_SVertex *self, void *UNUSED(closure))
+static PyObject *SVertex_point_3d_get(BPy_SVertex *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
       (PyObject *)self, 3, SVertex_mathutils_cb_index, MATHUTILS_SUBTYPE_POINT3D);
 }
 
-static int SVertex_point_3d_set(BPy_SVertex *self, PyObject *value, void *UNUSED(closure))
+static int SVertex_point_3d_set(BPy_SVertex *self, PyObject *value, void * /*closure*/)
 {
   float v[3];
   if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) {
@@ -287,13 +287,13 @@ PyDoc_STRVAR(SVertex_point_2d_doc,
              "\n"
              ":type: :class:`mathutils.Vector`");
 
-static PyObject *SVertex_point_2d_get(BPy_SVertex *self, void *UNUSED(closure))
+static PyObject *SVertex_point_2d_get(BPy_SVertex *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
       (PyObject *)self, 3, SVertex_mathutils_cb_index, MATHUTILS_SUBTYPE_POINT2D);
 }
 
-static int SVertex_point_2d_set(BPy_SVertex *self, PyObject *value, void *UNUSED(closure))
+static int SVertex_point_2d_set(BPy_SVertex *self, PyObject *value, void * /*closure*/)
 {
   float v[3];
   if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) {
@@ -309,13 +309,13 @@ PyDoc_STRVAR(SVertex_id_doc,
              "\n"
              ":type: :class:`Id`");
 
-static PyObject *SVertex_id_get(BPy_SVertex *self, void *UNUSED(closure))
+static PyObject *SVertex_id_get(BPy_SVertex *self, void * /*closure*/)
 {
   Id id(self->sv->getId());
   return BPy_Id_from_Id(id);  // return a copy
 }
 
-static int SVertex_id_set(BPy_SVertex *self, PyObject *value, void *UNUSED(closure))
+static int SVertex_id_set(BPy_SVertex *self, PyObject *value, void * /*closure*/)
 {
   if (!BPy_Id_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an Id");
@@ -332,7 +332,7 @@ PyDoc_STRVAR(SVertex_normals_doc,
              "\n"
              ":type: list of :class:`mathutils.Vector` objects");
 
-static PyObject *SVertex_normals_get(BPy_SVertex *self, void *UNUSED(closure))
+static PyObject *SVertex_normals_get(BPy_SVertex *self, void * /*closure*/)
 {
   PyObject *py_normals;
   set<Vec3r> normals = self->sv->normals();
@@ -352,7 +352,7 @@ PyDoc_STRVAR(SVertex_normals_size_doc,
              "\n"
              ":type: int");
 
-static PyObject *SVertex_normals_size_get(BPy_SVertex *self, void *UNUSED(closure))
+static PyObject *SVertex_normals_size_get(BPy_SVertex *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->sv->normalsSize());
 }
@@ -363,7 +363,7 @@ PyDoc_STRVAR(SVertex_viewvertex_doc,
              "\n"
              ":type: :class:`ViewVertex`");
 
-static PyObject *SVertex_viewvertex_get(BPy_SVertex *self, void *UNUSED(closure))
+static PyObject *SVertex_viewvertex_get(BPy_SVertex *self, void * /*closure*/)
 {
   ViewVertex *vv = self->sv->viewvertex();
   if (vv) {
@@ -385,7 +385,7 @@ PyDoc_STRVAR(SVertex_curvatures_doc,
              "\n"
              ":type: tuple");
 
-static PyObject *SVertex_curvatures_get(BPy_SVertex *self, void *UNUSED(closure))
+static PyObject *SVertex_curvatures_get(BPy_SVertex *self, void * /*closure*/)
 {
   const CurvatureInfo *info = self->sv->getCurvatureInfo();
   if (!info) {
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
index 4695d61af9c..7b9e7bd213a 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
@@ -118,7 +118,7 @@ PyDoc_STRVAR(ViewVertex_nature_doc,
              "\n"
              ":type: :class:`Nature`");
 
-static PyObject *ViewVertex_nature_get(BPy_ViewVertex *self, void *UNUSED(closure))
+static PyObject *ViewVertex_nature_get(BPy_ViewVertex *self, void * /*closure*/)
 {
   Nature::VertexNature nature = self->vv->getNature();
   if (PyErr_Occurred()) {
@@ -127,7 +127,7 @@ static PyObject *ViewVertex_nature_get(BPy_ViewVertex *self, void *UNUSED(closur
   return BPy_Nature_from_Nature(nature);  // return a copy
 }
 
-static int ViewVertex_nature_set(BPy_ViewVertex *self, PyObject *value, void *UNUSED(closure))
+static int ViewVertex_nature_set(BPy_ViewVertex *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/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
index 228be7f4f76..35eb95c6f23 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
@@ -220,14 +220,12 @@ PyDoc_STRVAR(StrokeVertex_attribute_doc,
              "\n"
              ":type: :class:`StrokeAttribute`");
 
-static PyObject *StrokeVertex_attribute_get(BPy_StrokeVertex *self, void *UNUSED(closure))
+static PyObject *StrokeVertex_attribute_get(BPy_StrokeVertex *self, void * /*closure*/)
 {
   return BPy_StrokeAttribute_from_StrokeAttribute(self->sv->attribute());
 }
 
-static int StrokeVertex_attribute_set(BPy_StrokeVertex *self,
-                                      PyObject *value,
-                                      void *UNUSED(closure))
+static int StrokeVertex_attribute_set(BPy_StrokeVertex *self, PyObject *value, void * /*closure*/)
 {
   if (!BPy_StrokeAttribute_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be a StrokeAttribute object");
@@ -242,15 +240,14 @@ PyDoc_STRVAR(StrokeVertex_curvilinear_abscissa_doc,
              "\n"
              ":type: float");
 
-static PyObject *StrokeVertex_curvilinear_abscissa_get(BPy_StrokeVertex *self,
-                                                       void *UNUSED(closure))
+static PyObject *StrokeVertex_curvilinear_abscissa_get(BPy_StrokeVertex *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv->curvilinearAbscissa());
 }
 
 static int StrokeVertex_curvilinear_abscissa_set(BPy_StrokeVertex *self,
                                                  PyObject *value,
-                                                 void *UNUSED(closure))
+                                                 void * /*closure*/)
 {
   float scalar;
   if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) {
@@ -267,12 +264,12 @@ PyDoc_STRVAR(StrokeVertex_point_doc,
              "\n"
              ":type: :class:`mathutils.Vector`");
 
-static PyObject *StrokeVertex_point_get(BPy_StrokeVertex *self, void *UNUSED(closure))
+static PyObject *StrokeVertex_point_get(BPy_StrokeVertex *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb((PyObject *)self, 2, StrokeVertex_mathutils_cb_index, 0);
 }
 
-static int StrokeVertex_point_set(BPy_StrokeVertex *self, PyObject *value, void *UNUSED(closure))
+static int StrokeVertex_point_set(BPy_StrokeVertex *self, PyObject *value, void * /*closure*/)
 {
   float v[2];
   if (mathutils_array_parse(v, 2, 2, value, "value must be a 2-dimensional vector") == -1) {
@@ -289,14 +286,14 @@ PyDoc_STRVAR(StrokeVertex_stroke_length_doc,
              "\n"
              ":type: float");
 
-static PyObject *StrokeVertex_stroke_length_get(BPy_StrokeVertex *self, void *UNUSED(closure))
+static PyObject *StrokeVertex_stroke_length_get(BPy_StrokeVertex *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv->strokeLength());
 }
 
 static int StrokeVertex_stroke_length_set(BPy_StrokeVertex *self,
                                           PyObject *value,
-                                          void *UNUSED(closure))
+                                          void * /*closure*/)
 {
   float scalar;
   if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) {
@@ -313,7 +310,7 @@ PyDoc_STRVAR(StrokeVertex_u_doc,
              "\n"
              ":type: float");
 
-static PyObject *StrokeVertex_u_get(BPy_StrokeVertex *self, void *UNUSED(closure))
+static PyObject *StrokeVertex_u_get(BPy_StrokeVertex *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv->u());
 }
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
index de9748d41c1..59fead5f70c 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
@@ -63,7 +63,7 @@ PyDoc_STRVAR(NonTVertex_svertex_doc,
              "\n"
              ":type: :class:`SVertex`");
 
-static PyObject *NonTVertex_svertex_get(BPy_NonTVertex *self, void *UNUSED(closure))
+static PyObject *NonTVertex_svertex_get(BPy_NonTVertex *self, void * /*closure*/)
 {
   SVertex *v = self->ntv->svertex();
   if (v) {
@@ -72,7 +72,7 @@ static PyObject *NonTVertex_svertex_get(BPy_NonTVertex *self, void *UNUSED(closu
   Py_RETURN_NONE;
 }
 
-static int NonTVertex_svertex_set(BPy_NonTVertex *self, PyObject *value, void *UNUSED(closure))
+static int NonTVertex_svertex_set(BPy_NonTVertex *self, PyObject *value, void * /*closure*/)
 {
   if (!BPy_SVertex_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an SVertex");
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
index 8dc76c1c448..ca4908cae7b 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
@@ -122,7 +122,7 @@ PyDoc_STRVAR(TVertex_front_svertex_doc,
              "\n"
              ":type: :class:`SVertex`");
 
-static PyObject *TVertex_front_svertex_get(BPy_TVertex *self, void *UNUSED(closure))
+static PyObject *TVertex_front_svertex_get(BPy_TVertex *self, void * /*closure*/)
 {
   SVertex *v = self->tv->frontSVertex();
   if (v) {
@@ -131,7 +131,7 @@ static PyObject *TVertex_front_svertex_get(BPy_TVertex *self, void *UNUSED(closu
   Py_RETURN_NONE;
 }
 
-static int TVertex_front_svertex_set(BPy_TVertex *self, PyObject *value, void *UNUSED(closure))
+static int TVertex_front_svertex_set(BPy_TVertex *self, PyObject *value, void * /*closure*/)
 {
   if (!BPy_SVertex_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an SVertex");
@@ -146,7 +146,7 @@ PyDoc_STRVAR(TVertex_back_svertex_doc,
              "\n"
              ":type: :class:`SVertex`");
 
-static PyObject *TVertex_back_svertex_get(BPy_TVertex *self, void *UNUSED(closure))
+static PyObject *TVertex_back_svertex_get(BPy_TVertex *self, void * /*closure*/)
 {
   SVertex *v = self->tv->backSVertex();
   if (v) {
@@ -155,7 +155,7 @@ static PyObject *TVertex_back_svertex_get(BPy_TVertex *self, void *UNUSED(closur
   Py_RETURN_NONE;
 }
 
-static int TVertex_back_svertex_set(BPy_TVertex *self, PyObject *value, void *UNUSED(closure))
+static int TVertex_back_svertex_set(BPy_TVertex *self, PyObject *value, void * /*closure*/)
 {
   if (!BPy_SVertex_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an SVertex");
@@ -170,13 +170,13 @@ PyDoc_STRVAR(TVertex_id_doc,
              "\n"
              ":type: :class:`Id`");
 
-static PyObject *TVertex_id_get(BPy_TVertex *self, void *UNUSED(closure))
+static PyObject *TVertex_id_get(BPy_TVertex *self, void * /*closure*/)
 {
   Id id(self->tv->getId());
   return BPy_Id_from_Id(id);  // return a copy
 }
 
-static int TVertex_id_set(BPy_TVertex *self, PyObject *value, void *UNUSED(closure))
+static int TVertex_id_set(BPy_TVertex *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_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;
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
index 80b5cd4ba3b..883eb3b0beb 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
@@ -124,7 +124,7 @@ PyDoc_STRVAR(AdjacencyIterator_object_doc,
              "\n"
              ":type: :class:`ViewEdge`");
 
-static PyObject *AdjacencyIterator_object_get(BPy_AdjacencyIterator *self, void *UNUSED(closure))
+static PyObject *AdjacencyIterator_object_get(BPy_AdjacencyIterator *self, void * /*closure*/)
 {
   if (self->a_it->isEnd()) {
     PyErr_SetString(PyExc_RuntimeError, "iteration has stopped");
@@ -143,8 +143,7 @@ PyDoc_STRVAR(AdjacencyIterator_is_incoming_doc,
              "\n"
              ":type: bool");
 
-static PyObject *AdjacencyIterator_is_incoming_get(BPy_AdjacencyIterator *self,
-                                                   void *UNUSED(closure))
+static PyObject *AdjacencyIterator_is_incoming_get(BPy_AdjacencyIterator *self, void * /*closure*/)
 {
   if (self->a_it->isEnd()) {
     PyErr_SetString(PyExc_RuntimeError, "iteration has stopped");
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
index b4b3fd2bf1f..c38a8a9314c 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
@@ -176,7 +176,7 @@ PyDoc_STRVAR(ChainingIterator_object_doc,
              "\n"
              ":type: :class:`ViewEdge`");
 
-static PyObject *ChainingIterator_object_get(BPy_ChainingIterator *self, void *UNUSED(closure))
+static PyObject *ChainingIterator_object_get(BPy_ChainingIterator *self, void * /*closure*/)
 {
   if (self->c_it->isEnd()) {
     PyErr_SetString(PyExc_RuntimeError, "iteration has stopped");
@@ -195,8 +195,7 @@ PyDoc_STRVAR(ChainingIterator_next_vertex_doc,
              "\n"
              ":type: :class:`ViewVertex`");
 
-static PyObject *ChainingIterator_next_vertex_get(BPy_ChainingIterator *self,
-                                                  void *UNUSED(closure))
+static PyObject *ChainingIterator_next_vertex_get(BPy_ChainingIterator *self, void * /*closure*/)
 {
   ViewVertex *v = self->c_it->getVertex();
   if (v) {
@@ -212,7 +211,7 @@ PyDoc_STRVAR(ChainingIterator_is_incrementing_doc,
              ":type: bool");
 
 static PyObject *ChainingIterator_is_incrementing_get(BPy_ChainingIterator *self,
-                                                      void *UNUSED(closure))
+                                                      void * /*closure*/)
 {
   return PyBool_from_bool(self->c_it->isIncrementing());
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
index e39439dc0b1..c5b7d0f96da 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
@@ -76,7 +76,7 @@ PyDoc_STRVAR(CurvePointIterator_object_doc,
              "\n"
              ":type: :class:`CurvePoint`");
 
-static PyObject *CurvePointIterator_object_get(BPy_CurvePointIterator *self, void *UNUSED(closure))
+static PyObject *CurvePointIterator_object_get(BPy_CurvePointIterator *self, void * /*closure*/)
 {
   if (self->cp_it->isEnd()) {
     PyErr_SetString(PyExc_RuntimeError, "iteration has stopped");
@@ -90,7 +90,7 @@ PyDoc_STRVAR(CurvePointIterator_t_doc,
              "\n"
              ":type: float");
 
-static PyObject *CurvePointIterator_t_get(BPy_CurvePointIterator *self, void *UNUSED(closure))
+static PyObject *CurvePointIterator_t_get(BPy_CurvePointIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->cp_it->t());
 }
@@ -100,7 +100,7 @@ PyDoc_STRVAR(CurvePointIterator_u_doc,
              "\n"
              ":type: float");
 
-static PyObject *CurvePointIterator_u_get(BPy_CurvePointIterator *self, void *UNUSED(closure))
+static PyObject *CurvePointIterator_u_get(BPy_CurvePointIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->cp_it->u());
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
index def217bb278..6e4b1832c72 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
@@ -133,8 +133,7 @@ PyDoc_STRVAR(Interface0DIterator_object_doc,
              "\n"
              ":type: :class:`Interface0D` or one of its subclasses.");
 
-static PyObject *Interface0DIterator_object_get(BPy_Interface0DIterator *self,
-                                                void *UNUSED(closure))
+static PyObject *Interface0DIterator_object_get(BPy_Interface0DIterator *self, void * /*closure*/)
 {
   if (self->if0D_it->isEnd()) {
     PyErr_SetString(PyExc_RuntimeError, "iteration has stopped");
@@ -148,7 +147,7 @@ PyDoc_STRVAR(Interface0DIterator_t_doc,
              "\n"
              ":type: float");
 
-static PyObject *Interface0DIterator_t_get(BPy_Interface0DIterator *self, void *UNUSED(closure))
+static PyObject *Interface0DIterator_t_get(BPy_Interface0DIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->if0D_it->t());
 }
@@ -158,7 +157,7 @@ PyDoc_STRVAR(Interface0DIterator_u_doc,
              "\n"
              ":type: float");
 
-static PyObject *Interface0DIterator_u_get(BPy_Interface0DIterator *self, void *UNUSED(closure))
+static PyObject *Interface0DIterator_u_get(BPy_Interface0DIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->if0D_it->u());
 }
@@ -169,8 +168,7 @@ PyDoc_STRVAR(Interface0DIterator_at_last_doc,
              "\n"
              ":type: bool");
 
-static PyObject *Interface0DIterator_at_last_get(BPy_Interface0DIterator *self,
-                                                 void *UNUSED(closure))
+static PyObject *Interface0DIterator_at_last_get(BPy_Interface0DIterator *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->if0D_it->atLast());
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
index 922f979b4cb..09b40dc01e3 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
@@ -99,7 +99,7 @@ PyDoc_STRVAR(SVertexIterator_object_doc,
              "\n"
              ":type: :class:`SVertex`");
 
-static PyObject *SVertexIterator_object_get(BPy_SVertexIterator *self, void *UNUSED(closure))
+static PyObject *SVertexIterator_object_get(BPy_SVertexIterator *self, void * /*closure*/)
 {
   if (self->sv_it->isEnd()) {
     PyErr_SetString(PyExc_RuntimeError, "iteration has stopped");
@@ -117,7 +117,7 @@ PyDoc_STRVAR(SVertexIterator_t_doc,
              "\n"
              ":type: float");
 
-static PyObject *SVertexIterator_t_get(BPy_SVertexIterator *self, void *UNUSED(closure))
+static PyObject *SVertexIterator_t_get(BPy_SVertexIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv_it->t());
 }
@@ -127,7 +127,7 @@ PyDoc_STRVAR(SVertexIterator_u_doc,
              "\n"
              ":type: float");
 
-static PyObject *SVertexIterator_u_get(BPy_SVertexIterator *self, void *UNUSED(closure))
+static PyObject *SVertexIterator_u_get(BPy_SVertexIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv_it->u());
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
index 2a9efcdded4..4cfaa51d794 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
@@ -206,7 +206,7 @@ PyDoc_STRVAR(StrokeVertexIterator_object_doc,
              ":type: :class:`StrokeVertex`");
 
 static PyObject *StrokeVertexIterator_object_get(BPy_StrokeVertexIterator *self,
-                                                 void *UNUSED(closure))
+                                                 void * /*closure*/)
 {
   if (self->sv_it->isEnd()) {
     PyErr_SetString(PyExc_RuntimeError, "iteration has stopped");
@@ -224,7 +224,7 @@ PyDoc_STRVAR(StrokeVertexIterator_t_doc,
              "\n"
              ":type: float");
 
-static PyObject *StrokeVertexIterator_t_get(BPy_StrokeVertexIterator *self, void *UNUSED(closure))
+static PyObject *StrokeVertexIterator_t_get(BPy_StrokeVertexIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv_it->t());
 }
@@ -234,7 +234,7 @@ PyDoc_STRVAR(StrokeVertexIterator_u_doc,
              "\n"
              ":type: float");
 
-static PyObject *StrokeVertexIterator_u_get(BPy_StrokeVertexIterator *self, void *UNUSED(closure))
+static PyObject *StrokeVertexIterator_u_get(BPy_StrokeVertexIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv_it->u());
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
index 634d4d6434b..937a7103c66 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
@@ -104,7 +104,7 @@ PyDoc_STRVAR(ViewEdgeIterator_object_doc,
              "\n"
              ":type: :class:`ViewEdge`");
 
-static PyObject *ViewEdgeIterator_object_get(BPy_ViewEdgeIterator *self, void *UNUSED(closure))
+static PyObject *ViewEdgeIterator_object_get(BPy_ViewEdgeIterator *self, void * /*closure*/)
 {
   if (!self->ve_it->isEnd()) {
     PyErr_SetString(PyExc_RuntimeError, "iteration has stopped");
@@ -122,8 +122,7 @@ PyDoc_STRVAR(ViewEdgeIterator_current_edge_doc,
              "\n"
              ":type: :class:`ViewEdge`");
 
-static PyObject *ViewEdgeIterator_current_edge_get(BPy_ViewEdgeIterator *self,
-                                                   void *UNUSED(closure))
+static PyObject *ViewEdgeIterator_current_edge_get(BPy_ViewEdgeIterator *self, void * /*closure*/)
 {
   ViewEdge *ve = self->ve_it->getCurrentEdge();
   if (ve) {
@@ -134,7 +133,7 @@ static PyObject *ViewEdgeIterator_current_edge_get(BPy_ViewEdgeIterator *self,
 
 static int ViewEdgeIterator_current_edge_set(BPy_ViewEdgeIterator *self,
                                              PyObject *value,
-                                             void *UNUSED(closure))
+                                             void * /*closure*/)
 {
   if (!BPy_ViewEdge_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be a ViewEdge");
@@ -153,15 +152,14 @@ PyDoc_STRVAR(ViewEdgeIterator_orientation_doc,
              "\n"
              ":type: bool");
 
-static PyObject *ViewEdgeIterator_orientation_get(BPy_ViewEdgeIterator *self,
-                                                  void *UNUSED(closure))
+static PyObject *ViewEdgeIterator_orientation_get(BPy_ViewEdgeIterator *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->ve_it->getOrientation());
 }
 
 static int ViewEdgeIterator_orientation_set(BPy_ViewEdgeIterator *self,
                                             PyObject *value,
-                                            void *UNUSED(closure))
+                                            void * /*closure*/)
 {
   if (!PyBool_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be a boolean");
@@ -176,7 +174,7 @@ PyDoc_STRVAR(ViewEdgeIterator_begin_doc,
              "\n"
              ":type: :class:`ViewEdge`");
 
-static PyObject *ViewEdgeIterator_begin_get(BPy_ViewEdgeIterator *self, void *UNUSED(closure))
+static PyObject *ViewEdgeIterator_begin_get(BPy_ViewEdgeIterator *self, void * /*closure*/)
 {
   ViewEdge *ve = self->ve_it->getBegin();
   if (ve) {
@@ -187,7 +185,7 @@ static PyObject *ViewEdgeIterator_begin_get(BPy_ViewEdgeIterator *self, void *UN
 
 static int ViewEdgeIterator_begin_set(BPy_ViewEdgeIterator *self,
                                       PyObject *value,
-                                      void *UNUSED(closure))
+                                      void * /*closure*/)
 {
   if (!BPy_ViewEdge_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be a ViewEdge");
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
index 504c43a8542..f503494b898 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
@@ -107,7 +107,7 @@ PyDoc_STRVAR(orientedViewEdgeIterator_object_doc,
              ":type: (:class:`ViewEdge`, bool)");
 
 static PyObject *orientedViewEdgeIterator_object_get(BPy_orientedViewEdgeIterator *self,
-                                                     void *UNUSED(closure))
+                                                     void * /*closure*/)
 {
   if (self->ove_it->isEnd()) {
     PyErr_SetString(PyExc_RuntimeError, "iteration has stopped");
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
index 4e4e4d31385..3fe84b3a76f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
@@ -223,14 +223,14 @@ PyDoc_STRVAR(integration_type_doc,
              "\n"
              ":type: :class:`IntegrationType`");
 
-static PyObject *integration_type_get(BPy_UnaryFunction1DDouble *self, void *UNUSED(closure))
+static PyObject *integration_type_get(BPy_UnaryFunction1DDouble *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_double->getIntegrationType());
 }
 
 static int integration_type_set(BPy_UnaryFunction1DDouble *self,
                                 PyObject *value,
-                                void *UNUSED(closure))
+                                void * /*closure*/)
 {
   if (!BPy_IntegrationType_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType");
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
index ce654de8bc0..33f534e9860 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
@@ -130,14 +130,14 @@ PyDoc_STRVAR(integration_type_doc,
              "\n"
              ":type: :class:`IntegrationType`");
 
-static PyObject *integration_type_get(BPy_UnaryFunction1DEdgeNature *self, void *UNUSED(closure))
+static PyObject *integration_type_get(BPy_UnaryFunction1DEdgeNature *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_edgenature->getIntegrationType());
 }
 
 static int integration_type_set(BPy_UnaryFunction1DEdgeNature *self,
                                 PyObject *value,
-                                void *UNUSED(closure))
+                                void * /*closure*/)
 {
   if (!BPy_IntegrationType_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType");
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
index 83958dbb3d7..c18bbff53c5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
@@ -119,14 +119,14 @@ PyDoc_STRVAR(integration_type_doc,
              "\n"
              ":type: :class:`IntegrationType`");
 
-static PyObject *integration_type_get(BPy_UnaryFunction1DFloat *self, void *UNUSED(closure))
+static PyObject *integration_type_get(BPy_UnaryFunction1DFloat *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_float->getIntegrationType());
 }
 
 static int integration_type_set(BPy_UnaryFunction1DFloat *self,
                                 PyObject *value,
-                                void *UNUSED(closure))
+                                void * /*closure*/)
 {
   if (!BPy_IntegrationType_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType");
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
index 8929e9e4024..41bc3199271 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
@@ -129,14 +129,14 @@ PyDoc_STRVAR(integration_type_doc,
              "\n"
              ":type: :class:`IntegrationType`");
 
-static PyObject *integration_type_get(BPy_UnaryFunction1DUnsigned *self, void *UNUSED(closure))
+static PyObject *integration_type_get(BPy_UnaryFunction1DUnsigned *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_unsigned->getIntegrationType());
 }
 
 static int integration_type_set(BPy_UnaryFunction1DUnsigned *self,
                                 PyObject *value,
-                                void *UNUSED(closure))
+                                void * /*closure*/)
 {
   if (!BPy_IntegrationType_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType");
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
index c7bd84b0d18..bc76a83515b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
@@ -134,14 +134,14 @@ PyDoc_STRVAR(integration_type_doc,
              "\n"
              ":type: :class:`IntegrationType`");
 
-static PyObject *integration_type_get(BPy_UnaryFunction1DVec2f *self, void *UNUSED(closure))
+static PyObject *integration_type_get(BPy_UnaryFunction1DVec2f *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_vec2f->getIntegrationType());
 }
 
 static int integration_type_set(BPy_UnaryFunction1DVec2f *self,
                                 PyObject *value,
-                                void *UNUSED(closure))
+                                void * /*closure*/)
 {
   if (!BPy_IntegrationType_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType");
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
index 1eced4cd9f1..7a5521f7571 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
@@ -127,14 +127,14 @@ PyDoc_STRVAR(integration_type_doc,
              "\n"
              ":type: :class:`IntegrationType`");
 
-static PyObject *integration_type_get(BPy_UnaryFunction1DVec3f *self, void *UNUSED(closure))
+static PyObject *integration_type_get(BPy_UnaryFunction1DVec3f *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_vec3f->getIntegrationType());
 }
 
 static int integration_type_set(BPy_UnaryFunction1DVec3f *self,
                                 PyObject *value,
-                                void *UNUSED(closure))
+                                void * /*closure*/)
 {
   if (!BPy_IntegrationType_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType");
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
index 44f12c9e307..242f4a141bc 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
@@ -153,8 +153,7 @@ PyDoc_STRVAR(integration_type_doc,
              "\n"
              ":type: :class:`IntegrationType`");
 
-static PyObject *integration_type_get(BPy_UnaryFunction1DVectorViewShape *self,
-                                      void *UNUSED(closure))
+static PyObject *integration_type_get(BPy_UnaryFunction1DVectorViewShape *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(
       self->uf1D_vectorviewshape->getIntegrationType());
@@ -162,7 +161,7 @@ static PyObject *integration_type_get(BPy_UnaryFunction1DVectorViewShape *self,
 
 static int integration_type_set(BPy_UnaryFunction1DVectorViewShape *self,
                                 PyObject *value,
-                                void *UNUSED(closure))
+                                void * /*closure*/)
 {
   if (!BPy_IntegrationType_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType");
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
index 84152b8141f..7f952f1c991 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
@@ -142,14 +142,12 @@ PyDoc_STRVAR(integration_type_doc,
              "\n"
              ":type: :class:`IntegrationType`");
 
-static PyObject *integration_type_get(BPy_UnaryFunction1DVoid *self, void *UNUSED(closure))
+static PyObject *integration_type_get(BPy_UnaryFunction1DVoid *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_void->getIntegrationType());
 }
 
-static int integration_type_set(BPy_UnaryFunction1DVoid *self,
-                                PyObject *value,
-                                void *UNUSED(closure))
+static int integration_type_set(BPy_UnaryFunction1DVoid *self, PyObject *value, void * /*closure*/)
 {
   if (!BPy_IntegrationType_Check(value)) {
     PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType");