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/Canvas.cpp | |
| 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/Canvas.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/stroke/Canvas.cpp | 6 |
1 files changed, 2 insertions, 4 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; |