ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

20 files changed, 632 insertions, 622 deletions

diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
index 5a20dd323f6..faf0c98641a 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
@@ -29,69 +29,68 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char ContourUP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`ContourUP1D`\n"
-"\n"
-".. method:: __call__(inter)\n"
-"\n"
-"   Returns true if the Interface1D is a contour.  An Interface1D is a\n"
-"   contour if it is borded by a different shape on each of its sides.\n"
-"\n"
-"   :arg inter: An Interface1D object.\n"
-"   :type inter: :class:`freestyle.types.Interface1D`\n"
-"   :return: True if the Interface1D is a contour, false otherwise.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`ContourUP1D`\n"
+    "\n"
+    ".. method:: __call__(inter)\n"
+    "\n"
+    "   Returns true if the Interface1D is a contour.  An Interface1D is a\n"
+    "   contour if it is borded by a different shape on each of its sides.\n"
+    "\n"
+    "   :arg inter: An Interface1D object.\n"
+    "   :type inter: :class:`freestyle.types.Interface1D`\n"
+    "   :return: True if the Interface1D is a contour, false otherwise.\n"
+    "   :rtype: bool\n";
 
 static int ContourUP1D___init__(BPy_ContourUP1D *self, PyObject *args, PyObject *kwds)
 {
-	static const char *kwlist[] = {NULL};
+  static const char *kwlist[] = {NULL};
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::ContourUP1D();
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
+    return -1;
+  self->py_up1D.up1D = new Predicates1D::ContourUP1D();
+  return 0;
 }
 
 /*-----------------------BPy_ContourUP1D type definition ------------------------------*/
 
 PyTypeObject ContourUP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"ContourUP1D",                  /* tp_name */
-	sizeof(BPy_ContourUP1D),        /* tp_basicsize */
-	0,                              /* tp_itemsize */
-	0,                              /* tp_dealloc */
-	0,                              /* tp_print */
-	0,                              /* tp_getattr */
-	0,                              /* tp_setattr */
-	0,                              /* tp_reserved */
-	0,                              /* tp_repr */
-	0,                              /* tp_as_number */
-	0,                              /* tp_as_sequence */
-	0,                              /* tp_as_mapping */
-	0,                              /* tp_hash  */
-	0,                              /* tp_call */
-	0,                              /* tp_str */
-	0,                              /* tp_getattro */
-	0,                              /* tp_setattro */
-	0,                              /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	ContourUP1D___doc__,            /* tp_doc */
-	0,                              /* tp_traverse */
-	0,                              /* tp_clear */
-	0,                              /* tp_richcompare */
-	0,                              /* tp_weaklistoffset */
-	0,                              /* tp_iter */
-	0,                              /* tp_iternext */
-	0,                              /* tp_methods */
-	0,                              /* tp_members */
-	0,                              /* tp_getset */
-	&UnaryPredicate1D_Type,         /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)ContourUP1D___init__,   /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "ContourUP1D", /* tp_name */
+    sizeof(BPy_ContourUP1D),                      /* tp_basicsize */
+    0,                                            /* tp_itemsize */
+    0,                                            /* tp_dealloc */
+    0,                                            /* tp_print */
+    0,                                            /* tp_getattr */
+    0,                                            /* tp_setattr */
+    0,                                            /* tp_reserved */
+    0,                                            /* tp_repr */
+    0,                                            /* tp_as_number */
+    0,                                            /* tp_as_sequence */
+    0,                                            /* tp_as_mapping */
+    0,                                            /* tp_hash  */
+    0,                                            /* tp_call */
+    0,                                            /* tp_str */
+    0,                                            /* tp_getattro */
+    0,                                            /* tp_setattro */
+    0,                                            /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,     /* tp_flags */
+    ContourUP1D___doc__,                          /* tp_doc */
+    0,                                            /* tp_traverse */
+    0,                                            /* tp_clear */
+    0,                                            /* tp_richcompare */
+    0,                                            /* tp_weaklistoffset */
+    0,                                            /* tp_iter */
+    0,                                            /* tp_iternext */
+    0,                                            /* tp_methods */
+    0,                                            /* tp_members */
+    0,                                            /* tp_getset */
+    &UnaryPredicate1D_Type,                       /* tp_base */
+    0,                                            /* tp_dict */
+    0,                                            /* tp_descr_get */
+    0,                                            /* tp_descr_set */
+    0,                                            /* tp_dictoffset */
+    (initproc)ContourUP1D___init__,               /* tp_init */
+    0,                                            /* tp_alloc */
+    0,                                            /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
index 32f9080173f..de6c40fa8ac 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
@@ -31,11 +31,12 @@ extern "C" {
 
 extern PyTypeObject ContourUP1D_Type;
 
-#define BPy_ContourUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ContourUP1D_Type))
+#define BPy_ContourUP1D_Check(v) \
+  (PyObject_IsInstance((PyObject *)v, (PyObject *)&ContourUP1D_Type))
 
 /*---------------------------Python BPy_ContourUP1D structure definition----------*/
 typedef struct {
-	BPy_UnaryPredicate1D py_up1D;
+  BPy_UnaryPredicate1D py_up1D;
 } BPy_ContourUP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
index 75df852ddfa..065329847b3 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
@@ -31,81 +31,82 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char DensityLowerThanUP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`DensityLowerThanUP1D`\n"
-"\n"
-".. method:: __init__(threshold, sigma=2.0)\n"
-"\n"
-"   Builds a DensityLowerThanUP1D object.\n"
-"\n"
-"   :arg threshold: The value of the threshold density.  Any Interface1D\n"
-"      having a density lower than this threshold will match.\n"
-"   :type threshold: float\n"
-"   :arg sigma: The sigma value defining the density evaluation window\n"
-"      size used in the :class:`freestyle.functions.DensityF0D` functor.\n"
-"   :type sigma: float\n"
-"\n"
-".. method:: __call__(inter)\n"
-"\n"
-"   Returns true if the density evaluated for the Interface1D is less\n"
-"   than a user-defined density value.\n"
-"\n"
-"   :arg inter: An Interface1D object.\n"
-"   :type inter: :class:`freestyle.types.Interface1D`\n"
-"   :return: True if the density is lower than a threshold.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`DensityLowerThanUP1D`\n"
+    "\n"
+    ".. method:: __init__(threshold, sigma=2.0)\n"
+    "\n"
+    "   Builds a DensityLowerThanUP1D object.\n"
+    "\n"
+    "   :arg threshold: The value of the threshold density.  Any Interface1D\n"
+    "      having a density lower than this threshold will match.\n"
+    "   :type threshold: float\n"
+    "   :arg sigma: The sigma value defining the density evaluation window\n"
+    "      size used in the :class:`freestyle.functions.DensityF0D` functor.\n"
+    "   :type sigma: float\n"
+    "\n"
+    ".. method:: __call__(inter)\n"
+    "\n"
+    "   Returns true if the density evaluated for the Interface1D is less\n"
+    "   than a user-defined density value.\n"
+    "\n"
+    "   :arg inter: An Interface1D object.\n"
+    "   :type inter: :class:`freestyle.types.Interface1D`\n"
+    "   :return: True if the density is lower than a threshold.\n"
+    "   :rtype: bool\n";
 
-static int DensityLowerThanUP1D___init__(BPy_DensityLowerThanUP1D *self, PyObject *args, PyObject *kwds)
+static int DensityLowerThanUP1D___init__(BPy_DensityLowerThanUP1D *self,
+                                         PyObject *args,
+                                         PyObject *kwds)
 {
-	static const char *kwlist[] = {"threshold", "sigma", NULL};
-	double d1, d2 = 2.0;
+  static const char *kwlist[] = {"threshold", "sigma", NULL};
+  double d1, d2 = 2.0;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "d|d", (char **)kwlist, &d1, &d2))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::DensityLowerThanUP1D(d1, d2);
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "d|d", (char **)kwlist, &d1, &d2))
+    return -1;
+  self->py_up1D.up1D = new Predicates1D::DensityLowerThanUP1D(d1, d2);
+  return 0;
 }
 
 /*-----------------------BPy_DensityLowerThanUP1D type definition ------------------------------*/
 
 PyTypeObject DensityLowerThanUP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"DensityLowerThanUP1D",         /* tp_name */
