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

imgui: Fix ENABLE_IMGUI, disable on OS X for now

Browse source
This commit is contained in:
Vojtech Kral 2018-11-27 11:28:00 +01:00
parent db4ceaa5fa
commit 2585e3103d
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/GLGizmo.hpp
View file

@ -139,7 +139,7 @@ public:
void render(const GLCanvas3D::Selection& selection) const { on_render(selection); }
void render_for_picking(const GLCanvas3D::Selection& selection) const { on_render_for_picking(selection); }
#ifndef ENABLE_IMGUI
#if !ENABLE_IMGUI
virtual void create_external_gizmo_widgets(wxWindow *parent);
#endif // not ENABLE_IMGUI
@ -485,7 +485,7 @@ private:
bool is_mesh_update_necessary() const;
void update_mesh();
#ifndef ENABLE_IMGUI
#if !ENABLE_IMGUI
void render_tooltip_texture() const;
mutable GLTexture m_tooltip_texture;
mutable GLTexture m_reset_texture;
@ -508,7 +508,7 @@ protected:
};
#ifndef ENABLE_IMGUI
#if !ENABLE_IMGUI
class GLGizmoCutPanel;
#endif // not ENABLE_IMGUI
@ -526,17 +526,17 @@ class GLGizmoCut : public GLGizmoBase
bool m_keep_upper;
bool m_keep_lower;
bool m_rotate_lower;
#ifndef ENABLE_IMGUI
#if !ENABLE_IMGUI
GLGizmoCutPanel *m_panel;
#endif // not ENABLE_IMGUI
public:
explicit GLGizmoCut(GLCanvas3D& parent);
#ifndef ENABLE_IMGUI
#if !ENABLE_IMGUI
virtual void create_external_gizmo_widgets(wxWindow *parent);
#endif // not ENABLE_IMGUI
#ifndef ENABLE_IMGUI
#if !ENABLE_IMGUI
#endif // not ENABLE_IMGUI
protected: