From 5fed9ac9b5885820a6e0845120cd93f7141fdb84 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 21 Apr 2020 12:39:12 +0200 Subject: Fix clang-format differences between version 6 and 9 Version 6 does not appear to respect clang-format off for header sorting. --- source/blender/freestyle/intern/stroke/Canvas.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blender/freestyle/intern/stroke/Canvas.cpp') 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 #include @@ -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; -- cgit v1.2.3