Code style clean-up.

22 files changed, 88 insertions, 88 deletions

diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
index 061ddfd25c8..f906f0cb61a 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H
-#define FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H
+#ifndef __FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H__
+#define __FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject BackboneStretcherShader_Type;
 
-#define BPy_BackboneStretcherShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BackboneStretcherShader_Type)  )
+#define BPy_BackboneStretcherShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&BackboneStretcherShader_Type))
 
 /*---------------------------Python BPy_BackboneStretcherShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H */
+#endif /* __FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
index 6a54e45784c..6e11d84e30f 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_BEZIERCURVESHADER_H
-#define FREESTYLE_PYTHON_BEZIERCURVESHADER_H
+#ifndef __FREESTYLE_PYTHON_BEZIERCURVESHADER_H__
+#define __FREESTYLE_PYTHON_BEZIERCURVESHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject BezierCurveShader_Type;
 
-#define BPy_BezierCurveShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BezierCurveShader_Type)  )
+#define BPy_BezierCurveShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&BezierCurveShader_Type))
 
 /*---------------------------Python BPy_BezierCurveShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_BEZIERCURVESHADER_H */
+#endif /* __FREESTYLE_PYTHON_BEZIERCURVESHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
index 6233b22f6eb..74dca914473 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H
-#define FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H
+#ifndef __FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H__
+#define __FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject CalligraphicShader_Type;
 
-#define BPy_CalligraphicShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &CalligraphicShader_Type)
+#define BPy_CalligraphicShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CalligraphicShader_Type)
 
 /*---------------------------Python BPy_CalligraphicShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H */
+#endif /* __FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
index 72f9ca1c077..c1d1b7f384c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_COLORNOISESHADER_H
-#define FREESTYLE_PYTHON_COLORNOISESHADER_H
+#ifndef __FREESTYLE_PYTHON_COLORNOISESHADER_H__
+#define __FREESTYLE_PYTHON_COLORNOISESHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ColorNoiseShader_Type;
 
-#define BPy_ColorNoiseShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ColorNoiseShader_Type)  )
+#define BPy_ColorNoiseShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ColorNoiseShader_Type))
 
 /*---------------------------Python BPy_ColorNoiseShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_COLORNOISESHADER_H */
+#endif /* __FREESTYLE_PYTHON_COLORNOISESHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
index fbae1f8c8b2..be70938aae6 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H
-#define FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H
+#ifndef __FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H__
+#define __FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ColorVariationPatternShader_Type;
 
-#define BPy_ColorVariationPatternShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ColorVariationPatternShader_Type)  )
+#define BPy_ColorVariationPatternShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ColorVariationPatternShader_Type))
 
 /*---------------------------Python BPy_ColorVariationPatternShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H */
+#endif /* __FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
index 9f9aac1dd19..ad81132fc4f 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H
-#define FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H
+#ifndef __FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H__
+#define __FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ConstantColorShader_Type;
 
-#define BPy_ConstantColorShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ConstantColorShader_Type)  )
+#define BPy_ConstantColorShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ConstantColorShader_Type))
 
 /*---------------------------Python BPy_ConstantColorShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H */
+#endif /* __FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
index 0507ae22b7a..686d52f0d03 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H
-#define FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H
+#ifndef __FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H__
+#define __FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ConstantThicknessShader_Type;
 
-#define BPy_ConstantThicknessShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ConstantThicknessShader_Type)  )
+#define BPy_ConstantThicknessShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ConstantThicknessShader_Type))
 
 /*---------------------------Python BPy_ConstantThicknessShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H */
+#endif /* __FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
index b27339d9b01..f36489459be 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H
-#define FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H
+#ifndef __FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H__
+#define __FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ConstrainedIncreasingThicknessShader_Type;
 
-#define BPy_ConstrainedIncreasingThicknessShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ConstrainedIncreasingThicknessShader_Type)  )
+#define BPy_ConstrainedIncreasingThicknessShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ConstrainedIncreasingThicknessShader_Type))
 
 /*---------------------------Python BPy_ConstrainedIncreasingThicknessShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H */
