diff options
| author | bubnikv <bubnikv@gmail.com> | 2020-03-23 20:51:10 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2020-03-23 21:20:54 +0300 |
| commit | 580d739d6f377fcf76456051e1816aae2fb35bad (patch) | |
| tree | 9c266d187679ba812cd0bc132ffc27fc36ab3c5c /src/clipper/clipper.cpp | |
| parent | 22d9fcb27f0fba76e4fffe86fde4034ea0b8e32f (diff) | |
| parent | d5bcddeed333e6be567de517bc22c69fc5559b7e (diff) | |
Merging version_2.2.0 final into stable
Merge commit 'd5bcddeed333e6be567de517bc22c69fc5559b7e' into stable
Diffstat (limited to 'src/clipper/clipper.cpp')
| -rw-r--r-- | src/clipper/clipper.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/clipper/clipper.cpp b/src/clipper/clipper.cpp index 228e0c6ef..b85cf9025 100644 --- a/src/clipper/clipper.cpp +++ b/src/clipper/clipper.cpp @@ -51,7 +51,11 @@ #include <Shiny/Shiny.h> #include <libslic3r/Int128.hpp> +#ifdef use_xyz +namespace ClipperLib_Z { +#else /* use_xyz */ namespace ClipperLib { +#endif /* use_xyz */ static double const pi = 3.141592653589793238; static double const two_pi = pi *2; @@ -1616,7 +1620,7 @@ void Clipper::SetZ(IntPoint& pt, TEdge& e1, TEdge& e2) else if (pt == e1.Top) pt.Z = e1.Top.Z; else if (pt == e2.Bot) pt.Z = e2.Bot.Z; else if (pt == e2.Top) pt.Z = e2.Top.Z; - else (*m_ZFill)(e1.Bot, e1.Top, e2.Bot, e2.Top, pt); + else m_ZFill(e1.Bot, e1.Top, e2.Bot, e2.Top, pt); } //------------------------------------------------------------------------------ #endif |