3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix for issue #2765, arrange crash with custom beds

Browse source
This commit is contained in:
tamasmeszaros 2019-08-15 16:15:17 +02:00
parent 15744f021a
commit 8fce511806
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libslic3r/Arrange.cpp
View file

@ -492,8 +492,11 @@ BedShapeHint::BedShapeHint(const Polyline &bed) {
m_type = BedShapes::bsCircle; m_type = BedShapes::bsCircle;
m_bed.circ = c; m_bed.circ = c;
} else { } else {
if (m_type == BedShapes::bsIrregular)
m_bed.polygon.Slic3r::Polyline::~Polyline();
m_type = BedShapes::bsIrregular; m_type = BedShapes::bsIrregular;
m_bed.polygon = bed; ::new (&m_bed.polygon) Polyline(bed);
} }
} }

6
src/libslic3r/Arrange.hpp
View file

@ -45,12 +45,12 @@ class BedShapeHint {
Polyline polygon; Polyline polygon;
InfiniteBed infbed{}; InfiniteBed infbed{};
~BedShape_u() {} ~BedShape_u() {}
BedShape_u() {}; BedShape_u() {}
} m_bed; } m_bed;
public: public:
BedShapeHint(){}; BedShapeHint(){}
/// Get a bed shape hint for arrange() from a naked Polyline. /// Get a bed shape hint for arrange() from a naked Polyline.
explicit BedShapeHint(const Polyline &polyl); explicit BedShapeHint(const Polyline &polyl);
@ -73,7 +73,7 @@ public:
{ {
if (m_type == BedShapes::bsIrregular) if (m_type == BedShapes::bsIrregular)
m_bed.polygon.Slic3r::Polyline::~Polyline(); m_bed.polygon.Slic3r::Polyline::~Polyline();
}; }
BedShapeHint(const BedShapeHint &cpy) { *this = cpy; } BedShapeHint(const BedShapeHint &cpy) { *this = cpy; }
BedShapeHint(BedShapeHint &&cpy) { *this = std::move(cpy); } BedShapeHint(BedShapeHint &&cpy) { *this = std::move(cpy); }