+#endif /* __FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
index bf924d1ea33..0b7ca4a5217 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GUIDINGLINESSHADER_H
-#define FREESTYLE_PYTHON_GUIDINGLINESSHADER_H
+#ifndef __FREESTYLE_PYTHON_GUIDINGLINESSHADER_H__
+#define __FREESTYLE_PYTHON_GUIDINGLINESSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GuidingLinesShader_Type;
 
-#define BPy_GuidingLinesShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GuidingLinesShader_Type)  )
+#define BPy_GuidingLinesShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GuidingLinesShader_Type))
 
 /*---------------------------Python BPy_GuidingLinesShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_GUIDINGLINESSHADER_H */
+#endif /* __FREESTYLE_PYTHON_GUIDINGLINESSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
index 1b8c078a6ce..bc61c7c97d0 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H
-#define FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H
+#ifndef __FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H__
+#define __FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject IncreasingColorShader_Type;
 
-#define BPy_IncreasingColorShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &IncreasingColorShader_Type)  )
+#define BPy_IncreasingColorShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&IncreasingColorShader_Type))
 
 /*---------------------------Python BPy_IncreasingColorShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H */
+#endif /* __FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
index 463dfa3ace7..ee4d370aa39 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H
-#define FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H
+#ifndef __FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H__
+#define __FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject IncreasingThicknessShader_Type;
 
-#define BPy_IncreasingThicknessShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &IncreasingThicknessShader_Type)  )
+#define BPy_IncreasingThicknessShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&IncreasingThicknessShader_Type))
 
 /*---------------------------Python BPy_IncreasingThicknessShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H */
+#endif /* __FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
index 747876e20d1..a79eab09743 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H
-#define FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H
+#ifndef __FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H__
+#define __FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject PolygonalizationShader_Type;
 
-#define BPy_PolygonalizationShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &PolygonalizationShader_Type)  )
+#define BPy_PolygonalizationShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&PolygonalizationShader_Type))
 
 /*---------------------------Python BPy_PolygonalizationShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H */
+#endif /* __FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
index a315c7cdf1f..7e214ce22aa 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_SAMPLINGSHADER_H
-#define FREESTYLE_PYTHON_SAMPLINGSHADER_H
+#ifndef __FREESTYLE_PYTHON_SAMPLINGSHADER_H__
+#define __FREESTYLE_PYTHON_SAMPLINGSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject SamplingShader_Type;
 
-#define BPy_SamplingShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SamplingShader_Type)  )
+#define BPy_SamplingShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SamplingShader_Type))
 
 /*---------------------------Python BPy_SamplingShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_SAMPLINGSHADER_H */
+#endif /* __FREESTYLE_PYTHON_SAMPLINGSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h
index 52e454ee3ab..e00c0bac9de 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHONSMOOTHINGSHADER_H
-#define FREESTYLE_PYTHONSMOOTHINGSHADER_H
+#ifndef __FREESTYLE_PYTHONSMOOTHINGSHADER_H__
+#define __FREESTYLE_PYTHONSMOOTHINGSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject SmoothingShader_Type;
 
-#define BPy_SmoothingShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SmoothingShader_Type)  )
+#define BPy_SmoothingShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SmoothingShader_Type))
 
 /*---------------------------Python BPy_SmoothingShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHONSMOOTHINGSHADER_H */
+#endif /* __FREESTYLE_PYTHONSMOOTHINGSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
index c3f8be678d8..13b32ee7a31 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_SPATIALNOISESHADER_H
-#define FREESTYLE_PYTHON_SPATIALNOISESHADER_H
+#ifndef __FREESTYLE_PYTHON_SPATIALNOISESHADER_H__
+#define __FREESTYLE_PYTHON_SPATIALNOISESHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject SpatialNoiseShader_Type;
 
-#define BPy_SpatialNoiseShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SpatialNoiseShader_Type)  )
+#define BPy_SpatialNoiseShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SpatialNoiseShader_Type))
 
 /*---------------------------Python BPy_SpatialNoiseShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_SPATIALNOISESHADER_H */
+#endif /* __FREESTYLE_PYTHON_SPATIALNOISESHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
index 8f71ff1d68f..5e28fb51390 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_STROKETEXTURESHADER_H
-#define FREESTYLE_PYTHON_STROKETEXTURESHADER_H
+#ifndef __FREESTYLE_PYTHON_STROKETEXTURESHADER_H__
+#define __FREESTYLE_PYTHON_STROKETEXTURESHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject StrokeTextureShader_Type;
 