-	sizeof(BPy_DensityLowerThanUP1D), /* tp_basicsize */
-	0,                              /* tp_itemsize */
-	0,                              /* tp_dealloc */
-	0,                              /* tp_print */
-	0,                              /* tp_getattr */
-	0,                              /* tp_setattr */
-	0,                              /* tp_reserved */
-	0,                              /* tp_repr */
-	0,                              /* tp_as_number */
-	0,                              /* tp_as_sequence */
-	0,                              /* tp_as_mapping */
-	0,                              /* tp_hash  */
-	0,                              /* tp_call */
-	0,                              /* tp_str */
-	0,                              /* tp_getattro */
-	0,                              /* tp_setattro */
-	0,                              /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	DensityLowerThanUP1D___doc__,   /* tp_doc */
-	0,                              /* tp_traverse */
-	0,                              /* tp_clear */
-	0,                              /* tp_richcompare */
-	0,                              /* tp_weaklistoffset */
-	0,                              /* tp_iter */
-	0,                              /* tp_iternext */
-	0,                              /* tp_methods */
-	0,                              /* tp_members */
-	0,                              /* tp_getset */
-	&UnaryPredicate1D_Type,         /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)DensityLowerThanUP1D___init__, /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "DensityLowerThanUP1D", /* tp_name */
+    sizeof(BPy_DensityLowerThanUP1D),                      /* tp_basicsize */
+    0,                                                     /* tp_itemsize */
+    0,                                                     /* tp_dealloc */
+    0,                                                     /* tp_print */
+    0,                                                     /* tp_getattr */
+    0,                                                     /* tp_setattr */
+    0,                                                     /* tp_reserved */
+    0,                                                     /* tp_repr */
+    0,                                                     /* tp_as_number */
+    0,                                                     /* tp_as_sequence */
+    0,                                                     /* tp_as_mapping */
+    0,                                                     /* tp_hash  */
+    0,                                                     /* tp_call */
+    0,                                                     /* tp_str */
+    0,                                                     /* tp_getattro */
+    0,                                                     /* tp_setattro */
+    0,                                                     /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,              /* tp_flags */
+    DensityLowerThanUP1D___doc__,                          /* tp_doc */
+    0,                                                     /* tp_traverse */
+    0,                                                     /* tp_clear */
+    0,                                                     /* tp_richcompare */
+    0,                                                     /* tp_weaklistoffset */
+    0,                                                     /* tp_iter */
+    0,                                                     /* tp_iternext */
+    0,                                                     /* tp_methods */
+    0,                                                     /* tp_members */
+    0,                                                     /* tp_getset */
+    &UnaryPredicate1D_Type,                                /* tp_base */
+    0,                                                     /* tp_dict */
+    0,                                                     /* tp_descr_get */
+    0,                                                     /* tp_descr_set */
+    0,                                                     /* tp_dictoffset */
+    (initproc)DensityLowerThanUP1D___init__,               /* tp_init */
+    0,                                                     /* tp_alloc */
+    0,                                                     /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
index e8ea1daca19..fb02b63fa3d 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
@@ -31,11 +31,12 @@ extern "C" {
 
 extern PyTypeObject DensityLowerThanUP1D_Type;
 
-#define BPy_DensityLowerThanUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&DensityLowerThanUP1D_Type))
+#define BPy_DensityLowerThanUP1D_Check(v) \
+  (PyObject_IsInstance((PyObject *)v, (PyObject *)&DensityLowerThanUP1D_Type))
 
 /*---------------------------Python BPy_DensityLowerThanUP1D structure definition----------*/
 typedef struct {
-	BPy_UnaryPredicate1D py_up1D;
+  BPy_UnaryPredicate1D py_up1D;
 } BPy_DensityLowerThanUP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
index ea885e74174..f3b6a71585f 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
@@ -29,77 +29,79 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char EqualToChainingTimeStampUP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`freestyle.types.EqualToChainingTimeStampUP1D`\n"
-"\n"
-".. method:: __init__(ts)\n"
-"\n"
-"   Builds a EqualToChainingTimeStampUP1D object.\n"
-"\n"
-"   :arg ts: A time stamp value.\n"
-"   :type ts: int\n"
-"\n"
-".. method:: __call__(inter)\n"
-"\n"
-"   Returns true if the Interface1D's time stamp is equal to a certain\n"
-"   user-defined value.\n"
-"\n"
-"   :arg inter: An Interface1D object.\n"
-"   :type inter: :class:`freestyle.types.Interface1D`\n"
-"   :return: True if the time stamp is equal to a user-defined value.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > "
+    ":class:`freestyle.types.EqualToChainingTimeStampUP1D`\n"
+    "\n"
+    ".. method:: __init__(ts)\n"
+    "\n"
+    "   Builds a EqualToChainingTimeStampUP1D object.\n"
+    "\n"
+    "   :arg ts: A time stamp value.\n"
+    "   :type ts: int\n"
+    "\n"
+    ".. method:: __call__(inter)\n"
+    "\n"
+    "   Returns true if the Interface1D's time stamp is equal to a certain\n"
+    "   user-defined value.\n"
+    "\n"
+    "   :arg inter: An Interface1D object.\n"
+    "   :type inter: :class:`freestyle.types.Interface1D`\n"
+    "   :return: True if the time stamp is equal to a user-defined value.\n"
+    "   :rtype: bool\n";
 
-static int EqualToChainingTimeStampUP1D___init__(BPy_EqualToChainingTimeStampUP1D *self, PyObject *args, PyObject *kwds)
+static int EqualToChainingTimeStampUP1D___init__(BPy_EqualToChainingTimeStampUP1D *self,
+                                                 PyObject *args,
+                                                 PyObject *kwds)
 {
-	static const char *kwlist[] = {"ts", NULL};
-	unsigned u;
+  static const char *kwlist[] = {"ts", NULL};
+  unsigned u;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "I", (char **)kwlist, &u))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::EqualToChainingTimeStampUP1D(u);
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "I", (char **)kwlist, &u))
+    return -1;
+  self->py_up1D.up1D = new Predicates1D::EqualToChainingTimeStampUP1D(u);
+  return 0;
 }
 
 /*-----------------------BPy_EqualToChainingTimeStampUP1D type definition ------------------------------*/
 
 PyTypeObject EqualToChainingTimeStampUP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"EqualToChainingTimeStampUP1D", /* tp_name */
