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

Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp

Browse source
This commit is contained in:
Enrico Turri 2018-06-27 13:52:57 +02:00
commit 48915a65fd
9 changed files with 29 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xs/src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -412,9 +412,6 @@ private:
Model* m_model;
bool m_dirty;
// the active member has been introduced to overcome a bug in wxWidgets method IsShownOnScreen() which always return true
// when a window is inside a wxNotebook
bool m_active;
bool m_initialized;
bool m_use_VBOs;
bool m_force_zoom_to_bed_enabled;
@ -457,14 +454,13 @@ private:
PerlCallback m_on_update_geometry_info_callback;
public:
GLCanvas3D(wxGLCanvas* canvas, wxGLContext* context);
GLCanvas3D(wxGLCanvas* canvas);
~GLCanvas3D();
bool init(bool useVBOs, bool use_legacy_opengl);
bool set_current(bool force);
bool set_current();
void set_active(bool active);
void set_as_dirty();
unsigned int get_volumes_count() const;