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

10 files changed, 307 insertions, 306 deletions

diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
index 0a84e3d5144..f8b2d5a1ab5 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
@@ -29,69 +29,68 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char FalseBP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.BinaryPredicate1D` > :class:`FalseBP1D`\n"
-"\n"
-".. method:: __call__(inter1, inter2)\n"
-"\n"
-"   Always returns false.\n"
-"\n"
-"   :arg inter1: The first Interface1D object.\n"
-"   :type inter1: :class:`freestyle.types.Interface1D`\n"
-"   :arg inter2: The second Interface1D object.\n"
-"   :type inter2: :class:`freestyle.types.Interface1D`\n"
-"   :return: False.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.BinaryPredicate1D` > :class:`FalseBP1D`\n"
+    "\n"
+    ".. method:: __call__(inter1, inter2)\n"
+    "\n"
+    "   Always returns false.\n"
+    "\n"
+    "   :arg inter1: The first Interface1D object.\n"
+    "   :type inter1: :class:`freestyle.types.Interface1D`\n"
+    "   :arg inter2: The second Interface1D object.\n"
+    "   :type inter2: :class:`freestyle.types.Interface1D`\n"
+    "   :return: False.\n"
+    "   :rtype: bool\n";
 
 static int FalseBP1D___init__(BPy_FalseBP1D *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_bp1D.bp1D = new Predicates1D::FalseBP1D();
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
+    return -1;
+  self->py_bp1D.bp1D = new Predicates1D::FalseBP1D();
+  return 0;
 }
 
 /*-----------------------BPy_FalseBP1D type definition ------------------------------*/
 PyTypeObject FalseBP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"FalseBP1D",                    /* tp_name */
-	sizeof(BPy_FalseBP1D),          /* 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 */
-	FalseBP1D___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 */
-	&BinaryPredicate1D_Type,        /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)FalseBP1D___init__,   /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "FalseBP1D", /* tp_name */
+    sizeof(BPy_FalseBP1D),                      /* 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 */
+    FalseBP1D___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 */
+    &BinaryPredicate1D_Type,                    /* tp_base */
+    0,                                          /* tp_dict */
+    0,                                          /* tp_descr_get */
+    0,                                          /* tp_descr_set */
+    0,                                          /* tp_dictoffset */
+    (initproc)FalseBP1D___init__,               /* tp_init */
+    0,                                          /* tp_alloc */
+    0,                                          /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
index 120cda356c4..abb9eca9b30 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
@@ -35,7 +35,7 @@ extern PyTypeObject FalseBP1D_Type;
 
 /*---------------------------Python BPy_FalseBP1D structure definition----------*/
 typedef struct {
-	BPy_BinaryPredicate1D py_bp1D;
+  BPy_BinaryPredicate1D py_bp1D;
 } BPy_FalseBP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
index 50046fa0e1c..7387252bfd0 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
@@ -29,71 +29,70 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char Length2DBP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.BinaryPredicate1D` > :class:`Length2DBP1D`\n"
-"\n"
-".. method:: __call__(inter1, inter2)\n"
-"\n"
-"   Returns true if the 2D length of inter1 is less than the 2D length\n"
-"   of inter2.\n"
-"\n"
-"   :arg inter1: The first Interface1D object.\n"
-"   :type inter1: :class:`freestyle.types.Interface1D`\n"
-"   :arg inter2: The second Interface1D object.\n"
-"   :type inter2: :class:`freestyle.types.Interface1D`\n"
-"   :return: True or false.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.BinaryPredicate1D` > :class:`Length2DBP1D`\n"
+    "\n"
+    ".. method:: __call__(inter1, inter2)\n"
+    "\n"
+    "   Returns true if the 2D length of inter1 is less than the 2D length\n"
+    "   of inter2.\n"
+    "\n"
+    "   :arg inter1: The first Interface1D object.\n"
+    "   :type inter1: :class:`freestyle.types.Interface1D`\n"
+    "   :arg inter2: The second Interface1D object.\n"
+    "   :type inter2: :class:`freestyle.types.Interface1D`\n"
+    "   :return: True or false.\n"
+    "   :rtype: bool\n";
 
 static int Length2DBP1D___init__(BPy_Length2DBP1D *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_bp1D.bp1D = new Predicates1D::Length2DBP1D();
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
+    return -1;
+  self->py_bp1D.bp1D = new Predicates1D::Length2DBP1D();
+  return 0;
 }
 
 /*-----------------------BPy_Length2DBP1D type definition ------------------------------*/
 
 PyTypeObject Length2DBP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"Length2DBP1D",                 /* tp_name */
