pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into new_main_page_ui

Browse Source
This commit is contained in:
YuSanka
2018-09-13 16:12:07 +02:00
parent 06f395641b b779c6492e
commit a31ac857ef
16 changed files with 102 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xs/src/slic3r/GUI/GLCanvas3D.cpp
View File

@@ -2493,6 +2493,11 @@ int GLCanvas3D::get_first_volume_id(int obj_idx) const
return -1;
}
int GLCanvas3D::get_in_object_volume_id(int scene_vol_idx) const
{
return ((0 <= scene_vol_idx) && (scene_vol_idx < (int)m_volumes.volumes.size())) ? m_volumes.volumes[scene_vol_idx]->volume_idx() : -1;
}
void GLCanvas3D::reload_scene(bool force)
{
if ((m_canvas == nullptr) || (m_config == nullptr) || (m_model == nullptr))