3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge remote-tracking branch 'remotes/origin/dev_native' into vb_dev_native_background_processing

Browse source
This commit is contained in:
bubnikv 2018-10-23 12:59:31 +02:00
commit f33713e060
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2893,11 +2893,11 @@ void GLCanvas3D::reset_volumes()
return;
#endif // !ENABLE_USE_UNIQUE_GLCONTEXT
m_volumes.release_geometry();
m_volumes.clear();
#if ENABLE_EXTENDED_SELECTION
m_selection.clear();
#endif // ENABLE_EXTENDED_SELECTION
m_volumes.release_geometry();
m_volumes.clear();
m_dirty = true;
}

6
src/slic3r/GUI/Tab.cpp
View file

@ -234,9 +234,9 @@ Slic3r::GUI::PageShp Tab::add_options_page(const wxString& title, const std::str
icon_idx = (m_icon_index.find(icon) == m_icon_index.end()) ? -1 : m_icon_index.at(icon);
if (icon_idx == -1) {
// Add a new icon to the icon list.
const auto img_icon = new wxIcon(from_u8(Slic3r::var(icon)), wxBITMAP_TYPE_PNG);
m_icons->Add(*img_icon);
icon_idx = ++m_icon_count;
wxIcon img_icon(from_u8(Slic3r::var(icon)), wxBITMAP_TYPE_PNG);
m_icons->Add(img_icon);
icon_idx = ++m_icon_count;
m_icon_index[icon] = icon_idx;
}
}