-	sizeof(BPy_Length2DBP1D),       /* 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 */
-	Length2DBP1D___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 */
-	&BinaryPredicate1D_Type,        /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)Length2DBP1D___init__, /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "Length2DBP1D", /* tp_name */
+    sizeof(BPy_Length2DBP1D),                      /* 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 */
+    Length2DBP1D___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 */
+    &BinaryPredicate1D_Type,                       /* tp_base */
+    0,                                             /* tp_dict */
+    0,                                             /* tp_descr_get */
+    0,                                             /* tp_descr_set */
+    0,                                             /* tp_dictoffset */
+    (initproc)Length2DBP1D___init__,               /* tp_init */
+    0,                                             /* tp_alloc */
+    0,                                             /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
index 3e73dfa9ad4..6ad2373c570 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
@@ -31,11 +31,12 @@ extern "C" {
 
 extern PyTypeObject Length2DBP1D_Type;
 
-#define BPy_Length2DBP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Length2DBP1D_Type))
+#define BPy_Length2DBP1D_Check(v) \
+  (PyObject_IsInstance((PyObject *)v, (PyObject *)&Length2DBP1D_Type))
 
 /*---------------------------Python BPy_Length2DBP1D structure definition----------*/
 typedef struct {
-	BPy_BinaryPredicate1D py_bp1D;
+  BPy_BinaryPredicate1D py_bp1D;
 } BPy_Length2DBP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
index cee814e62de..005bbded74f 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
@@ -29,70 +29,69 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char SameShapeIdBP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.BinaryPredicate1D` > :class:`SameShapeIdBP1D`\n"
-"\n"
-".. method:: __call__(inter1, inter2)\n"
-"\n"
-"   Returns true if inter1 and inter2 belong to the same shape.\n"
-"\n"
-"   :arg inter1: The first Interface1D object.\n"
-"   :type inter1: :class:`freestyle.types.Interface1D`\n"
-"   :arg inter2: The second Interface1D object.\n"
-"   :type inter2: :class:`freestyle.types.Interface1D`\n"
-"   :return: True or false.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.BinaryPredicate1D` > :class:`SameShapeIdBP1D`\n"
+    "\n"
+    ".. method:: __call__(inter1, inter2)\n"
+    "\n"
+    "   Returns true if inter1 and inter2 belong to the same shape.\n"
+    "\n"
+    "   :arg inter1: The first Interface1D object.\n"
+    "   :type inter1: :class:`freestyle.types.Interface1D`\n"
+    "   :arg inter2: The second Interface1D object.\n"
+    "   :type inter2: :class:`freestyle.types.Interface1D`\n"
+    "   :return: True or false.\n"
+    "   :rtype: bool\n";
 
 static int SameShapeIdBP1D___init__(BPy_SameShapeIdBP1D *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_bp1D.bp1D = new Predicates1D::SameShapeIdBP1D();
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
+    return -1;
+  self->py_bp1D.bp1D = new Predicates1D::SameShapeIdBP1D();
+  return 0;
 }
 
 /*-----------------------BPy_SameShapeIdBP1D type definition ------------------------------*/
 
 PyTypeObject SameShapeIdBP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"SameShapeIdBP1D",              /* tp_name */
-	sizeof(BPy_SameShapeIdBP1D),    /* 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 */
-	SameShapeIdBP1D___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 */
-	&BinaryPredicate1D_Type,        /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)SameShapeIdBP1D___init__, /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "SameShapeIdBP1D", /* tp_name */
+    sizeof(BPy_SameShapeIdBP1D),                      /* 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 */
+    SameShapeIdBP1D___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 */
+    &BinaryPredicate1D_Type,                          /* tp_base */
+    0,                                                /* tp_dict */
+    0,                                                /* tp_descr_get */
+    0,                                                /* tp_descr_set */
+    0,                                                /* tp_dictoffset */
+    (initproc)SameShapeIdBP1D___init__,               /* tp_init */
+    0,                                                /* tp_alloc */
+    0,                                                /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
index f20c4b48fb8..75fc5eaa271 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
@@ -31,11 +31,12 @@ extern "C" {
 
 extern PyTypeObject SameShapeIdBP1D_Type;
 
-#define BPy_SameShapeIdBP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SameShapeIdBP1D_Type))
+#define BPy_SameShapeIdBP1D_Check(v) \
+  (PyObject_IsInstance((PyObject *)v, (PyObject *)&SameShapeIdBP1D_Type))
 
 /*---------------------------Python BPy_SameShapeIdBP1D structure definition----------*/
 typedef struct {
-	BPy_BinaryPredicate1D py_bp1D;
+  BPy_BinaryPredicate1D py_bp1D;
 } BPy_SameShapeIdBP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
index 1375aa2d549..363c0386915 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
@@ -29,70 +29,69 @@ extern "C" {
 //------------------------INSTANCE METHODS ----------------------------------
 
 static char TrueBP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.BinaryPredicate1D` > :class:`TrueBP1D`\n"
-"\n"
-".. method:: __call__(inter1, inter2)\n"
-"\n"
-"   Always returns true.\n"
-"\n"
-"   :arg inter1: The first Interface1D object.\n"
-"   :type inter1: :class:`freestyle.types.Interface1D`\n"
-"   :arg inter2: The second Interface1D object.\n"
-"   :type inter2: :class:`freestyle.types.Interface1D`\n"
-"   :return: True.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.BinaryPredicate1D` > :class:`TrueBP1D`\n"
+    "\n"
+    ".. method:: __call__(inter1, inter2)\n"
+    "\n"
+    "   Always returns true.\n"
+    "\n"
+    "   :arg inter1: The first Interface1D object.\n"
+    "   :type inter1: :class:`freestyle.types.Interface1D`\n"
+    "   :arg inter2: The second Interface1D object.\n"
+    "   :type inter2: :class:`freestyle.types.Interface1D`\n"
+    "   :return: True.\n"
+    "   :rtype: bool\n";
 
 static int TrueBP1D___init__(BPy_TrueBP1D *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_bp1D.bp1D = new Predicates1D::TrueBP1D();
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
+    return -1;
+  self->py_bp1D.bp1D = new Predicates1D::TrueBP1D();
+  return 0;
 }
 
 /*-----------------------BPy_TrueBP1D type definition ------------------------------*/
 
 PyTypeObject TrueBP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"TrueBP1D",                     /* tp_name */
-	sizeof(BPy_TrueBP1D),           /* 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 */
-	TrueBP1D___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 */
-	&BinaryPredicate1D_Type,        /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)TrueBP1D___init__,    /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "TrueBP1D", /* tp_name */
+    sizeof(BPy_TrueBP1D),                      /* 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 */
+    TrueBP1D___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 */
+    &BinaryPredicate1D_Type,                   /* tp_base */
+    0,                                         /* tp_dict */
+    0,                                         /* tp_descr_get */
+    0,                                         /* tp_descr_set */
+    0,                                         /* tp_dictoffset */
+    (initproc)TrueBP1D___init__,               /* tp_init */
+    0,                                         /* tp_alloc */
+    0,                                         /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
index 66fb7bc254d..ed6a783fa47 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
@@ -35,7 +35,7 @@ extern PyTypeObject TrueBP1D_Type;
 
 /*---------------------------Python BPy_TrueBP1D structure definition----------*/
 typedef struct {
-	BPy_BinaryPredicate1D py_bp1D;
+  BPy_BinaryPredicate1D py_bp1D;
 } BPy_TrueBP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
index a7e5e7295a2..2068fe820d0 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
@@ -34,91 +34,94 @@ extern "C" {
 //ViewMapGradientNormBP1D(int level, IntegrationType iType=MEAN, float sampling=2.0)
 
 static char ViewMapGradientNormBP1D___doc__[] =
-"Class hierarchy: :class:`freestyle.types.BinaryPredicate1D` > :class:`ViewMapGradientNormBP1D`\n"
-"\n"
-".. method:: __init__(level, integration_type=IntegrationType.MEAN, sampling=2.0)\n"
-"\n"
-"   Builds a ViewMapGradientNormBP1D object.\n"
-"\n"
-"   :arg level: The level of the pyramid from which the pixel must be\n"
-"      read.\n"
-"   :type level: int\n"
-"   :arg integration_type: The integration method used to compute a single value\n"
-"      from a set of values.\n"
-"   :type integration_type: :class:`freestyle.types.IntegrationType`\n"
-"   :arg sampling: The resolution used to sample the chain:\n"
-"      GetViewMapGradientNormF0D is evaluated at each sample point and\n"
-"      the result is obtained by combining the resulting values into a\n"
-"      single one, following the method specified by integration_type.\n"
-"   :type sampling: float\n"
-"\n"
-".. method:: __call__(inter1, inter2)\n"
-"\n"
-"   Returns true if the evaluation of the Gradient norm Function is\n"
-"   higher for inter1 than for inter2.\n"
-"\n"
-"   :arg inter1: The first Interface1D object.\n"
-"   :type inter1: :class:`freestyle.types.Interface1D`\n"
-"   :arg inter2: The second Interface1D object.\n"
-"   :type inter2: :class:`freestyle.types.Interface1D`\n"
-"   :return: True or false.\n"
-"   :rtype: bool\n";
+    "Class hierarchy: :class:`freestyle.types.BinaryPredicate1D` > "
+    ":class:`ViewMapGradientNormBP1D`\n"
+    "\n"
+    ".. method:: __init__(level, integration_type=IntegrationType.MEAN, sampling=2.0)\n"
+    "\n"
+    "   Builds a ViewMapGradientNormBP1D object.\n"
+    "\n"
+    "   :arg level: The level of the pyramid from which the pixel must be\n"
+    "      read.\n"
+    "   :type level: int\n"
+    "   :arg integration_type: The integration method used to compute a single value\n"
+    "      from a set of values.\n"
+    "   :type integration_type: :class:`freestyle.types.IntegrationType`\n"
+    "   :arg sampling: The resolution used to sample the chain:\n"
+    "      GetViewMapGradientNormF0D is evaluated at each sample point and\n"
+    "      the result is obtained by combining the resulting values into a\n"
+    "      single one, following the method specified by integration_type.\n"
+    "   :type sampling: float\n"
+    "\n"
+    ".. method:: __call__(inter1, inter2)\n"
+    "\n"
+    "   Returns true if the evaluation of the Gradient norm Function is\n"
+    "   higher for inter1 than for inter2.\n"
+    "\n"
+    "   :arg inter1: The first Interface1D object.\n"
+    "   :type inter1: :class:`freestyle.types.Interface1D`\n"
+    "   :arg inter2: The second Interface1D object.\n"
+    "   :type inter2: :class:`freestyle.types.Interface1D`\n"
+    "   :return: True or false.\n"
+    "   :rtype: bool\n";
 
-static int ViewMapGradientNormBP1D___init__(BPy_ViewMapGradientNormBP1D *self, PyObject *args, PyObject *kwds)
+static int ViewMapGradientNormBP1D___init__(BPy_ViewMapGradientNormBP1D *self,
+                                            PyObject *args,
+                                            PyObject *kwds)
 {
-	static const char *kwlist[] = {"level", "integration_type", "sampling", NULL};
-	PyObject *obj = 0;
-	int i;
-	float f = 2.0;
+  static const char *kwlist[] = {"level", "integration_type", "sampling", NULL};
+  PyObject *obj = 0;
+  int i;
+  float f = 2.0;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwds, "i|O!f", (char **)kwlist, &i, &IntegrationType_Type, &obj, &f))
-		return -1;
-	IntegrationType t = (obj) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
-	self->py_bp1D.bp1D = new Predicates1D::ViewMapGradientNormBP1D(i, t, f);
-	return 0;
+  if (!PyArg_ParseTupleAndKeywords(
+          args, kwds, "i|O!f", (char **)kwlist, &i, &IntegrationType_Type, &obj, &f))
+    return -1;
+  IntegrationType t = (obj) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+  self->py_bp1D.bp1D = new Predicates1D::ViewMapGradientNormBP1D(i, t, f);
+  return 0;
 }
 
 /*-----------------------BPy_ViewMapGradientNormBP1D type definition ------------------------------*/
 
 PyTypeObject ViewMapGradientNormBP1D_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"ViewMapGradientNormBP1D",      /* tp_name */
