diff options
Diffstat (limited to 'source/blender/freestyle/intern/geometry')
16 files changed, 16 insertions, 64 deletions
diff --git a/source/blender/freestyle/intern/geometry/BBox.h b/source/blender/freestyle/intern/geometry/BBox.h index a8965e63451..d9a070faa55 100644 --- a/source/blender/freestyle/intern/geometry/BBox.h +++ b/source/blender/freestyle/intern/geometry/BBox.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BBOX_H__ -#define __BBOX_H__ +#pragma once /** \file * \ingroup freestyle @@ -156,5 +155,3 @@ template<class Point> BBox<Point> &operator+(const BBox<Point> &b1, const BBox<P } } /* namespace Freestyle */ - -#endif // __BBOX_H__ diff --git a/source/blender/freestyle/intern/geometry/Bezier.h b/source/blender/freestyle/intern/geometry/Bezier.h index adcd6e3a652..4c6b38935f9 100644 --- a/source/blender/freestyle/intern/geometry/Bezier.h +++ b/source/blender/freestyle/intern/geometry/Bezier.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __BEZIER_H__ -#define __BEZIER_H__ +#pragma once /** \file * \ingroup freestyle @@ -92,5 +91,3 @@ class BezierCurve { }; } /* namespace Freestyle */ - -#endif // __BEZIER_H__ diff --git a/source/blender/freestyle/intern/geometry/FastGrid.h b/source/blender/freestyle/intern/geometry/FastGrid.h index 367c233d799..ec47f36d644 100644 --- a/source/blender/freestyle/intern/geometry/FastGrid.h +++ b/source/blender/freestyle/intern/geometry/FastGrid.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FASTGRID_H__ -#define __FASTGRID_H__ +#pragma once /** \file * \ingroup freestyle @@ -76,5 +75,3 @@ class FastGrid : public Grid { }; } /* namespace Freestyle */ - -#endif // __FASTGRID_H__ diff --git a/source/blender/freestyle/intern/geometry/FitCurve.h b/source/blender/freestyle/intern/geometry/FitCurve.h index 92afd685d8f..c08dc52249e 100644 --- a/source/blender/freestyle/intern/geometry/FitCurve.h +++ b/source/blender/freestyle/intern/geometry/FitCurve.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __FITCURVE_H__ -#define __FITCURVE_H__ +#pragma once /** \file * \ingroup freestyle @@ -109,5 +108,3 @@ class FitCurveWrapper { }; } /* namespace Freestyle */ - -#endif // __FITCURVE_H__ diff --git a/source/blender/freestyle/intern/geometry/Geom.h b/source/blender/freestyle/intern/geometry/Geom.h index 63785d56cab..53703c3497a 100644 --- a/source/blender/freestyle/intern/geometry/Geom.h +++ b/source/blender/freestyle/intern/geometry/Geom.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __GEOM_H__ -#define __GEOM_H__ +#pragma once /** \file * \ingroup freestyle @@ -69,5 +68,3 @@ typedef VecMat::SquareMatrix<real, 4> Matrix44r; } // end of namespace Geometry } /* namespace Freestyle */ - -#endif // __GEOM_H__ diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.h b/source/blender/freestyle/intern/geometry/GeomCleaner.h index aee8ed6963d..7abbf881548 100644 --- a/source/blender/freestyle/intern/geometry/GeomCleaner.h +++ b/source/blender/freestyle/intern/geometry/GeomCleaner.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __GEOMCLEANER_H__ -#define __GEOMCLEANER_H__ +#pragma once /** \file * \ingroup freestyle @@ -257,5 +256,3 @@ bool operator<(const IndexedVertex &iv1, const IndexedVertex &iv2) #endif } /* namespace Freestyle */ - -#endif // __GEOMCLEANER_H__ diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.h b/source/blender/freestyle/intern/geometry/GeomUtils.h index 635808aab4b..46cd307d9af 100644 --- a/source/blender/freestyle/intern/geometry/GeomUtils.h +++ b/source/blender/freestyle/intern/geometry/GeomUtils.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __GEOMUTILS_H__ -#define __GEOMUTILS_H__ +#pragma once /** \file * \ingroup freestyle @@ -266,5 +265,3 @@ void fromCameraToWorld(const Vec3r &p, Vec3r &q, const real model_view_matrix[4] } // end of namespace GeomUtils } /* namespace Freestyle */ - -#endif // __GEOMUTILS_H__ diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h index c1a8dcdb370..b66f04398af 100644 --- a/source/blender/freestyle/intern/geometry/Grid.h +++ b/source/blender/freestyle/intern/geometry/Grid.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __GRID_H__ -#define __GRID_H__ +#pragma once /** \file * \ingroup freestyle @@ -433,5 +432,3 @@ class VirtualOccludersSet { }; } /* namespace Freestyle */ - -#endif // __GRID_H__ diff --git a/source/blender/freestyle/intern/geometry/GridHelpers.h b/source/blender/freestyle/intern/geometry/GridHelpers.h index 3f3c669cb57..077688164b4 100644 --- a/source/blender/freestyle/intern/geometry/GridHelpers.h +++ b/source/blender/freestyle/intern/geometry/GridHelpers.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __GRIDHELPERS_H__ -#define __GRIDHELPERS_H__ +#pragma once /** \file * \ingroup freestyle @@ -212,5 +211,3 @@ inline void expandProscenium(real proscenium[4], const Vec3r &point) }; // namespace GridHelpers } /* namespace Freestyle */ - -#endif // __GRIDHELPERS_H__ diff --git a/source/blender/freestyle/intern/geometry/HashGrid.h b/source/blender/freestyle/intern/geometry/HashGrid.h index 4bb92859775..6fb7f2b9cbe 100644 --- a/source/blender/freestyle/intern/geometry/HashGrid.h +++ b/source/blender/freestyle/intern/geometry/HashGrid.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __HASHGRID_H__ -#define __HASHGRID_H__ +#pragma once /** \file * \ingroup freestyle @@ -104,5 +103,3 @@ class HashGrid : public Grid { }; } /* namespace Freestyle */ - -#endif // __HASHGRID_H__ diff --git a/source/blender/freestyle/intern/geometry/Noise.h b/source/blender/freestyle/intern/geometry/Noise.h index 18992092b19..27a91ded9e2 100644 --- a/source/blender/freestyle/intern/geometry/Noise.h +++ b/source/blender/freestyle/intern/geometry/Noise.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __NOISE_H__ -#define __NOISE_H__ +#pragma once /** \file * \ingroup freestyle @@ -81,5 +80,3 @@ class Noise { }; } /* namespace Freestyle */ - -#endif // __NOISE_H__ diff --git a/source/blender/freestyle/intern/geometry/Polygon.h b/source/blender/freestyle/intern/geometry/Polygon.h index b3f47c8ca77..f6f827fd0f2 100644 --- a/source/blender/freestyle/intern/geometry/Polygon.h +++ b/source/blender/freestyle/intern/geometry/Polygon.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __POLYGON_H__ -#define __POLYGON_H__ +#pragma once /** \file * \ingroup freestyle @@ -230,5 +229,3 @@ class Polygon3r : public Polygon<Vec3r> { } // end of namespace Geometry } /* namespace Freestyle */ - -#endif // __POLYGON_H__ diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h index b3555a4a160..d7d379d82f2 100644 --- a/source/blender/freestyle/intern/geometry/SweepLine.h +++ b/source/blender/freestyle/intern/geometry/SweepLine.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __SWEEPLINE_H__ -#define __SWEEPLINE_H__ +#pragma once /** \file * \ingroup freestyle @@ -347,5 +346,3 @@ template<class T, class Point> class SweepLine { }; } /* namespace Freestyle */ - -#endif // __SWEEPLINE_H__ diff --git a/source/blender/freestyle/intern/geometry/VecMat.h b/source/blender/freestyle/intern/geometry/VecMat.h index ee1cc42876c..64c3213560c 100644 --- a/source/blender/freestyle/intern/geometry/VecMat.h +++ b/source/blender/freestyle/intern/geometry/VecMat.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __VECMAT_H__ -#define __VECMAT_H__ +#pragma once /** \file * \ingroup freestyle @@ -1005,5 +1004,3 @@ inline std::ostream &operator<<(std::ostream &s, const Matrix<T, M, N> &m) } // end of namespace VecMat } /* namespace Freestyle */ - -#endif // __VECMAT_H__ diff --git a/source/blender/freestyle/intern/geometry/matrix_util.h b/source/blender/freestyle/intern/geometry/matrix_util.h index f42e043ca97..996ebc928a1 100644 --- a/source/blender/freestyle/intern/geometry/matrix_util.h +++ b/source/blender/freestyle/intern/geometry/matrix_util.h @@ -25,8 +25,7 @@ * FRANCE */ -#ifndef __MATRIX_UTIL__ -#define __MATRIX_UTIL__ +#pragma once /** \file * \ingroup freestyle @@ -61,5 +60,3 @@ void semi_definite_symmetric_eigen(const double *mat, int n, double *eigen_vec, } // namespace OGF } /* namespace Freestyle */ - -#endif // __MATRIX_UTIL__ diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.h b/source/blender/freestyle/intern/geometry/normal_cycle.h index a57bfdb953e..6ac9779e7c2 100644 --- a/source/blender/freestyle/intern/geometry/normal_cycle.h +++ b/source/blender/freestyle/intern/geometry/normal_cycle.h @@ -25,8 +25,7 @@ * FRANCE */ -#ifndef __MESH_TOOLS_MATH_NORMAL_CYCLE__ -#define __MESH_TOOLS_MATH_NORMAL_CYCLE__ +#pragma once /** \file * \ingroup freestyle @@ -145,5 +144,3 @@ inline void NormalCycle::accumulate_dihedral_angle(const Vec3r &edge, } // namespace OGF } /* namespace Freestyle */ - -#endif // __MESH_TOOLS_MATH_NORMAL_CYCLE__ |