diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-04-21 13:39:12 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-04-21 14:16:59 +0300 |
commit | 5fed9ac9b5885820a6e0845120cd93f7141fdb84 (patch) | |
tree | b5086f6168d7dbb92616b3e47e30870b0ff1dc93 /source/blender/freestyle/intern/stroke | |
parent | c73d6162be6437a76da94a36502770b440edc454 (diff) |
Fix clang-format differences between version 6 and 9
Version 6 does not appear to respect clang-format off for header sorting.
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
13 files changed, 19 insertions, 43 deletions
diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index 8159279a846..7d04a55c5d9 100644 --- a/source/blender/freestyle/intern/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp @@ -19,7 +19,6 @@ * \brief Class to define a canvas designed to draw style modules */ -/* clang-format off */ #include <sstream> #include <vector> @@ -27,13 +26,13 @@ #include "StrokeRenderer.h" #include "StyleModule.h" -#include "../image/Image.h" #include "../image/GaussianFilter.h" +#include "../image/Image.h" #include "../image/ImagePyramid.h" #include "../system/FreestyleConfig.h" -#include "../system/TimeStamp.h" #include "../system/PseudoNoise.h" +#include "../system/TimeStamp.h" #include "../view_map/SteerableViewMap.h" @@ -46,7 +45,6 @@ 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 94c0b753985..562ca32be78 100644 --- a/source/blender/freestyle/intern/stroke/Chain.cpp +++ b/source/blender/freestyle/intern/stroke/Chain.cpp @@ -19,12 +19,10 @@ * \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 */ +#include "../view_map/ViewMapIterators.h" namespace Freestyle { diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h index 569ca6fcf1d..36611a4a009 100644 --- a/source/blender/freestyle/intern/stroke/ChainingIterators.h +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h @@ -22,7 +22,6 @@ * \brief Chaining iterators */ -/* clang-format off */ #include <iostream> #include "Predicates1D.h" @@ -30,9 +29,8 @@ #include "../system/Iterator.h" #include "../view_map/ViewMap.h" -#include "../view_map/ViewMapIterators.h" #include "../view_map/ViewMapAdvancedIterators.h" -/* clang-format on */ +#include "../view_map/ViewMapIterators.h" // using namespace ViewEdgeInternal; diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp index 294f332d48d..02a1d32953d 100644 --- a/source/blender/freestyle/intern/stroke/Curve.cpp +++ b/source/blender/freestyle/intern/stroke/Curve.cpp @@ -19,16 +19,14 @@ * \brief Class to define a container for curves */ -/* clang-format off */ #include <stdio.h> /* printf */ #include "Curve.h" -#include "CurveIterators.h" #include "CurveAdvancedIterators.h" +#include "CurveIterators.h" #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 b0d3f26bce4..25954c7ecbf 100644 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -19,18 +19,16 @@ * \brief Class gathering stroke creation algorithms */ -/* clang-format off */ #include <algorithm> #include <stdexcept> -#include "Operators.h" #include "Canvas.h" +#include "CurveIterators.h" +#include "Operators.h" #include "Stroke.h" #include "StrokeIterators.h" -#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 ff43e5986b3..c2c263696bc 100644 --- a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp @@ -19,10 +19,8 @@ * \brief Class to define the Postscript rendering of a stroke */ -/* clang-format off */ -#include "Canvas.h" #include "PSStrokeRenderer.h" -/* clang-format on */ +#include "Canvas.h" namespace Freestyle { diff --git a/source/blender/freestyle/intern/stroke/Predicates1D.h b/source/blender/freestyle/intern/stroke/Predicates1D.h index d549e960bd9..0ad4c69f869 100644 --- a/source/blender/freestyle/intern/stroke/Predicates1D.h +++ b/source/blender/freestyle/intern/stroke/Predicates1D.h @@ -22,20 +22,18 @@ * \brief Class gathering stroke creation algorithms */ -/* clang-format off */ #include <string> #include "AdvancedFunctions1D.h" #include "../system/TimeStamp.h" -#include "../view_map/Interface1D.h" #include "../view_map/Functions1D.h" +#include "../view_map/Interface1D.h" #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 0bd25c20ca5..2f29eac83b1 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp @@ -19,15 +19,13 @@ * \brief Classes to define a stroke */ -/* clang-format off */ #include "Stroke.h" -#include "StrokeIterators.h" #include "StrokeAdvancedIterators.h" +#include "StrokeIterators.h" #include "StrokeRenderer.h" #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 95598654dfe..9d12067512c 100644 --- a/source/blender/freestyle/intern/stroke/StrokeLayer.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp @@ -19,11 +19,9 @@ * \brief Class to define a layer of strokes. */ -/* clang-format off */ +#include "StrokeLayer.h" #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 615d59ce6aa..67deb5eebf3 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h @@ -22,10 +22,9 @@ * \brief Classes to render a stroke with OpenGL */ -/* clang-format off */ +#include <algorithm> #include <map> #include <string.h> -#include <algorithm> #include <utility> #include <vector> @@ -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/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp index 81e69c6e34c..661c144476c 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp @@ -19,15 +19,13 @@ * \brief Class to define the representation of a stroke (for display purpose) */ -/* clang-format off */ +#include "StrokeRep.h" #include "Stroke.h" -#include "StrokeIterators.h" #include "StrokeAdvancedIterators.h" +#include "StrokeIterators.h" #include "StrokeRenderer.h" -#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 4f58827e941..e9a50067d4d 100644 --- a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp @@ -19,14 +19,12 @@ * \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 "StrokeAdvancedIterators.h" -#include "../scene_graph/OrientedLineRep.h" #include "../scene_graph/NodeGroup.h" #include "../scene_graph/NodeShape.h" -/* clang-format on */ +#include "../scene_graph/OrientedLineRep.h" namespace Freestyle { diff --git a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h index 4669067c3f5..c6497aba808 100644 --- a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h @@ -34,11 +34,11 @@ #ifndef TEXTSTROKERENDERER_H #define TEXTSTROKERENDERER_H -/* clang-format off */ +#include <fstream> + #include "StrokeRenderer.h" + #include "../system/FreestyleConfig.h" -#include <fstream> -/* clang-format on */ namespace Freestyle { |