-	sizeof(BPy_EqualToChainingTimeStampUP1D), /* tp_basicsize */
-	0,                              /* tp_itemsize */
-	0,                              /* tp_dealloc */
-	0,                              /* tp_print */
-	0,                              /* tp_getattr */
-	0,                              /* tp_setattr */
-	0,                              /* tp_reserved */
-	0,                              /* tp_repr */
-	0,                              /* tp_as_number */
-	0,                              /* tp_as_sequence */
-	0,                              /* tp_as_mapping */
-	0,                              /* tp_hash  */
-	0,                              /* tp_call */
-	0,                              /* tp_str */
-	0,                              /* tp_getattro */
-	0,                              /* tp_setattro */
-	0,                              /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	EqualToChainingTimeStampUP1D___doc__, /* tp_doc */
-	0,                              /* tp_traverse */
-	0,                              /* tp_clear */
-	0,                              /* tp_richcompare */
-	0,                              /* tp_weaklistoffset */
-	0,                              /* tp_iter */
-	0,                              /* tp_iternext */
-	0,                              /* tp_methods */
-	0,                              /* tp_members */
-	0,                              /* tp_getset */
-	&UnaryPredicate1D_Type,         /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)EqualToChainingTimeStampUP1D___init__, /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "EqualToChainingTimeStampUP1D", /* tp_name */
+    sizeof(BPy_EqualToChainingTimeStampUP1D),                      /* tp_basicsize */
+    0,                                                             /* tp_itemsize */
+    0,                                                             /* tp_dealloc */
+    0,                                                             /* tp_print */
+    0,                                                             /* tp_getattr */
+    0,                                                             /* tp_setattr */
+    0,                                                             /* tp_reserved */
+    0,                                                             /* tp_repr */
+    0,                                                             /* tp_as_number */
+    0,                                                             /* tp_as_sequence */
+    0,                                                             /* tp_as_mapping */
+    0,                                                             /* tp_hash  */
+    0,                                                             /* tp_call */
+    0,                                                             /* tp_str */
+    0,                                                             /* tp_getattro */
+    0,                                                             /* tp_setattro */
+    0,                                                             /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,                      /* tp_flags */
+    EqualToChainingTimeStampUP1D___doc__,                          /* tp_doc */
+    0,                                                             /* tp_traverse */
+    0,                                                             /* tp_clear */
+    0,                                                             /* tp_richcompare */
+    0,                                                             /* tp_weaklistoffset */
+    0,                                                             /* tp_iter */
+    0,                                                             /* tp_iternext */
+    0,                                                             /* tp_methods */
+    0,                                                             /* tp_members */
+    0,                                                             /* tp_getset */
+    &UnaryPredicate1D_Type,                                        /* tp_base */
+    0,                                                             /* tp_dict */
+    0,                                                             /* tp_descr_get */
+    0,                                                             /* tp_descr_set */
+    0,                                                             /* tp_dictoffset */
+    (initproc)EqualToChainingTimeStampUP1D___init__,               /* tp_init */
+    0,                                                             /* tp_alloc */
+    0,                                                             /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
index a542c53a88b..eab08c6588d 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
@@ -32,11 +32,11 @@ extern "C" {
 extern PyTypeObject EqualToChainingTimeStampUP1D_Type;
 
 #define BPy_EqualToChainingTimeStampUP1D_Check(v) \
-            (PyObject_IsInstance((PyObject *)v, (PyObject *)&EqualToChainingTimeStampUP1D_Type))
+  (PyObject_IsInstance((PyObject *)v, (PyObject *)&EqualToChainingTimeStampUP1D_Type))
 
 /*---------------------------Python BPy_EqualToChainingTimeStampUP1D structure definition----------*/
 typedef struct {
-	BPy_UnaryPredicate1D py_up1D;
+  BPy_UnaryPredicate1D py_up1D;
 } BPy_EqualToChainingTimeStampUP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
index 280e7088628..30b8e3fce95 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
@@ -29,77 +29,78 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char EqualToTimeStampUP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`EqualToTimeStampUP1D`\n"
-"\n"
-".. method:: __init__(ts)\n"
-"\n"
-"   Builds a EqualToTimeStampUP1D object.\n"
-"\n"
-"   :arg ts: A time stamp value.\n"
-"   :type ts: int\n"
-"\n"
-".. method:: __call__(inter)\n"
-"\n"
-"   Returns true if the Interface1D's time stamp is equal to a certain\n"
-"   user-defined value.\n"
-"\n"
-"   :arg inter: An Interface1D object.\n"
-"   :type inter: :class:`freestyle.types.Interface1D`\n"
-"   :return: True if the time stamp is equal to a user-defined value.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`EqualToTimeStampUP1D`\n"
+    "\n"
+    ".. method:: __init__(ts)\n"
+    "\n"
+    "   Builds a EqualToTimeStampUP1D object.\n"
+    "\n"
+    "   :arg ts: A time stamp value.\n"
+    "   :type ts: int\n"
+    "\n"
+    ".. method:: __call__(inter)\n"
+    "\n"
+    "   Returns true if the Interface1D's time stamp is equal to a certain\n"
+    "   user-defined value.\n"
+    "\n"
+    "   :arg inter: An Interface1D object.\n"
+    "   :type inter: :class:`freestyle.types.Interface1D`\n"
+    "   :return: True if the time stamp is equal to a user-defined value.\n"
+    "   :rtype: bool\n";
 
-static int EqualToTimeStampUP1D___init__(BPy_EqualToTimeStampUP1D *self, PyObject *args, PyObject *kwds)
+static int EqualToTimeStampUP1D___init__(BPy_EqualToTimeStampUP1D *self,
+                                         PyObject *args,
+                                         PyObject *kwds)
 {
-	static const char *kwlist[] = {"ts", NULL};
-	unsigned u;
+  static const char *kwlist[] = {"ts", NULL};
+  unsigned u;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "I", (char **)kwlist, &u))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::EqualToTimeStampUP1D(u);
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "I", (char **)kwlist, &u))
+    return -1;
+  self->py_up1D.up1D = new Predicates1D::EqualToTimeStampUP1D(u);
+  return 0;
 }
 
 /*-----------------------BPy_EqualToTimeStampUP1D type definition ------------------------------*/
 
 PyTypeObject EqualToTimeStampUP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"EqualToTimeStampUP1D",         /* tp_name */
