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 branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring

Browse source
This commit is contained in:
Enrico Turri 2019-03-28 09:30:23 +01:00
commit af3a32b8a0
325 changed files with 510 additions and 116396 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -154,6 +154,7 @@ private:
// Model, not owned.
Model* m_model;
bool m_enabled;
bool m_valid;
EMode m_mode;
EType m_type;
@ -180,6 +181,9 @@ public:
void set_volumes(GLVolumePtrs* volumes);
bool init(bool useVBOs);
bool is_enabled() const { return m_enabled; }
void set_enabled(bool enable) { m_enabled = enable; }
Model* get_model() const { return m_model; }
void set_model(Model* model);