Fix clang-format differences between version 6 and 9

Version 6 does not appear to respect clang-format off for header sorting.

5 files changed, 20 insertions, 26 deletions

diff --git a/source/blender/freestyle/intern/application/AppCanvas.cpp b/source/blender/freestyle/intern/application/AppCanvas.cpp
index 1f3aea65e24..5681c65e5d2 100644
--- a/source/blender/freestyle/intern/application/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/application/AppCanvas.cpp
@@ -18,18 +18,17 @@
  * \ingroup freestyle
  */
 
-/* clang-format off */
-#include "Controller.h"
+#include "AppCanvas.h"
+#include "AppConfig.h"
 #include "AppView.h"
+#include "Controller.h"
+
 #include "../image/Image.h"
-#include "../system/TimeStamp.h"
 #include "../stroke/StrokeRenderer.h"
-#include "AppCanvas.h"
-#include "AppConfig.h"
 #include "../stroke/StyleModule.h"
+#include "../system/TimeStamp.h"
 
 #include "../system/StringUtils.h"
-/* clang-format on */
 namespace Freestyle {
 
 AppCanvas::AppCanvas() : Canvas()
diff --git a/source/blender/freestyle/intern/application/AppConfig.h b/source/blender/freestyle/intern/application/AppConfig.h
index 725b29e7dd8..34f5d220cfe 100644
--- a/source/blender/freestyle/intern/application/AppConfig.h
+++ b/source/blender/freestyle/intern/application/AppConfig.h
@@ -22,15 +22,14 @@
  * \brief Configuration file
  */
 
-/* clang-format off */
-#include <string>
 #include <algorithm>
+#include <string>
+
 #include "../system/Precision.h"
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
-/* clang-format on */
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/application/AppView.cpp b/source/blender/freestyle/intern/application/AppView.cpp
index 771d4b0fca8..0956d33a20e 100644
--- a/source/blender/freestyle/intern/application/AppView.cpp
+++ b/source/blender/freestyle/intern/application/AppView.cpp
@@ -18,20 +18,20 @@
  * \ingroup freestyle
  */
 
-/* clang-format off */
 #include <iostream>
 
-#include "Controller.h"
 #include "AppConfig.h"
 #include "AppView.h"
-#include "../view_map/Silhouette.h"
-#include "../view_map/ViewMap.h"
+#include "Controller.h"
+
 #include "../scene_graph/LineRep.h"
 #include "../scene_graph/NodeLight.h"
 #include "../scene_graph/NodeShape.h"
 #include "../scene_graph/VertexRep.h"
 #include "../stroke/Canvas.h"
 #include "../system/StringUtils.h"
+#include "../view_map/Silhouette.h"
+#include "../view_map/ViewMap.h"
 
 extern "C" {
 #include "BLI_blenlib.h"
@@ -46,7 +46,6 @@ extern "C" {
 
 #include "FRS_freestyle.h"
 }
-/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/application/AppView.h b/source/blender/freestyle/intern/application/AppView.h
index 4c60b1515f3..6009f2b0e50 100644
--- a/source/blender/freestyle/intern/application/AppView.h
+++ b/source/blender/freestyle/intern/application/AppView.h
@@ -21,10 +21,10 @@
  * \ingroup freestyle
  */
 
-/* clang-format off */
 #include "AppConfig.h"
-#include "../geometry/Geom.h"
+
 #include "../geometry/BBox.h"
+#include "../geometry/Geom.h"
 #include "../scene_graph/NodeDrawingStyle.h"
 #include "../system/Precision.h"
 
@@ -33,7 +33,6 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
-/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index c2f6796bf31..66195745cbb 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -18,18 +18,17 @@
  * \ingroup freestyle
  */
 
-/* clang-format off */
 extern "C" {
 #include <Python.h>
 }
 
-#include <string>
-#include <fstream>
 #include <float.h>
+#include <fstream>
+#include <string>
 
-#include "AppView.h"
 #include "AppCanvas.h"
 #include "AppConfig.h"
+#include "AppView.h"
 #include "Controller.h"
 
 #include "../image/Image.h"
@@ -42,12 +41,12 @@ extern "C" {
 #include "../scene_graph/VertexRep.h"
 
 #include "../stroke/PSStrokeRenderer.h"
-#include "../stroke/TextStrokeRenderer.h"
 #include "../stroke/StrokeTesselator.h"
 #include "../stroke/StyleModule.h"
+#include "../stroke/TextStrokeRenderer.h"
 
-#include "../system/StringUtils.h"
 #include "../system/PythonInterpreter.h"
+#include "../system/StringUtils.h"
 
 #include "../view_map/SteerableViewMap.h"
 #include "../view_map/ViewMap.h"
@@ -56,21 +55,20 @@ extern "C" {
 
 #include "../winged_edge/Curvature.h"
 #include "../winged_edge/WEdge.h"
-#include "../winged_edge/WingedEdgeBuilder.h"
 #include "../winged_edge/WXEdgeBuilder.h"
+#include "../winged_edge/WingedEdgeBuilder.h"
 
 #include "../blender_interface/BlenderFileLoader.h"
 #include "../blender_interface/BlenderStrokeRenderer.h"
 #include "../blender_interface/BlenderStyleModule.h"
 
 #include "BKE_global.h"
-#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_freestyle_types.h"
 
 #include "FRS_freestyle.h"
-/* clang-format off */
 
 namespace Freestyle {