mirror of
https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git
synced 2026-05-27 03:09:34 -07:00
Merge branch 'dev2' of https://github.com/prusa3d/Slic3r into dev_native
This commit is contained in:
@@ -1004,6 +1004,11 @@ const TriangleMesh& ModelVolume::get_convex_hull() const
|
||||
return m_convex_hull;
|
||||
}
|
||||
|
||||
TriangleMesh& ModelVolume::get_convex_hull()
|
||||
{
|
||||
return m_convex_hull;
|
||||
}
|
||||
|
||||
ModelVolume::Type ModelVolume::type_from_string(const std::string &s)
|
||||
{
|
||||
// Legacy support
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user