-	sizeof(BPy_EqualToTimeStampUP1D), /* tp_basicsize */
-	0,                              /* tp_itemsize */
-	0,                              /* tp_dealloc */
-	0,                              /* tp_print */
-	0,                              /* tp_getattr */
-	0,                              /* tp_setattr */
-	0,                              /* tp_reserved */
-	0,                              /* tp_repr */
-	0,                              /* tp_as_number */
-	0,                              /* tp_as_sequence */
-	0,                              /* tp_as_mapping */
-	0,                              /* tp_hash  */
-	0,                              /* tp_call */
-	0,                              /* tp_str */
-	0,                              /* tp_getattro */
-	0,                              /* tp_setattro */
-	0,                              /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	EqualToTimeStampUP1D___doc__,   /* tp_doc */
-	0,                              /* tp_traverse */
-	0,                              /* tp_clear */
-	0,                              /* tp_richcompare */
-	0,                              /* tp_weaklistoffset */
-	0,                              /* tp_iter */
-	0,                              /* tp_iternext */
-	0,                              /* tp_methods */
-	0,                              /* tp_members */
-	0,                              /* tp_getset */
-	&UnaryPredicate1D_Type,         /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)EqualToTimeStampUP1D___init__, /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "EqualToTimeStampUP1D", /* tp_name */
+    sizeof(BPy_EqualToTimeStampUP1D),                      /* tp_basicsize */
+    0,                                                     /* tp_itemsize */
+    0,                                                     /* tp_dealloc */
+    0,                                                     /* tp_print */
+    0,                                                     /* tp_getattr */
+    0,                                                     /* tp_setattr */
+    0,                                                     /* tp_reserved */
+    0,                                                     /* tp_repr */
+    0,                                                     /* tp_as_number */
+    0,                                                     /* tp_as_sequence */
+    0,                                                     /* tp_as_mapping */
+    0,                                                     /* tp_hash  */
+    0,                                                     /* tp_call */
+    0,                                                     /* tp_str */
+    0,                                                     /* tp_getattro */
+    0,                                                     /* tp_setattro */
+    0,                                                     /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,              /* tp_flags */
+    EqualToTimeStampUP1D___doc__,                          /* tp_doc */
+    0,                                                     /* tp_traverse */
+    0,                                                     /* tp_clear */
+    0,                                                     /* tp_richcompare */
+    0,                                                     /* tp_weaklistoffset */
+    0,                                                     /* tp_iter */
+    0,                                                     /* tp_iternext */
+    0,                                                     /* tp_methods */
+    0,                                                     /* tp_members */
+    0,                                                     /* tp_getset */
+    &UnaryPredicate1D_Type,                                /* tp_base */
+    0,                                                     /* tp_dict */
+    0,                                                     /* tp_descr_get */
+    0,                                                     /* tp_descr_set */
+    0,                                                     /* tp_dictoffset */
+    (initproc)EqualToTimeStampUP1D___init__,               /* tp_init */
+    0,                                                     /* tp_alloc */
+    0,                                                     /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
index b27509e7205..13736242382 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
@@ -31,11 +31,12 @@ extern "C" {
 
 extern PyTypeObject EqualToTimeStampUP1D_Type;
 
-#define BPy_EqualToTimeStampUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&EqualToTimeStampUP1D_Type))
+#define BPy_EqualToTimeStampUP1D_Check(v) \
+  (PyObject_IsInstance((PyObject *)v, (PyObject *)&EqualToTimeStampUP1D_Type))
 
 /*---------------------------Python BPy_EqualToTimeStampUP1D structure definition----------*/
 typedef struct {
-	BPy_UnaryPredicate1D py_up1D;
+  BPy_UnaryPredicate1D py_up1D;
 } BPy_EqualToTimeStampUP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
index 3b00ab2dba8..8bd31209291 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
@@ -29,71 +29,72 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char ExternalContourUP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`ExternalContourUP1D`\n"
-"\n"
-".. method:: __call__(inter)\n"
-"\n"
-"   Returns true if the Interface1D is an external contour.  An\n"
-"   Interface1D is an external contour if it is borded by no shape on\n"
-"   one of its sides.\n"
-"\n"
-"   :arg inter: An Interface1D object.\n"
-"   :type inter: :class:`freestyle.types.Interface1D`\n"
-"   :return: True if the Interface1D is an external contour, false\n"
-"      otherwise.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`ExternalContourUP1D`\n"
+    "\n"
+    ".. method:: __call__(inter)\n"
+    "\n"
+    "   Returns true if the Interface1D is an external contour.  An\n"
+    "   Interface1D is an external contour if it is borded by no shape on\n"
+    "   one of its sides.\n"
+    "\n"
+    "   :arg inter: An Interface1D object.\n"
+    "   :type inter: :class:`freestyle.types.Interface1D`\n"
+    "   :return: True if the Interface1D is an external contour, false\n"
+    "      otherwise.\n"
+    "   :rtype: bool\n";
 
-static int ExternalContourUP1D___init__(BPy_ExternalContourUP1D *self, PyObject *args, PyObject *kwds)
+static int ExternalContourUP1D___init__(BPy_ExternalContourUP1D *self,
+                                        PyObject *args,
+                                        PyObject *kwds)
 {
-	static const char *kwlist[] = {NULL};
+  static const char *kwlist[] = {NULL};
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::ExternalContourUP1D();
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
+    return -1;
+  self->py_up1D.up1D = new Predicates1D::ExternalContourUP1D();
+  return 0;
 }
 
 /*-----------------------BPy_ExternalContourUP1D type definition ------------------------------*/
 
 PyTypeObject ExternalContourUP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"ExternalContourUP1D",          /* tp_name */
-	sizeof(BPy_ExternalContourUP1D), /* tp_basicsize */
-	0,                              /* tp_itemsize */
-	0,                              /* tp_dealloc */
-	0,                              /* tp_print */
-	0,                              /* tp_getattr */
-	0,                              /* tp_setattr */
-	0,                              /* tp_reserved */
-	0,                              /* tp_repr */
-	0,                              /* tp_as_number */
-	0,                              /* tp_as_sequence */
-	0,                              /* tp_as_mapping */
-	0,                              /* tp_hash  */
-	0,                              /* tp_call */
-	0,                              /* tp_str */
-	0,                              /* tp_getattro */
-	0,                              /* tp_setattro */
-	0,                              /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	ExternalContourUP1D___doc__,    /* tp_doc */
-	0,                              /* tp_traverse */
-	0,                              /* tp_clear */
-	0,                              /* tp_richcompare */
-	0,                              /* tp_weaklistoffset */
-	0,                              /* tp_iter */
-	0,                              /* tp_iternext */
-	0,                              /* tp_methods */
-	0,                              /* tp_members */
-	0,                              /* tp_getset */
-	&UnaryPredicate1D_Type,         /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)ExternalContourUP1D___init__, /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "ExternalContourUP1D", /* tp_name */
+    sizeof(BPy_ExternalContourUP1D),                      /* tp_basicsize */
+    0,                                                    /* tp_itemsize */
+    0,                                                    /* tp_dealloc */
+    0,                                                    /* tp_print */
+    0,                                                    /* tp_getattr */
+    0,                                                    /* tp_setattr */
+    0,                                                    /* tp_reserved */
+    0,                                                    /* tp_repr */
+    0,                                                    /* tp_as_number */
+    0,                                                    /* tp_as_sequence */
+    0,                                                    /* tp_as_mapping */
+    0,                                                    /* tp_hash  */
+    0,                                                    /* tp_call */
+    0,                                                    /* tp_str */
+    0,                                                    /* tp_getattro */
+    0,                                                    /* tp_setattro */
+    0,                                                    /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,             /* tp_flags */
+    ExternalContourUP1D___doc__,                          /* tp_doc */
+    0,                                                    /* tp_traverse */
+    0,                                                    /* tp_clear */
+    0,                                                    /* tp_richcompare */
+    0,                                                    /* tp_weaklistoffset */
+    0,                                                    /* tp_iter */
+    0,                                                    /* tp_iternext */
+    0,                                                    /* tp_methods */
+    0,                                                    /* tp_members */
+    0,                                                    /* tp_getset */
+    &UnaryPredicate1D_Type,                               /* tp_base */
+    0,                                                    /* tp_dict */
+    0,                                                    /* tp_descr_get */
+    0,                                                    /* tp_descr_set */
+    0,                                                    /* tp_dictoffset */
+    (initproc)ExternalContourUP1D___init__,               /* tp_init */
+    0,                                                    /* tp_alloc */
+    0,                                                    /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
index 91140eb9670..4d2a22731fa 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
@@ -31,11 +31,12 @@ extern "C" {
 
 extern PyTypeObject ExternalContourUP1D_Type;
 
-#define BPy_ExternalContourUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ExternalContourUP1D_Type))
+#define BPy_ExternalContourUP1D_Check(v) \
+  (PyObject_IsInstance((PyObject *)v, (PyObject *)&ExternalContourUP1D_Type))
 
 /*---------------------------Python BPy_ExternalContourUP1D structure definition----------*/
 typedef struct {
-	BPy_UnaryPredicate1D py_up1D;
+  BPy_UnaryPredicate1D py_up1D;
 } BPy_ExternalContourUP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
index a3a0d8c544c..b4db7e65090 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
@@ -29,68 +29,67 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char FalseUP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`FalseUP1D`\n"
-"\n"
-".. method:: __call__(inter)\n"
-"\n"
-"   Always returns false.\n"
-"\n"
-"   :arg inter: An Interface1D object.\n"
-"   :type inter: :class:`freestyle.types.Interface1D`\n"
-"   :return: False.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`FalseUP1D`\n"
+    "\n"
+    ".. method:: __call__(inter)\n"
+    "\n"
+    "   Always returns false.\n"
+    "\n"
+    "   :arg inter: An Interface1D object.\n"
+    "   :type inter: :class:`freestyle.types.Interface1D`\n"
+    "   :return: False.\n"
+    "   :rtype: bool\n";
 
 static int FalseUP1D___init__(BPy_FalseUP1D *self, PyObject *args, PyObject *kwds)
 {
-	static const char *kwlist[] = {NULL};
+  static const char *kwlist[] = {NULL};
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::FalseUP1D();
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
+    return -1;
+  self->py_up1D.up1D = new Predicates1D::FalseUP1D();
+  return 0;
 }
 
 /*-----------------------BPy_FalseUP1D type definition ------------------------------*/
 
 PyTypeObject FalseUP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"FalseUP1D",                    /* tp_name */
-	sizeof(BPy_FalseUP1D),          /* tp_basicsize */
-	0,                              /* tp_itemsize */
-	0,                              /* tp_dealloc */
-	0,                              /* tp_print */
-	0,                              /* tp_getattr */
-	0,                              /* tp_setattr */
-	0,                              /* tp_reserved */
-	0,                              /* tp_repr */
-	0,                              /* tp_as_number */
-	0,                              /* tp_as_sequence */
-	0,                              /* tp_as_mapping */
-	0,                              /* tp_hash  */
-	0,                              /* tp_call */
-	0,                              /* tp_str */
-	0,                              /* tp_getattro */
-	0,                              /* tp_setattro */
-	0,                              /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	FalseUP1D___doc__,              /* tp_doc */
-	0,                              /* tp_traverse */
-	0,                              /* tp_clear */
-	0,                              /* tp_richcompare */
-	0,                              /* tp_weaklistoffset */
-	0,                              /* tp_iter */
-	0,                              /* tp_iternext */
-	0,                              /* tp_methods */
-	0,                              /* tp_members */
-	0,                              /* tp_getset */
-	&UnaryPredicate1D_Type,         /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)FalseUP1D___init__,   /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "FalseUP1D", /* tp_name */
+    sizeof(BPy_FalseUP1D),                      /* tp_basicsize */
+    0,                                          /* tp_itemsize */
+    0,                                          /* tp_dealloc */
+    0,                                          /* tp_print */
+    0,                                          /* tp_getattr */
+    0,                                          /* tp_setattr */
+    0,                                          /* tp_reserved */
+    0,                                          /* tp_repr */
+    0,                                          /* tp_as_number */
+    0,                                          /* tp_as_sequence */
+    0,                                          /* tp_as_mapping */
+    0,                                          /* tp_hash  */
+    0,                                          /* tp_call */
+    0,                                          /* tp_str */
+    0,                                          /* tp_getattro */
+    0,                                          /* tp_setattro */
+    0,                                          /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,   /* tp_flags */
+    FalseUP1D___doc__,                          /* tp_doc */
+    0,                                          /* tp_traverse */
+    0,                                          /* tp_clear */
+    0,                                          /* tp_richcompare */
+    0,                                          /* tp_weaklistoffset */
+    0,                                          /* tp_iter */
+    0,                                          /* tp_iternext */
+    0,                                          /* tp_methods */
+    0,                                          /* tp_members */
+    0,                                          /* tp_getset */
+    &UnaryPredicate1D_Type,                     /* tp_base */
+    0,                                          /* tp_dict */
+    0,                                          /* tp_descr_get */
+    0,                                          /* tp_descr_set */
+    0,                                          /* tp_dictoffset */
+    (initproc)FalseUP1D___init__,               /* tp_init */
+    0,                                          /* tp_alloc */
+    0,                                          /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
index d138f9d7f9f..57255c2333f 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
@@ -35,7 +35,7 @@ extern PyTypeObject FalseUP1D_Type;
 
 /*---------------------------Python BPy_FalseUP1D structure definition----------*/
 typedef struct {
-	BPy_UnaryPredicate1D py_up1D;
+  BPy_UnaryPredicate1D py_up1D;
 } BPy_FalseUP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
