Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail

2019-10-25 13:59:27 +02:00
parent 2d5c28d6d1 5c0cd06f2f
commit bab4f51bc8
25 changed files with 3147 additions and 162 deletions
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -224,6 +224,7 @@ target_link_libraries(libslic3r
    qhull
    semver
    TBB::tbb
+    # OpenVDB::openvdb
    ${CMAKE_DL_LIBS}
    )