3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

One more fix of ENABLE_IMGUI

Browse Source
This commit is contained in:
Vojtech Kral 2018-11-27 12:00:44 +01:00
parent 2585e3103d
commit d0b6beaaaa
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GLGizmo.cpp
View File

@ -166,7 +166,9 @@ GLGizmoBase::GLGizmoBase(GLCanvas3D& parent)
#endif // ENABLE_GIZMOS_SHORTCUT #endif // ENABLE_GIZMOS_SHORTCUT
, m_hover_id(-1) , m_hover_id(-1)
, m_dragging(false) , m_dragging(false)
#if ENABLE_IMGUI
, m_imgui(wxGetApp().imgui()) , m_imgui(wxGetApp().imgui())
#endif // ENABLE_IMGUI
{ {
::memcpy((void*)m_base_color, (const void*)DEFAULT_BASE_COLOR, 3 * sizeof(float)); ::memcpy((void*)m_base_color, (const void*)DEFAULT_BASE_COLOR, 3 * sizeof(float));
::memcpy((void*)m_drag_color, (const void*)DEFAULT_DRAG_COLOR, 3 * sizeof(float)); ::memcpy((void*)m_drag_color, (const void*)DEFAULT_DRAG_COLOR, 3 * sizeof(float));

4
src/slic3r/GUI/GLGizmo.hpp
View File

@ -25,7 +25,9 @@ class ModelObject;
namespace GUI { namespace GUI {
class GLCanvas3D; class GLCanvas3D;
#if ENABLE_IMGUI
class ImGuiWrapper; class ImGuiWrapper;
#endif // ENABLE_IMGUI
class GLGizmoBase class GLGizmoBase
{ {
@ -91,7 +93,9 @@ protected:
float m_drag_color[3]; float m_drag_color[3];
float m_highlight_color[3]; float m_highlight_color[3];
mutable std::vector<Grabber> m_grabbers; mutable std::vector<Grabber> m_grabbers;
#if ENABLE_IMGUI
ImGuiWrapper* m_imgui; ImGuiWrapper* m_imgui;
#endif // ENABLE_IMGUI
public: public:
explicit GLGizmoBase(GLCanvas3D& parent); explicit GLGizmoBase(GLCanvas3D& parent);