index eb4968484fc..885ecb16695 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
@@ -29,81 +29,83 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char QuantitativeInvisibilityUP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`QuantitativeInvisibilityUP1D`\n"
-"\n"
-".. method:: __init__(qi=0)\n"
-"\n"
-"   Builds a QuantitativeInvisibilityUP1D object.\n"
-"\n"
-"   :arg qi: The Quantitative Invisibility you want the Interface1D to\n"
-"      have.\n"
-"   :type qi: int\n"
-"\n"
-".. method:: __call__(inter)\n"
-"\n"
-"   Returns true if the Quantitative Invisibility evaluated at an\n"
-"   Interface1D, using the\n"
-"   :class:`freestyle.functions.QuantitativeInvisibilityF1D` functor,\n"
-"   equals a certain user-defined value.\n"
-"\n"
-"   :arg inter: An Interface1D object.\n"
-"   :type inter: :class:`freestyle.types.Interface1D`\n"
-"   :return: True if Quantitative Invisibility equals a user-defined\n"
-"      value.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > "
+    ":class:`QuantitativeInvisibilityUP1D`\n"
+    "\n"
+    ".. method:: __init__(qi=0)\n"
+    "\n"
+    "   Builds a QuantitativeInvisibilityUP1D object.\n"
+    "\n"
+    "   :arg qi: The Quantitative Invisibility you want the Interface1D to\n"
+    "      have.\n"
+    "   :type qi: int\n"
+    "\n"
+    ".. method:: __call__(inter)\n"
+    "\n"
+    "   Returns true if the Quantitative Invisibility evaluated at an\n"
+    "   Interface1D, using the\n"
+    "   :class:`freestyle.functions.QuantitativeInvisibilityF1D` functor,\n"
+    "   equals a certain user-defined value.\n"
+    "\n"
+    "   :arg inter: An Interface1D object.\n"
+    "   :type inter: :class:`freestyle.types.Interface1D`\n"
+    "   :return: True if Quantitative Invisibility equals a user-defined\n"
+    "      value.\n"
+    "   :rtype: bool\n";
 
