diff options
author | Dalai Felinto <dalai@blender.org> | 2020-03-06 18:45:16 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-03-06 19:26:32 +0300 |
commit | 85424397b1847d80d7a0b6bcbf7cb3c3aa3d0181 (patch) | |
tree | d009ab527aad3b4a451f6dfaab75f62c6348dc83 /source/blender/freestyle/intern/view_map | |
parent | 96e2bd84932a826d09b7ed2201ba67a0a74f0b29 (diff) |
Cleanup: tweak Freestyle #includes in preparation for clang-format sorting
Diffstat (limited to 'source/blender/freestyle/intern/view_map')
7 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/view_map/GridDensityProvider.h b/source/blender/freestyle/intern/view_map/GridDensityProvider.h index 8d6ba521dde..26b76006686 100644 --- a/source/blender/freestyle/intern/view_map/GridDensityProvider.h +++ b/source/blender/freestyle/intern/view_map/GridDensityProvider.h @@ -22,6 +22,7 @@ * \brief Class to define a cell grid surrounding the projected image of a scene */ +/* clang-format off */ #include <stdexcept> #include <algorithm> #include <memory> @@ -36,6 +37,7 @@ #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" #endif +/* clang-format on */ namespace Freestyle { diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp index 66af24507d7..2c7560259fe 100644 --- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp +++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp @@ -20,6 +20,7 @@ * implies that this geom engine has as member data the viewpoint, transformations, projections... */ +/* clang-format off */ #include <cstring> #include <cstdio> @@ -29,6 +30,7 @@ #include "../geometry/GeomUtils.h" #include "BKE_global.h" +/* clang-format on */ using namespace std; diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.h b/source/blender/freestyle/intern/view_map/SphericalGrid.h index c32ceb09805..3c1ca3b5992 100644 --- a/source/blender/freestyle/intern/view_map/SphericalGrid.h +++ b/source/blender/freestyle/intern/view_map/SphericalGrid.h @@ -24,6 +24,7 @@ #define SPHERICAL_GRID_LOGGING 0 +/* clang-format off */ // I would like to avoid using deque because including ViewMap.h and <deque> or <vector> separately // results in redefinitions of identifiers. ViewMap.h already includes <vector> so it should be a // safe fall-back. @@ -47,6 +48,7 @@ #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" #endif +/* clang-format on */ namespace Freestyle { diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp index bc2597c02d5..fd8f7958e83 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp @@ -20,6 +20,7 @@ * to. */ +/* clang-format off */ #include <sstream> #include "Silhouette.h" @@ -37,6 +38,7 @@ extern "C" { #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" } +/* clang-format on */ namespace Freestyle { diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp index c371eba4b94..5ea28e4ac41 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp @@ -19,6 +19,7 @@ * \brief Classes to define a View Map (ViewVertex, ViewEdge, etc.) */ +/* clang-format off */ #include <float.h> #include "ViewMap.h" @@ -26,6 +27,7 @@ #include "ViewMapAdvancedIterators.h" #include "../geometry/GeomUtils.h" +/* clang-format on */ namespace Freestyle { diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index c67be4f97b3..681237399a8 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -19,6 +19,7 @@ * \brief Class to build silhouette edges from a Winged-Edge structure */ +/* clang-format off */ #include <algorithm> #include <memory> #include <stdexcept> @@ -39,6 +40,7 @@ #include "../winged_edge/WFillGrid.h" #include "BKE_global.h" +/* clang-format on */ namespace Freestyle { diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h index 1b99c270095..33ef6858541 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h +++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h @@ -22,6 +22,7 @@ * \brief Class to build a Node Tree designed to be displayed from a Silhouette View Map structure. */ +/* clang-format off */ #include "Silhouette.h" #include "ViewMap.h" @@ -36,6 +37,7 @@ #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" #endif +/* clang-format on */ namespace Freestyle { |