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/geometry | |
| 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/geometry')
4 files changed, 4 insertions, 12 deletions
diff --git a/source/blender/freestyle/intern/geometry/BBox.h b/source/blender/freestyle/intern/geometry/BBox.h index 0031a7ce860..a8965e63451 100644 --- a/source/blender/freestyle/intern/geometry/BBox.h +++ b/source/blender/freestyle/intern/geometry/BBox.h @@ -22,16 +22,14 @@ * \brief A class to hold a bounding box */ -/* clang-format off */ -#include <stdlib.h> #include <algorithm> +#include <stdlib.h> #include "BLI_utildefines.h" #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" #endif -/* clang-format on */ namespace Freestyle { diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp index bfc5e16aa2a..b60de93c4a1 100644 --- a/source/blender/freestyle/intern/geometry/FitCurve.cpp +++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp @@ -20,13 +20,11 @@ * \brief from "Graphics Gems", Academic Press, 1990 */ -/* clang-format off */ #include <cstdlib> // for malloc and free -#include <stdio.h> #include <math.h> +#include <stdio.h> #include "FitCurve.h" -/* clang-format on */ using namespace std; diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp index a7db17a4015..76e63764e4d 100644 --- a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp +++ b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp @@ -19,7 +19,6 @@ * \brief Class to define a cleaner of geometry providing a set of useful tools */ -/* clang-format off */ #if 0 # if defined(__GNUC__) && (__GNUC__ >= 3) // hash_map is not part of the C++ standard anymore; @@ -30,16 +29,15 @@ # endif #endif -#include <stdio.h> #include <list> #include <map> +#include <stdio.h> #include "GeomCleaner.h" #include "../system/TimeUtils.h" #include "BKE_global.h" -/* clang-format on */ using namespace std; diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.cpp b/source/blender/freestyle/intern/geometry/normal_cycle.cpp index 5820bdc4865..d02b5cc2d5b 100644 --- a/source/blender/freestyle/intern/geometry/normal_cycle.cpp +++ b/source/blender/freestyle/intern/geometry/normal_cycle.cpp @@ -29,10 +29,8 @@ * \ingroup freestyle */ -/* clang-format off */ -#include "matrix_util.h" #include "normal_cycle.h" -/* clang-format on */ +#include "matrix_util.h" namespace Freestyle { |