-static int QuantitativeInvisibilityUP1D___init__(BPy_QuantitativeInvisibilityUP1D *self, PyObject *args, PyObject *kwds)
+static int QuantitativeInvisibilityUP1D___init__(BPy_QuantitativeInvisibilityUP1D *self,
+                                                 PyObject *args,
+                                                 PyObject *kwds)
 {
-	static const char *kwlist[] = {"qi", NULL};
-	int i = 0;
+  static const char *kwlist[] = {"qi", NULL};
+  int i = 0;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "|i", (char **)kwlist, &i))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::QuantitativeInvisibilityUP1D(i);
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "|i", (char **)kwlist, &i))
+    return -1;
+  self->py_up1D.up1D = new Predicates1D::QuantitativeInvisibilityUP1D(i);
+  return 0;
 }
 
 /*-----------------------BPy_QuantitativeInvisibilityUP1D type definition ------------------------------*/
 
 PyTypeObject QuantitativeInvisibilityUP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"QuantitativeInvisibilityUP1D", /* tp_name */
-	sizeof(BPy_QuantitativeInvisibilityUP1D), /* tp_basicsize */
-	0,                              /* tp_itemsize */
-	0,                              /* tp_dealloc */
-	0,                              /* tp_print */
-	0,                              /* tp_getattr */
-	0,                              /* tp_setattr */
-	0,                              /* tp_reserved */
-	0,                              /* tp_repr */
-	0,                              /* tp_as_number */
-	0,                              /* tp_as_sequence */
-	0,                              /* tp_as_mapping */
-	0,                              /* tp_hash  */
-	0,                              /* tp_call */
-	0,                              /* tp_str */
-	0,                              /* tp_getattro */
-	0,                              /* tp_setattro */
-	0,                              /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	QuantitativeInvisibilityUP1D___doc__, /* tp_doc */
-	0,                              /* tp_traverse */
-	0,                              /* tp_clear */
-	0,                              /* tp_richcompare */
-	0,                              /* tp_weaklistoffset */
-	0,                              /* tp_iter */
-	0,                              /* tp_iternext */
-	0,                              /* tp_methods */
-	0,                              /* tp_members */
-	0,                              /* tp_getset */
-	&UnaryPredicate1D_Type,         /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)QuantitativeInvisibilityUP1D___init__, /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "QuantitativeInvisibilityUP1D", /* tp_name */
+    sizeof(BPy_QuantitativeInvisibilityUP1D),                      /* tp_basicsize */
+    0,                                                             /* tp_itemsize */
+    0,                                                             /* tp_dealloc */
+    0,                                                             /* tp_print */
+    0,                                                             /* tp_getattr */
+    0,                                                             /* tp_setattr */
+    0,                                                             /* tp_reserved */
+    0,                                                             /* tp_repr */
+    0,                                                             /* tp_as_number */
+    0,                                                             /* tp_as_sequence */
+    0,                                                             /* tp_as_mapping */
+    0,                                                             /* tp_hash  */
+    0,                                                             /* tp_call */
+    0,                                                             /* tp_str */
+    0,                                                             /* tp_getattro */
+    0,                                                             /* tp_setattro */
+    0,                                                             /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,                      /* tp_flags */
+    QuantitativeInvisibilityUP1D___doc__,                          /* tp_doc */
+    0,                                                             /* tp_traverse */
+    0,                                                             /* tp_clear */
+    0,                                                             /* tp_richcompare */
+    0,                                                             /* tp_weaklistoffset */
+    0,                                                             /* tp_iter */
+    0,                                                             /* tp_iternext */
+    0,                                                             /* tp_methods */
+    0,                                                             /* tp_members */
+    0,                                                             /* tp_getset */
+    &UnaryPredicate1D_Type,                                        /* tp_base */
+    0,                                                             /* tp_dict */
+    0,                                                             /* tp_descr_get */
+    0,                                                             /* tp_descr_set */
+    0,                                                             /* tp_dictoffset */
+    (initproc)QuantitativeInvisibilityUP1D___init__,               /* tp_init */
+    0,                                                             /* tp_alloc */
+    0,                                                             /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
index bfd7302b0e1..879c6c5b7be 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
@@ -32,11 +32,11 @@ extern "C" {
 extern PyTypeObject QuantitativeInvisibilityUP1D_Type;
 
 #define BPy_QuantitativeInvisibilityUP1D_Check(v) \
-            (PyObject_IsInstance((PyObject *)v, (PyObject *)&QuantitativeInvisibilityUP1D_Type))
+  (PyObject_IsInstance((PyObject *)v, (PyObject *)&QuantitativeInvisibilityUP1D_Type))
 
 /*---------------------------Python BPy_QuantitativeInvisibilityUP1D structure definition----------*/
 typedef struct {
-	BPy_UnaryPredicate1D py_up1D;
+  BPy_UnaryPredicate1D py_up1D;
 } BPy_QuantitativeInvisibilityUP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
index adf44287582..54a6a70c3bf 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
@@ -29,80 +29,79 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char ShapeUP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`ShapeUP1D`\n"
-"\n"
-".. method:: __init__(first, second=0)\n"
-"\n"
-"   Builds a ShapeUP1D object.\n"
-"\n"
-"   :arg first: The first Id component.\n"
-"   :type first: int\n"
-"   :arg second: The second Id component.\n"
-"   :type second: int\n"
-"\n"
-".. method:: __call__(inter)\n"
-"\n"
-"   Returns true if the shape to which the Interface1D belongs to has the\n"
-"   same :class:`freestyle.types.Id` as the one specified by the user.\n"
-"\n"
-"   :arg inter: An Interface1D object.\n"
-"   :type inter: :class:`freestyle.types.Interface1D`\n"
-"   :return: True if Interface1D belongs to the shape of the\n"
-"      user-specified Id.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`ShapeUP1D`\n"
+    "\n"
+    ".. method:: __init__(first, second=0)\n"
+    "\n"
+    "   Builds a ShapeUP1D object.\n"
+    "\n"
+    "   :arg first: The first Id component.\n"
+    "   :type first: int\n"
+    "   :arg second: The second Id component.\n"
+    "   :type second: int\n"
+    "\n"
+    ".. method:: __call__(inter)\n"
+    "\n"
+    "   Returns true if the shape to which the Interface1D belongs to has the\n"
+    "   same :class:`freestyle.types.Id` as the one specified by the user.\n"
+    "\n"
+    "   :arg inter: An Interface1D object.\n"
+    "   :type inter: :class:`freestyle.types.Interface1D`\n"
+    "   :return: True if Interface1D belongs to the shape of the\n"
+    "      user-specified Id.\n"
+    "   :rtype: bool\n";
 
 static int ShapeUP1D___init__(BPy_ShapeUP1D *self, PyObject *args, PyObject *kwds)
 {
-	static const char *kwlist[] = {"first", "second", NULL};
-	unsigned u1, u2 = 0;
+  static const char *kwlist[] = {"first", "second", NULL};
+  unsigned u1, u2 = 0;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "I|I", (char **)kwlist, &u1, &u2))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::ShapeUP1D(u1, u2);
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "I|I", (char **)kwlist, &u1, &u2))
+    return -1;
+  self->py_up1D.up1D = new Predicates1D::ShapeUP1D(u1, u2);
+  return 0;
 }
 
 /*-----------------------BPy_ShapeUP1D type definition ------------------------------*/
 
 PyTypeObject ShapeUP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"ShapeUP1D",                    /* tp_name */
