diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2018-06-27 13:05:23 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2018-06-27 13:05:23 +0300 |
| commit | 23d10fdadc7810eeec999c1e34f81f5d55d3cda6 (patch) | |
| tree | 5a55e90a5dc20933478ed6d6773d4154eceff205 /xs | |
| parent | 5c323474499b133d7994da296b1d906bbc1e656a (diff) | |
2nd attempt to fix opengl on ubuntu
Diffstat (limited to 'xs')
| -rw-r--r-- | xs/src/slic3r/GUI/GLCanvas3D.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/xs/src/slic3r/GUI/GLCanvas3D.cpp b/xs/src/slic3r/GUI/GLCanvas3D.cpp index 04b134b41..d44106337 100644 --- a/xs/src/slic3r/GUI/GLCanvas3D.cpp +++ b/xs/src/slic3r/GUI/GLCanvas3D.cpp @@ -1553,7 +1553,7 @@ bool GLCanvas3D::set_current() if ((m_canvas != nullptr) && (m_context != nullptr)) // if (m_active && (m_canvas != nullptr) && (m_context != nullptr)) { - std::cout << "set_current: " << (void*)m_canvas << " - " << (void*)m_context << std::endl; +// std::cout << "set_current: " << (void*)m_canvas << " - " << (void*)m_context << std::endl; return m_canvas->SetCurrent(*m_context); } return false; @@ -1698,6 +1698,10 @@ void GLCanvas3D::set_bed_shape(const Pointfs& shape) // Set the origin and size for painting of the coordinate system axes. m_axes.origin = Pointf3(0.0, 0.0, (coordf_t)GROUND_Z); set_axes_length(0.3f * (float)m_bed.get_bounding_box().max_size()); + +//########################################################################################################################### + m_dirty = true; +//########################################################################################################################### } void GLCanvas3D::set_auto_bed_shape() @@ -3059,7 +3063,10 @@ Point GLCanvas3D::get_local_mouse_position() const bool GLCanvas3D::_is_shown_on_screen() const { - return (m_canvas != nullptr) ? m_active && m_canvas->IsShownOnScreen() : false; +//################################################################################################################# + return (m_canvas != nullptr) ? m_canvas->IsShownOnScreen() : false; +// return (m_canvas != nullptr) ? m_active && m_canvas->IsShownOnScreen() : false; +//################################################################################################################# } void GLCanvas3D::_force_zoom_to_bed() |