diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2019-10-09 12:17:48 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2019-10-09 12:17:48 +0300 |
| commit | 835ee148e5f252fd90823abb25dd3b9eb79b2999 (patch) | |
| tree | 1f5126b73fe8502a71e268e4d4d3a0a27f946a36 /src/slic3r/GUI/Plater.hpp | |
| parent | 59a6318931ca36781e57d3c3687665967fdb3526 (diff) | |
| parent | 2dc9949a4c129a448d0a5881ac2d2d165e2fea4c (diff) | |
Fixed conflicts after merging with master
Diffstat (limited to 'src/slic3r/GUI/Plater.hpp')
| -rw-r--r-- | src/slic3r/GUI/Plater.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index de99b278d..00ceb89bc 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -187,6 +187,7 @@ public: void export_stl(bool extended = false, bool selection_only = false); void export_amf(); void export_3mf(const boost::filesystem::path& output_path = boost::filesystem::path()); + void reload_from_disk(); bool has_toolpaths_to_export() const; void export_toolpaths_to_obj() const; void reslice(); @@ -253,6 +254,7 @@ public: bool can_copy_to_clipboard() const; bool can_undo() const; bool can_redo() const; + bool can_reload_from_disk() const; void msw_rescale(); |