mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-17 11:47:54 -06:00
FIX: auto-arrange ignores wipe tower due to supports
Wipe tower is needed if support base and interface use different materials. Jira: STUDIO-1336 Change-Id: I006ece952aac1a0f0a57721c2cd1b52b2ceee28a (cherry picked from commit 1a387e4b1607dee36f5abe499892f027e244fbeb)
This commit is contained in:
parent
fb4f30a4a4
commit
9f96c8adec
7 changed files with 57 additions and 54 deletions
|
@ -71,10 +71,10 @@ template<class T> struct PtrWrapper
|
|||
|
||||
explicit PtrWrapper(T* p) : ptr{ p } {}
|
||||
|
||||
arrangement::ArrangePolygon get_arrange_polygon() const
|
||||
arrangement::ArrangePolygon get_arrange_polygon(const Slic3r::DynamicPrintConfig &config = Slic3r::DynamicPrintConfig()) const
|
||||
{
|
||||
arrangement::ArrangePolygon ap;
|
||||
ptr->get_arrange_polygon(&ap);
|
||||
ptr->get_arrange_polygon(&ap, config);
|
||||
return ap;
|
||||
}
|
||||
|
||||
|
@ -86,12 +86,12 @@ template<class T> struct PtrWrapper
|
|||
};
|
||||
|
||||
template<class T>
|
||||
arrangement::ArrangePolygon get_arrange_poly(T obj);
|
||||
arrangement::ArrangePolygon get_arrange_poly(T obj, const DynamicPrintConfig &config = DynamicPrintConfig());
|
||||
|
||||
template<>
|
||||
arrangement::ArrangePolygon get_arrange_poly(ModelInstance* inst);
|
||||
arrangement::ArrangePolygon get_arrange_poly(ModelInstance* inst, const DynamicPrintConfig& config);
|
||||
|
||||
ArrangePolygon get_instance_arrange_poly(ModelInstance* instance, const Slic3r::DynamicPrintConfig& config);
|
||||
ArrangePolygon get_instance_arrange_poly(ModelInstance* instance, const DynamicPrintConfig& config);
|
||||
}
|
||||
|
||||
#endif // MODELARRANGE_HPP
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue