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/application/AppCanvas.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/application/AppCanvas.cpp')
-rw-r--r-- | source/blender/freestyle/intern/application/AppCanvas.cpp | 11 |
1 files changed, 5 insertions, 6 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() |