Fix clang-format differences between version 6 and 9

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

7 files changed, 8 insertions, 22 deletions

diff --git a/source/blender/freestyle/intern/view_map/GridDensityProvider.h b/source/blender/freestyle/intern/view_map/GridDensityProvider.h
index 26b76006686..290d5b0cfba 100644
--- a/source/blender/freestyle/intern/view_map/GridDensityProvider.h
+++ b/source/blender/freestyle/intern/view_map/GridDensityProvider.h
@@ -22,10 +22,9 @@
  * \brief Class to define a cell grid surrounding the projected image of a scene
  */
 
-/* clang-format off */
-#include <stdexcept>
 #include <algorithm>
 #include <memory>
+#include <stdexcept>
 
 #include "AutoPtrHelper.h"
 #include "OccluderSource.h"
@@ -37,7 +36,6 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
-/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
index 2c7560259fe..46d4389ea83 100644
--- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
@@ -20,9 +20,8 @@
  * implies that this geom engine has as member data the viewpoint, transformations, projections...
  */
 
-/* clang-format off */
-#include <cstring>
 #include <cstdio>
+#include <cstring>
 
 #include "Silhouette.h"
 #include "SilhouetteGeomEngine.h"
@@ -30,7 +29,6 @@
 #include "../geometry/GeomUtils.h"
 
 #include "BKE_global.h"
-/* clang-format on */
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.h b/source/blender/freestyle/intern/view_map/SphericalGrid.h
index 3c1ca3b5992..e9074580fb9 100644
--- a/source/blender/freestyle/intern/view_map/SphericalGrid.h
+++ b/source/blender/freestyle/intern/view_map/SphericalGrid.h
@@ -24,7 +24,6 @@
 
 #define SPHERICAL_GRID_LOGGING 0
 
-/* clang-format off */
 // I would like to avoid using deque because including ViewMap.h and <deque> or <vector> separately
 // results in redefinitions of identifiers. ViewMap.h already includes <vector> so it should be a
 // safe fall-back.
@@ -35,9 +34,9 @@
 #include "OccluderSource.h"
 #include "ViewMap.h"
 
-#include "../geometry/Polygon.h"
 #include "../geometry/BBox.h"
 #include "../geometry/GridHelpers.h"
+#include "../geometry/Polygon.h"
 
 #include "../system/PointerSequence.h"
 
@@ -48,7 +47,6 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
-/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
index fd8f7958e83..a6a72bfa314 100644
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
@@ -20,7 +20,6 @@
  * to.
  */
 
-/* clang-format off */
 #include <sstream>
 
 #include "Silhouette.h"
@@ -28,8 +27,8 @@
 
 #include "../geometry/Geom.h"
 
-#include "../image/ImagePyramid.h"
 #include "../image/Image.h"
+#include "../image/ImagePyramid.h"
 
 #include "BKE_global.h"
 #include "BLI_math.h"
@@ -38,7 +37,6 @@ extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 }
-/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp
index 5ea28e4ac41..47c6c3a1f6a 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp
@@ -19,15 +19,13 @@
  * \brief Classes to define a View Map (ViewVertex, ViewEdge, etc.)
  */
 
-/* clang-format off */
 #include <float.h>
 
 #include "ViewMap.h"
-#include "ViewMapIterators.h"
 #include "ViewMapAdvancedIterators.h"
+#include "ViewMapIterators.h"
 
 #include "../geometry/GeomUtils.h"
-/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index 681237399a8..40ab3ada777 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -19,11 +19,10 @@
  * \brief Class to build silhouette edges from a Winged-Edge structure
  */
 
-/* clang-format off */
 #include <algorithm>
 #include <memory>
-#include <stdexcept>
 #include <sstream>
+#include <stdexcept>
 
 #include "FRS_freestyle.h"
 
@@ -34,13 +33,12 @@
 #include "SphericalGrid.h"
 #include "ViewMapBuilder.h"
 
-#include "../geometry/GridHelpers.h"
 #include "../geometry/GeomUtils.h"
+#include "../geometry/GridHelpers.h"
 
 #include "../winged_edge/WFillGrid.h"
 
 #include "BKE_global.h"
-/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
index 33ef6858541..b6bf51618d8 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
@@ -22,13 +22,12 @@
  * \brief Class to build a Node Tree designed to be displayed from a Silhouette View Map structure.
  */
 
-/* clang-format off */
 #include "Silhouette.h"
 #include "ViewMap.h"
 
 #include "../scene_graph/LineRep.h"
-#include "../scene_graph/NodeShape.h"
 #include "../scene_graph/NodeGroup.h"
+#include "../scene_graph/NodeShape.h"
 #include "../scene_graph/OrientedLineRep.h"
 #include "../scene_graph/VertexRep.h"
 
@@ -37,7 +36,6 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
-/* clang-format on */
 
 namespace Freestyle {