Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dalai@blender.org>2020-03-06 18:45:16 +0300
committerDalai Felinto <dalai@blender.org>2020-03-06 19:26:32 +0300
commit85424397b1847d80d7a0b6bcbf7cb3c3aa3d0181 (patch)
treed009ab527aad3b4a451f6dfaab75f62c6348dc83 /source/blender/freestyle/intern/geometry
parent96e2bd84932a826d09b7ed2201ba67a0a74f0b29 (diff)
Cleanup: tweak Freestyle #includes in preparation for clang-format sorting
Diffstat (limited to 'source/blender/freestyle/intern/geometry')
-rw-r--r--source/blender/freestyle/intern/geometry/BBox.h2
-rw-r--r--source/blender/freestyle/intern/geometry/FitCurve.cpp2
-rw-r--r--source/blender/freestyle/intern/geometry/GeomCleaner.cpp2
-rw-r--r--source/blender/freestyle/intern/geometry/normal_cycle.cpp2
4 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/geometry/BBox.h b/source/blender/freestyle/intern/geometry/BBox.h
index 71384d33bc6..0031a7ce860 100644
--- a/source/blender/freestyle/intern/geometry/BBox.h
+++ b/source/blender/freestyle/intern/geometry/BBox.h
@@ -22,6 +22,7 @@
* \brief A class to hold a bounding box
*/
+/* clang-format off */
#include <stdlib.h>
#include <algorithm>
@@ -30,6 +31,7 @@
#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 e7d67756535..bfc5e16aa2a 100644
--- a/source/blender/freestyle/intern/geometry/FitCurve.cpp
+++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp
@@ -20,11 +20,13 @@
* \brief from "Graphics Gems", Academic Press, 1990
*/
+/* clang-format off */
#include <cstdlib> // for malloc and free
#include <stdio.h>
#include <math.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 9fb830c056c..a7db17a4015 100644
--- a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
+++ b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
@@ -19,6 +19,7 @@
* \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;
@@ -38,6 +39,7 @@
#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 25a39619a04..5820bdc4865 100644
--- a/source/blender/freestyle/intern/geometry/normal_cycle.cpp
+++ b/source/blender/freestyle/intern/geometry/normal_cycle.cpp
@@ -29,8 +29,10 @@
* \ingroup freestyle
*/
+/* clang-format off */
#include "matrix_util.h"
#include "normal_cycle.h"
+/* clang-format on */
namespace Freestyle {