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 'remotes/origin/master' into lm_sla_supports_auto2

Browse source
This commit is contained in:
bubnikv 2019-02-06 11:11:51 +01:00
commit d31cb98fe9
59 changed files with 7616 additions and 364 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -938,6 +938,7 @@ public:
void set_context(wxGLContext* context) { m_context = context; }
wxGLCanvas* get_wxglcanvas() { return m_canvas; }
const wxGLCanvas* get_wxglcanvas() const { return m_canvas; }
void set_view_toolbar(GLToolbar* toolbar) { m_view_toolbar = toolbar; }