jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into c++11

Browse source
This commit is contained in:
Marius Kintel 2014-06-07 17:49:29 -04:00
commit 19cea6f3a8
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boost.pri
View file

@ -55,7 +55,9 @@ boost {
BMT_TEST1 = /usr/lib64/libboost*thread-mt*
BMT_TEST2 = /usr/lib/libboost*thread-mt*
BMT_TEST3 = /usr/pkg/lib/libboost*thread-mt* # netbsd
exists($$BMT_TEST1)|exists($$BMT_TEST2)|exists($$BMT_TEST3) {
BMT_TEST4 = /usr/local/lib/libboost*thread-mt* # homebrew
BMT_TEST5 = /opt/local/lib/libboost*thread-mt* # macports
exists($$BMT_TEST1)|exists($$BMT_TEST2)|exists($$BMT_TEST3)|exists($$BMT_TEST4)|exists($$BMT_TEST5) {
BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt
}
}

4
src/clipper-utils.cc
View file

@ -48,7 +48,9 @@ namespace ClipperUtils {
const ClipperLib::PolyNode *node = poly.GetFirst();
while (node) {
Outline2d outline;
outline.positive = !node->IsHole();
// Apparently, when using offset(), clipper gets the hole status wrong
//outline.positive = !node->IsHole();
outline.positive = Orientation(node->Contour);
ClipperLib::Path cleaned_path;
ClipperLib::CleanPolygon(node->Contour, cleaned_path, CLEANING_DISTANCE);