-	sizeof(BPy_ShapeUP1D),          /* tp_basicsize */
-	0,                              /* tp_itemsize */
-	0,                              /* tp_dealloc */
-	0,                              /* tp_print */
-	0,                              /* tp_getattr */
-	0,                              /* tp_setattr */
-	0,                              /* tp_reserved */
-	0,                              /* tp_repr */
-	0,                              /* tp_as_number */
-	0,                              /* tp_as_sequence */
-	0,                              /* tp_as_mapping */
-	0,                              /* tp_hash  */
-	0,                              /* tp_call */
-	0,                              /* tp_str */
-	0,                              /* tp_getattro */
-	0,                              /* tp_setattro */
-	0,                              /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	ShapeUP1D___doc__,              /* tp_doc */
-	0,                              /* tp_traverse */
-	0,                              /* tp_clear */
-	0,                              /* tp_richcompare */
-	0,                              /* tp_weaklistoffset */
-	0,                              /* tp_iter */
-	0,                              /* tp_iternext */
-	0,                              /* tp_methods */
-	0,                              /* tp_members */
-	0,                              /* tp_getset */
-	&UnaryPredicate1D_Type,         /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)ShapeUP1D___init__,   /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "ShapeUP1D", /* tp_name */
+    sizeof(BPy_ShapeUP1D),                      /* tp_basicsize */
+    0,                                          /* tp_itemsize */
+    0,                                          /* tp_dealloc */
+    0,                                          /* tp_print */
+    0,                                          /* tp_getattr */
+    0,                                          /* tp_setattr */
+    0,                                          /* tp_reserved */
+    0,                                          /* tp_repr */
+    0,                                          /* tp_as_number */
+    0,                                          /* tp_as_sequence */
+    0,                                          /* tp_as_mapping */
+    0,                                          /* tp_hash  */
+    0,                                          /* tp_call */
+    0,                                          /* tp_str */
+    0,                                          /* tp_getattro */
+    0,                                          /* tp_setattro */
+    0,                                          /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,   /* tp_flags */
+    ShapeUP1D___doc__,                          /* tp_doc */
+    0,                                          /* tp_traverse */
+    0,                                          /* tp_clear */
+    0,                                          /* tp_richcompare */
+    0,                                          /* tp_weaklistoffset */
+    0,                                          /* tp_iter */
+    0,                                          /* tp_iternext */
+    0,                                          /* tp_methods */
+    0,                                          /* tp_members */
+    0,                                          /* tp_getset */
+    &UnaryPredicate1D_Type,                     /* tp_base */
+    0,                                          /* tp_dict */
+    0,                                          /* tp_descr_get */
+    0,                                          /* tp_descr_set */
+    0,                                          /* tp_dictoffset */
+    (initproc)ShapeUP1D___init__,               /* tp_init */
+    0,                                          /* tp_alloc */
+    0,                                          /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
index 9cfeded4452..a48ed0aa0da 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
@@ -35,7 +35,7 @@ extern PyTypeObject ShapeUP1D_Type;
 
 /*---------------------------Python BPy_ShapeUP1D structure definition----------*/
 typedef struct {
-	BPy_UnaryPredicate1D py_up1D;
+  BPy_UnaryPredicate1D py_up1D;
 } BPy_ShapeUP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
index d1562dfa692..55c8c1ee889 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
@@ -29,68 +29,67 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char TrueUP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`TrueUP1D`\n"
-"\n"
-".. method:: __call__(inter)\n"
-"\n"
-"   Always returns true.\n"
-"\n"
-"   :arg inter: An Interface1D object.\n"
-"   :type inter: :class:`freestyle.types.Interface1D`\n"
-"   :return: True.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`TrueUP1D`\n"
+    "\n"
+    ".. method:: __call__(inter)\n"
+    "\n"
+    "   Always returns true.\n"
+    "\n"
+    "   :arg inter: An Interface1D object.\n"
+    "   :type inter: :class:`freestyle.types.Interface1D`\n"
+    "   :return: True.\n"
+    "   :rtype: bool\n";
 
 static int TrueUP1D___init__(BPy_TrueUP1D *self, PyObject *args, PyObject *kwds)
 {
-	static const char *kwlist[] = {NULL};
+  static const char *kwlist[] = {NULL};
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::TrueUP1D();
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
+    return -1;
+  self->py_up1D.up1D = new Predicates1D::TrueUP1D();
+  return 0;
 }
 
 /*-----------------------BPy_TrueUP1D type definition ------------------------------*/
 
 PyTypeObject TrueUP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"TrueUP1D",                     /* tp_name */
-	sizeof(BPy_TrueUP1D),           /* tp_basicsize */
-	0,                              /* tp_itemsize */
-	0,                              /* tp_dealloc */
-	0,                              /* tp_print */
-	0,                              /* tp_getattr */
-	0,                              /* tp_setattr */
-	0,                              /* tp_reserved */
-	0,                              /* tp_repr */
-	0,                              /* tp_as_number */
-	0,                              /* tp_as_sequence */
-	0,                              /* tp_as_mapping */
-	0,                              /* tp_hash  */
-	0,                              /* tp_call */
-	0,                              /* tp_str */
-	0,                              /* tp_getattro */
-	0,                              /* tp_setattro */
-	0,                              /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	TrueUP1D___doc__,               /* tp_doc */
-	0,                              /* tp_traverse */
-	0,                              /* tp_clear */
-	0,                              /* tp_richcompare */
-	0,                              /* tp_weaklistoffset */
-	0,                              /* tp_iter */
-	0,                              /* tp_iternext */
-	0,                              /* tp_methods */
-	0,                              /* tp_members */
-	0,                              /* tp_getset */
-	&UnaryPredicate1D_Type,         /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)TrueUP1D___init__,    /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "TrueUP1D", /* tp_name */
+    sizeof(BPy_TrueUP1D),                      /* tp_basicsize */
+    0,                                         /* tp_itemsize */
+    0,                                         /* tp_dealloc */
+    0,                                         /* tp_print */
+    0,                                         /* tp_getattr */
+    0,                                         /* tp_setattr */
+    0,                                         /* tp_reserved */
+    0,                                         /* tp_repr */
+    0,                                         /* tp_as_number */
+    0,                                         /* tp_as_sequence */
+    0,                                         /* tp_as_mapping */
+    0,                                         /* tp_hash  */
+    0,                                         /* tp_call */
+    0,                                         /* tp_str */
+    0,                                         /* tp_getattro */
+    0,                                         /* tp_setattro */
+    0,                                         /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,  /* tp_flags */
+    TrueUP1D___doc__,                          /* tp_doc */
+    0,                                         /* tp_traverse */
+    0,                                         /* tp_clear */
+    0,                                         /* tp_richcompare */
+    0,                                         /* tp_weaklistoffset */
+    0,                                         /* tp_iter */
+    0,                                         /* tp_iternext */
+    0,                                         /* tp_methods */
+    0,                                         /* tp_members */
+    0,                                         /* tp_getset */
+    &UnaryPredicate1D_Type,                    /* tp_base */
+    0,                                         /* tp_dict */
+    0,                                         /* tp_descr_get */
+    0,                                         /* tp_descr_set */
+    0,                                         /* tp_dictoffset */
+    (initproc)TrueUP1D___init__,               /* tp_init */
+    0,                                         /* tp_alloc */
+    0,                                         /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h
index 5d4420a2ccd..49c3dcdacca 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h
@@ -35,7 +35,7 @@ extern PyTypeObject TrueUP1D_Type;
 
 /*---------------------------Python BPy_TrueUP1D structure definition----------*/
 typedef struct {
-	BPy_UnaryPredicate1D py_up1D;
+  BPy_UnaryPredicate1D py_up1D;
 } BPy_TrueUP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
