juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 10:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

New selection -> removed obsolete parameters from GLVolumeCollection::load_object()

Browse Source
This commit is contained in:
Enrico Turri
2018-10-08 16:05:55 +02:00
parent 9ae6d115a2
commit 99fe5761d8
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/GLCanvas3D.cpp
View File

@@ -3123,7 +3123,7 @@ std::vector<int> GLCanvas3D::load_object(const ModelObject& model_object, int ob
}
}
#if ENABLE_EXTENDED_SELECTION
return m_volumes.load_object(&model_object, obj_idx, instance_idxs, m_color_by, "object", "object", m_use_VBOs && m_initialized);
return m_volumes.load_object(&model_object, obj_idx, instance_idxs, m_color_by, m_use_VBOs && m_initialized);
#else
return m_volumes.load_object(&model_object, obj_idx, instance_idxs, m_color_by, m_select_by, m_drag_by, m_use_VBOs && m_initialized);
#endif // ENABLE_EXTENDED_SELECTION
@@ -6025,7 +6025,11 @@ void GLCanvas3D::_load_shells()
instance_ids[i] = i;
}
#if ENABLE_EXTENDED_SELECTION
m_volumes.load_object(model_obj, object_id, instance_ids, "object", m_use_VBOs && m_initialized);
#else
m_volumes.load_object(model_obj, object_id, instance_ids, "object", "object", "object", m_use_VBOs && m_initialized);
#endif // ENABLE_EXTENDED_SELECTION
++object_id;
}