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. --- .../blender/freestyle/intern/blender_interface/BlenderFileLoader.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h') 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 #include +#include #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 { -- cgit v1.2.3