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/blender_interface | |
| 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/blender_interface')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h | 6 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index fe93b179eb6..ad6379d5f52 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -21,9 +21,8 @@ * \ingroup freestyle */ -/* clang-format off */ -#include <string.h> #include <float.h> +#include <string.h> #include "../geometry/BBox.h" #include "../geometry/Geom.h" @@ -31,8 +30,8 @@ #include "../geometry/GeomUtils.h" #include "../scene_graph/IndexedFaceSet.h" #include "../scene_graph/NodeGroup.h" -#include "../scene_graph/NodeTransform.h" #include "../scene_graph/NodeShape.h" +#include "../scene_graph/NodeTransform.h" #include "../system/FreestyleConfig.h" #include "../system/RenderMonitor.h" @@ -64,7 +63,6 @@ extern "C" { #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" #endif -/* clang-format on */ namespace Freestyle { diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index a61bad7cf8a..b8f3a27be9c 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -18,7 +18,6 @@ * \ingroup freestyle */ -/* clang-format off */ #include "BlenderStrokeRenderer.h" #include "../application/AppConfig.h" @@ -68,7 +67,6 @@ extern "C" { } #include <limits.h> -/* clang-format on */ namespace Freestyle { |