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

Merge remote-tracking branch 'origin/master' into ys_search

Browse source
This commit is contained in:
YuSanka 2020-03-25 11:20:34 +01:00
commit 45d064d4cb
82 changed files with 12211 additions and 6689 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,14 +10,11 @@
#include "Preset.hpp"
#include "3DScene.hpp"
#include "GLTexture.hpp"
#include "libslic3r/BoundingBox.hpp"
#include "wxExtensions.hpp"
class wxButton;
class ScalableButton;
class wxBoxSizer;
class wxGLCanvas;
class wxScrolledWindow;
class wxString;
@ -30,9 +27,9 @@ class SLAPrint;
enum SLAPrintObjectStep : unsigned int;
namespace UndoRedo {
class Stack;
struct Snapshot;
};
class Stack;
struct Snapshot;
}
namespace GUI {
@ -44,6 +41,7 @@ class ObjectLayers;
class ObjectList;
class GLCanvas3D;
class Mouse3DController;
struct Camera;
using t_optgroups = std::vector <std::shared_ptr<ConfigOptionsGroup>>;
@ -71,7 +69,7 @@ public:
void set_extruder_idx(const int extr_idx) { extruder_idx = extr_idx; }
int get_extruder_idx() const { return extruder_idx; }
int em_unit() const { return m_em_unit; }
void check_selection();
void check_selection(int selection);
void msw_rescale();
@ -201,7 +199,6 @@ public:
void reload_all_from_disk();
bool has_toolpaths_to_export() const;
void export_toolpaths_to_obj() const;
void hollow();
void reslice();
void reslice_SLA_supports(const ModelObject &object, bool postpone_error_messages = false);
void reslice_SLA_hollowing(const ModelObject &object, bool postpone_error_messages = false);