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

Calls to GLCanvas3D::_set_current() made only after the canvas has been initialized

Browse source
This commit is contained in:
Enrico Turri 2019-02-04 16:05:54 +01:00
parent b8d6c6bbb2
commit b3c3881282
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -4206,6 +4206,9 @@ unsigned int GLCanvas3D::get_volumes_count() const
void GLCanvas3D::reset_volumes() void GLCanvas3D::reset_volumes()
{ {
if (!m_initialized)
return;
_set_current(); _set_current();
if (!m_volumes.empty()) if (!m_volumes.empty())
@ -4254,6 +4257,7 @@ void GLCanvas3D::set_bed_shape(const Pointfs& shape)
// Set the origin and size for painting of the coordinate system axes. // Set the origin and size for painting of the coordinate system axes.
m_axes.origin = Vec3d(0.0, 0.0, (double)GROUND_Z); m_axes.origin = Vec3d(0.0, 0.0, (double)GROUND_Z);
set_bed_axes_length(0.1 * m_bed.get_bounding_box().max_size()); set_bed_axes_length(0.1 * m_bed.get_bounding_box().max_size());
m_camera.set_scene_box(scene_bounding_box(), *this);
m_requires_zoom_to_bed = true; m_requires_zoom_to_bed = true;
m_dirty = true; m_dirty = true;
@ -4688,7 +4692,8 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
if ((m_canvas == nullptr) || (m_config == nullptr) || (m_model == nullptr)) if ((m_canvas == nullptr) || (m_config == nullptr) || (m_model == nullptr))
return; return;
_set_current(); if (m_initialized)
_set_current();
struct ModelVolumeState { struct ModelVolumeState {
ModelVolumeState(const GLVolume *volume) : ModelVolumeState(const GLVolume *volume) :
@ -5748,8 +5753,11 @@ Point GLCanvas3D::get_local_mouse_position() const
void GLCanvas3D::reset_legend_texture() void GLCanvas3D::reset_legend_texture()
{ {
_set_current(); if (m_legend_texture.get_id() != 0)
m_legend_texture.reset(); {
_set_current();
m_legend_texture.reset();
}
} }
void GLCanvas3D::set_tooltip(const std::string& tooltip) const void GLCanvas3D::set_tooltip(const std::string& tooltip) const

4
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -419,10 +419,6 @@ void Preview::reload_print(bool force)
m_canvas->reset_legend_texture(); m_canvas->reset_legend_texture();
m_loaded = false; m_loaded = false;
#if ENABLE_REWORKED_BED_SHAPE_CHANGE
m_canvas->set_bed_shape(dynamic_cast<const ConfigOptionPoints*>(m_config->option("bed_shape"))->values);
#endif // ENABLE_REWORKED_BED_SHAPE_CHANGE
if (!IsShown() && !force) if (!IsShown() && !force)
return; return;