3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into fs_emboss

Browse source
This commit is contained in:
Filip Sykala 2022-03-30 09:29:06 +02:00
commit 4acdd76fff
10 changed files with 194 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/Plater.hpp
View file

@ -32,6 +32,7 @@ using ModelObjectCutAttributes = enum_bitmask<ModelObjectCutAttribute>;
class ModelInstance;
class Print;
class SLAPrint;
enum PrintObjectStep : unsigned int;
enum SLAPrintObjectStep : unsigned int;
enum class ConversionType : int;
@ -265,6 +266,7 @@ public:
bool has_toolpaths_to_export() const;
void export_toolpaths_to_obj() const;
void reslice();
void reslice_FFF_until_step(PrintObjectStep step, const ModelObject &object, bool postpone_error_messages = false);
void reslice_SLA_supports(const ModelObject &object, bool postpone_error_messages = false);
void reslice_SLA_hollowing(const ModelObject &object, bool postpone_error_messages = false);
void reslice_SLA_until_step(SLAPrintObjectStep step, const ModelObject &object, bool postpone_error_messages = false);
@ -478,6 +480,8 @@ public:
static void show_illegal_characters_warning(wxWindow* parent);
private:
void reslice_until_step_inner(int step, const ModelObject &object, bool postpone_error_messages);
struct priv;
std::unique_ptr<priv> p;