-#define BPy_StrokeTextureShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeTextureShader_Type)  )
+#define BPy_StrokeTextureShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&StrokeTextureShader_Type))
 
 /*---------------------------Python BPy_StrokeTextureShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_STROKETEXTURESHADER_H */
+#endif /* __FREESTYLE_PYTHON_STROKETEXTURESHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
index e0c08318c5f..06070ecf3ee 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H
-#define FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H
+#ifndef __FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H__
+#define __FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject TextureAssignerShader_Type;
 
-#define BPy_TextureAssignerShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TextureAssignerShader_Type)  )
+#define BPy_TextureAssignerShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TextureAssignerShader_Type))
 
 /*---------------------------Python BPy_TextureAssignerShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H */
+#endif /* __FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
index 243d846d42c..0f68fed96c3 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_THICKNESSNOISESHADER_H
-#define FREESTYLE_PYTHON_THICKNESSNOISESHADER_H
+#ifndef __FREESTYLE_PYTHON_THICKNESSNOISESHADER_H__
+#define __FREESTYLE_PYTHON_THICKNESSNOISESHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ThicknessNoiseShader_Type;
 
-#define BPy_ThicknessNoiseShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ThicknessNoiseShader_Type)  )
+#define BPy_ThicknessNoiseShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ThicknessNoiseShader_Type))
 
 /*---------------------------Python BPy_ThicknessNoiseShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_THICKNESSNOISESHADER_H */
+#endif /* __FREESTYLE_PYTHON_THICKNESSNOISESHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
index 4b6d2d4cc54..469a78d8f1f 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H
-#define FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H
+#ifndef __FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H__
+#define __FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ThicknessVariationPatternShader_Type;
 
-#define BPy_ThicknessVariationPatternShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ThicknessVariationPatternShader_Type)  )
+#define BPy_ThicknessVariationPatternShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ThicknessVariationPatternShader_Type))
 
 /*---------------------------Python BPy_ThicknessVariationPatternShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H */
+#endif /* __FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
index 858ececfa01..7a3d2063a33 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_TIPREMOVERSHADER_H
-#define FREESTYLE_PYTHON_TIPREMOVERSHADER_H
+#ifndef __FREESTYLE_PYTHON_TIPREMOVERSHADER_H__
+#define __FREESTYLE_PYTHON_TIPREMOVERSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject TipRemoverShader_Type;
 
-#define BPy_TipRemoverShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TipRemoverShader_Type)  )
+#define BPy_TipRemoverShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TipRemoverShader_Type))
 
 /*---------------------------Python BPy_TipRemoverShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_TIPREMOVERSHADER_H */
+#endif /* __FREESTYLE_PYTHON_TIPREMOVERSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
index bab12520b32..b795ca1c53c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_FSTREAMSHADER_H
-#define FREESTYLE_PYTHON_FSTREAMSHADER_H
+#ifndef __FREESTYLE_PYTHON_FSTREAMSHADER_H__
+#define __FREESTYLE_PYTHON_FSTREAMSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject fstreamShader_Type;
 
-#define BPy_fstreamShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &fstreamShader_Type)  )
+#define BPy_fstreamShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&fstreamShader_Type))
 
 /*---------------------------Python BPy_fstreamShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_FSTREAMSHADER_H */
+#endif /* __FREESTYLE_PYTHON_FSTREAMSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
index 3e1451026cb..7cb9f0c5bf9 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_STREAMSHADER_H
-#define FREESTYLE_PYTHON_STREAMSHADER_H
+#ifndef __FREESTYLE_PYTHON_STREAMSHADER_H__
+#define __FREESTYLE_PYTHON_STREAMSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject streamShader_Type;
 
-#define BPy_streamShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &streamShader_Type)  )
+#define BPy_streamShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&streamShader_Type))
 
 /*---------------------------Python BPy_streamShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_STREAMSHADER_H */
+#endif /* __FREESTYLE_PYTHON_STREAMSHADER_H__ */