-	sizeof(BPy_ViewMapGradientNormBP1D), /* 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 */
-	ViewMapGradientNormBP1D___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 */
-	&BinaryPredicate1D_Type,        /* tp_base */
-	0,                              /* tp_dict */
-	0,                              /* tp_descr_get */
-	0,                              /* tp_descr_set */
-	0,                              /* tp_dictoffset */
-	(initproc)ViewMapGradientNormBP1D___init__, /* tp_init */
-	0,                              /* tp_alloc */
-	0,                              /* tp_new */
+    PyVarObject_HEAD_INIT(NULL, 0) "ViewMapGradientNormBP1D", /* tp_name */
+    sizeof(BPy_ViewMapGradientNormBP1D),                      /* 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 */
+    ViewMapGradientNormBP1D___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 */
+    &BinaryPredicate1D_Type,                                  /* tp_base */
+    0,                                                        /* tp_dict */
+    0,                                                        /* tp_descr_get */
+    0,                                                        /* tp_descr_set */
+    0,                                                        /* tp_dictoffset */
+    (initproc)ViewMapGradientNormBP1D___init__,               /* tp_init */
+    0,                                                        /* tp_alloc */
+    0,                                                        /* tp_new */
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
index 7d7fce837db..1a451a688fb 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
@@ -32,11 +32,11 @@ extern "C" {
 extern PyTypeObject ViewMapGradientNormBP1D_Type;
 
 #define BPy_ViewMapGradientNormBP1D_Check(v) \
-            (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewMapGradientNormBP1D_Type))
+  (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewMapGradientNormBP1D_Type))
 
 /*---------------------------Python BPy_ViewMapGradientNormBP1D structure definition----------*/
 typedef struct {
-	BPy_BinaryPredicate1D py_bp1D;
+  BPy_BinaryPredicate1D py_bp1D;
 } BPy_ViewMapGradientNormBP1D;
 
 ///////////////////////////////////////////////////////////////////////////////////////////