index 26269c34dc7..4fc163dbd01 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
@@ -29,77 +29,80 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char WithinImageBoundaryUP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > :class:`WithinImageBoundaryUP1D`\n"
-"\n"
-".. method:: __init__(xmin, ymin, xmax, ymax)\n"
-"\n"
-"   Builds an WithinImageBoundaryUP1D object.\n"
-"\n"
-"   :arg xmin: X lower bound of the image boundary.\n"
-"   :type xmin: float\n"
-"   :arg ymin: Y lower bound of the image boundary.\n"
-"   :type ymin: float\n"
-"   :arg xmax: X upper bound of the image boundary.\n"
-"   :type xmax: float\n"
-"   :arg ymax: Y upper bound of the image boundary.\n"
-"   :type ymax: float\n"
-"\n"
-".. method:: __call__(inter)\n"
-"\n"
-"   Returns true if the Interface1D intersects with image boundary.\n";
+    "Class hierarchy: :class:`freestyle.types.UnaryPredicate1D` > "
+    ":class:`WithinImageBoundaryUP1D`\n"
+    "\n"
+    ".. method:: __init__(xmin, ymin, xmax, ymax)\n"
+    "\n"
+    "   Builds an WithinImageBoundaryUP1D object.\n"
+    "\n"
+    "   :arg xmin: X lower bound of the image boundary.\n"
+    "   :type xmin: float\n"
+    "   :arg ymin: Y lower bound of the image boundary.\n"
+    "   :type ymin: float\n"
+    "   :arg xmax: X upper bound of the image boundary.\n"
+    "   :type xmax: float\n"
+    "   :arg ymax: Y upper bound of the image boundary.\n"
+    "   :type ymax: float\n"
+    "\n"
+    ".. method:: __call__(inter)\n"
+    "\n"
+    "   Returns true if the Interface1D intersects with image boundary.\n";
 
-static int WithinImageBoundaryUP1D___init__(BPy_WithinImageBoundaryUP1D *self, PyObject *args, PyObject *kwds)
+static int WithinImageBoundaryUP1D___init__(BPy_WithinImageBoundaryUP1D *self,
+                                            PyObject *args,
+                                            PyObject *kwds)
 {
-	static const char *kwlist[] = {"xmin", "ymin", "xmax", "ymax", NULL};
-	double xmin, ymin, xmax, ymax;
+  static const char *kwlist[] = {"xmin", "ymin", "xmax", "ymax", NULL};
+  double xmin, ymin, xmax, ymax;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "dddd", (char **)kwlist, &xmin, &ymin, &xmax, &ymax))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::WithinImageBoundaryUP1D(xmin, ymin, xmax, ymax);
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(
+          args, kwds, "dddd", (char **)kwlist, &xmin, &ymin, &xmax, &ymax))
+    return -1;
+  self->py_up1D.up1D = new Predicates1D::WithinImageBoundaryUP1D(xmin, ymin, xmax, ymax);
+  return 0;
 }
 
 /*-----------------------BPy_TrueUP1D type definition ------------------------------*/
 
 PyTypeObject WithinImageBoundaryUP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"WithinImageBoundaryUP1D",      /* tp_name */
-	sizeof(BPy_WithinImageBoundaryUP1D), /* tp_basicsize */
-	0,                              /* tp_itemsize */
-	0,                              /* tp_dealloc */
-	0,                              /* tp_print */
-	0,                              /* tp_getattr */
-	0,                              /* tp_setattr */
-	0,                              /* tp_reserved */
-	0,                              /* tp_repr */
-	0,                              /* tp_as_number */
-	0,                              /* tp_as_sequence */
-	0,                              /* tp_as_mapping */
-	0,                              /* tp_hash  */
-	0,                              /* tp_call */
-	0,                              /* tp_str */
-	0,                              /* tp_getattro */
-	0,                              /* tp_setattro */
-	0,                              /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	WithinImageBoundaryUP1D___doc__, /* tp_doc */
-	0,                              /* tp_traverse */
-	0,                              /* tp_clear */
-	0,                              /* tp_richcompare */
-	0,                              /* tp_weaklistoffset */
-	0,                              /* tp_iter */
-	0,                              /* tp_iternext */
-	0,                              /* tp_methods */
-	0,                              /* tp_members */
-	0,                              /* tp_getset */
-	&UnaryPredicate1D_Type,         /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)WithinImageBoundaryUP1D___init__, /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "WithinImageBoundaryUP1D", /* tp_name */
+    sizeof(BPy_WithinImageBoundaryUP1D),                      /* tp_basicsize */
+    0,                                                        /* tp_itemsize */
+    0,                                                        /* tp_dealloc */
+    0,                                                        /* tp_print */
+    0,                                                        /* tp_getattr */
+    0,                                                        /* tp_setattr */
+    0,                                                        /* tp_reserved */
+    0,                                                        /* tp_repr */
+    0,                                                        /* tp_as_number */
+    0,                                                        /* tp_as_sequence */
+    0,                                                        /* tp_as_mapping */
+    0,                                                        /* tp_hash  */
+    0,                                                        /* tp_call */
+    0,                                                        /* tp_str */
+    0,                                                        /* tp_getattro */
+    0,                                                        /* tp_setattro */
+    0,                                                        /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,                 /* tp_flags */
+    WithinImageBoundaryUP1D___doc__,                          /* tp_doc */
+    0,                                                        /* tp_traverse */
+    0,                                                        /* tp_clear */
+    0,                                                        /* tp_richcompare */
+    0,                                                        /* tp_weaklistoffset */
+    0,                                                        /* tp_iter */
+    0,                                                        /* tp_iternext */
+    0,                                                        /* tp_methods */
+    0,                                                        /* tp_members */
+    0,                                                        /* tp_getset */
+    &UnaryPredicate1D_Type,                                   /* tp_base */
+    0,                                                        /* tp_dict */
+    0,                                                        /* tp_descr_get */
+    0,                                                        /* tp_descr_set */
+    0,                                                        /* tp_dictoffset */
+    (initproc)WithinImageBoundaryUP1D___init__,               /* tp_init */
+    0,                                                        /* tp_alloc */
+    0,                                                        /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h
index 39eb3f34b7f..2481beee78e 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h
@@ -32,11 +32,11 @@ extern "C" {
 extern PyTypeObject WithinImageBoundaryUP1D_Type;
 
 #define BPy_WithinImageBoundaryUP1D_Check(v) \
-            (PyObject_IsInstance((PyObject *)v, (PyObject *)&WithinImageBoundaryUP1D_Type))
+  (PyObject_IsInstance((PyObject *)v, (PyObject *)&WithinImageBoundaryUP1D_Type))
 
 /*---------------------------Python BPy_WithinImageBoundaryUP1D structure definition----------*/
 typedef struct {
-	BPy_UnaryPredicate1D py_up1D;
+  BPy_UnaryPredicate1D py_up1D;
 } BPy_WithinImageBoundaryUP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////