Cleanup: tweak Freestyle #includes in preparation for clang-format sorting

13 files changed, 26 insertions, 0 deletions

diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp
index 4cb00b18f60..8159279a846 100644
--- a/source/blender/freestyle/intern/stroke/Canvas.cpp
+++ b/source/blender/freestyle/intern/stroke/Canvas.cpp
@@ -19,6 +19,7 @@
  * \brief Class to define a canvas designed to draw style modules
  */
 
+/* clang-format off */
 #include <sstream>
 #include <vector>
 
@@ -45,6 +46,7 @@ extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 }
+/* clang-format on */
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/stroke/Chain.cpp b/source/blender/freestyle/intern/stroke/Chain.cpp
index 79d174d8117..94c0b753985 100644
--- a/source/blender/freestyle/intern/stroke/Chain.cpp
+++ b/source/blender/freestyle/intern/stroke/Chain.cpp
@@ -19,10 +19,12 @@
  * \brief Class to define a chain of viewedges.
  */
 
+/* clang-format off */
 #include "Chain.h"
 
 #include "../view_map/ViewMapIterators.h"
 #include "../view_map/ViewMapAdvancedIterators.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h
index 3cc322a2a4b..569ca6fcf1d 100644
--- a/source/blender/freestyle/intern/stroke/ChainingIterators.h
+++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h
@@ -22,6 +22,7 @@
  * \brief Chaining iterators
  */
 
+/* clang-format off */
 #include <iostream>
 
 #include "Predicates1D.h"
@@ -31,6 +32,7 @@
 #include "../view_map/ViewMap.h"
 #include "../view_map/ViewMapIterators.h"
 #include "../view_map/ViewMapAdvancedIterators.h"
+/* clang-format on */
 
 // using namespace ViewEdgeInternal;
 
diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp
index a5d87632ad3..294f332d48d 100644
--- a/source/blender/freestyle/intern/stroke/Curve.cpp
+++ b/source/blender/freestyle/intern/stroke/Curve.cpp
@@ -19,6 +19,7 @@
  * \brief Class to define a container for curves
  */
 
+/* clang-format off */
 #include <stdio.h> /* printf */
 
 #include "Curve.h"
@@ -27,6 +28,7 @@
 
 #include "BKE_global.h"
 #include "BLI_utildefines.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp
index 84d2d3315f1..b0d3f26bce4 100644
--- a/source/blender/freestyle/intern/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
@@ -19,6 +19,7 @@
  * \brief Class gathering stroke creation algorithms
  */
 
+/* clang-format off */
 #include <algorithm>
 #include <stdexcept>
 
@@ -29,6 +30,7 @@
 #include "CurveIterators.h"
 
 #include "BKE_global.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
index 670388f5d52..ff43e5986b3 100644
--- a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
@@ -19,8 +19,10 @@
  * \brief Class to define the Postscript rendering of a stroke
  */
 
+/* clang-format off */
 #include "Canvas.h"
 #include "PSStrokeRenderer.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/Predicates1D.h b/source/blender/freestyle/intern/stroke/Predicates1D.h
index fe3649111f5..d549e960bd9 100644
--- a/source/blender/freestyle/intern/stroke/Predicates1D.h
+++ b/source/blender/freestyle/intern/stroke/Predicates1D.h
@@ -22,6 +22,7 @@
  * \brief Class gathering stroke creation algorithms
  */
 
+/* clang-format off */
 #include <string>
 
 #include "AdvancedFunctions1D.h"
@@ -34,6 +35,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp
index d18de1a7073..0bd25c20ca5 100644
--- a/source/blender/freestyle/intern/stroke/Stroke.cpp
+++ b/source/blender/freestyle/intern/stroke/Stroke.cpp
@@ -19,6 +19,7 @@
  * \brief Classes to define a stroke
  */
 
+/* clang-format off */
 #include "Stroke.h"
 #include "StrokeIterators.h"
 #include "StrokeAdvancedIterators.h"
@@ -26,6 +27,7 @@
 
 #include "BKE_global.h"
 #include "BKE_node.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/StrokeLayer.cpp b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp
index c89e7143c89..95598654dfe 100644
--- a/source/blender/freestyle/intern/stroke/StrokeLayer.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp
@@ -19,9 +19,11 @@
  * \brief Class to define a layer of strokes.
  */
 
+/* clang-format off */
 #include "Canvas.h"
 #include "Stroke.h"
 #include "StrokeLayer.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h
index e0eb0351a80..615d59ce6aa 100644
--- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h
@@ -22,6 +22,7 @@
  * \brief Classes to render a stroke with OpenGL
  */
 
+/* clang-format off */
 #include <map>
 #include <string.h>
 #include <algorithm>
@@ -36,6 +37,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
index aaf8a4b7ef5..81e69c6e34c 100644
--- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
@@ -19,6 +19,7 @@
  * \brief Class to define the representation of a stroke (for display purpose)
  */
 
+/* clang-format off */
 #include "Stroke.h"
 #include "StrokeIterators.h"
 #include "StrokeAdvancedIterators.h"
@@ -26,6 +27,7 @@
 #include "StrokeRep.h"
 
 #include "BKE_global.h"
+/* clang-format on */
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
index d4d184e2ce1..4f58827e941 100644
--- a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
@@ -19,12 +19,14 @@
  * \brief Class to build a Node Tree designed to be displayed from a set of strokes structure.
  */
 
+/* clang-format off */
 #include "StrokeAdvancedIterators.h"
 #include "StrokeTesselator.h"
 
 #include "../scene_graph/OrientedLineRep.h"
 #include "../scene_graph/NodeGroup.h"
 #include "../scene_graph/NodeShape.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
index c5af09ef598..4669067c3f5 100644
--- a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
@@ -34,9 +34,11 @@
 #ifndef TEXTSTROKERENDERER_H
 #define TEXTSTROKERENDERER_H
 
+/* clang-format off */
 #include "StrokeRenderer.h"
 #include "../system/FreestyleConfig.h"
 #include <fstream>
+/* clang-format on */
 
 namespace Freestyle {