Merge branch 'dev2' of https://github.com/prusa3d/Slic3r into dev_native

This commit is contained in:
Enrico Turri 2018-10-03 13:38:57 +02:00
commit 2d77d51f84
3 changed files with 9 additions and 0 deletions

View file

@ -198,6 +198,7 @@ public:
void calculate_convex_hull();
const TriangleMesh& get_convex_hull() const;
TriangleMesh& get_convex_hull();
// Helpers for loading / storing into AMF / 3MF files.
static Type type_from_string(const std::string &s);