diff options
Diffstat (limited to 'source/blender/freestyle/intern/geometry')
3 files changed, 6 insertions, 22 deletions
diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.cpp b/source/blender/freestyle/intern/geometry/GeomUtils.cpp index 925bc3c9f94..51727fd2288 100644 --- a/source/blender/freestyle/intern/geometry/GeomUtils.cpp +++ b/source/blender/freestyle/intern/geometry/GeomUtils.cpp @@ -21,9 +21,7 @@ #include "GeomUtils.h" -namespace Freestyle { - -namespace GeomUtils { +namespace Freestyle::GeomUtils { // This internal procedure is defined below. bool intersect2dSegPoly(Vec2r *seg, Vec2r *poly, unsigned n); @@ -846,6 +844,4 @@ inline void fromCoordAToCoordB(const Vec3r &p, Vec3r &q, const real transform[4] } } -} // end of namespace GeomUtils - -} /* namespace Freestyle */ +} // namespace Freestyle::GeomUtils diff --git a/source/blender/freestyle/intern/geometry/matrix_util.cpp b/source/blender/freestyle/intern/geometry/matrix_util.cpp index 637c2d05574..5b5d9582e8f 100644 --- a/source/blender/freestyle/intern/geometry/matrix_util.cpp +++ b/source/blender/freestyle/intern/geometry/matrix_util.cpp @@ -33,11 +33,7 @@ #include "BLI_math.h" -namespace Freestyle { - -namespace OGF { - -namespace MatrixUtil { +namespace Freestyle::OGF::MatrixUtil { static const double EPS = 0.00001; static int MAX_ITER = 100; @@ -252,8 +248,4 @@ void semi_definite_symmetric_eigen(const double *mat, int n, double *eigen_vec, //_________________________________________________________ -} // namespace MatrixUtil - -} // namespace OGF - -} /* namespace Freestyle */ +} // namespace Freestyle::OGF::MatrixUtil diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.cpp b/source/blender/freestyle/intern/geometry/normal_cycle.cpp index d02b5cc2d5b..01d52646eb0 100644 --- a/source/blender/freestyle/intern/geometry/normal_cycle.cpp +++ b/source/blender/freestyle/intern/geometry/normal_cycle.cpp @@ -32,9 +32,7 @@ #include "normal_cycle.h" #include "matrix_util.h" -namespace Freestyle { - -namespace OGF { +namespace Freestyle::OGF { //_________________________________________________________ @@ -88,6 +86,4 @@ void NormalCycle::end() //_________________________________________________________ -} // namespace OGF - -} /* namespace Freestyle */ +} // namespace Freestyle::OGF |