PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-15 19:52:39 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ys_ph_printers

Browse Source
This commit is contained in:
YuSanka
2020-07-28 14:14:16 +02:00
parent 68ae95509f 18594261d2
commit 3c3e463f50
18 changed files with 1210 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@@ -2361,8 +2361,9 @@ void ObjectList::del_layers_from_object(const int obj_idx)
bool ObjectList::del_subobject_from_object(const int obj_idx, const int idx, const int type)
{
if (obj_idx == 1000)
// Cannot delete a wipe tower.
assert(idx >= 0);
if (obj_idx == 1000 || idx<0)
// Cannot delete a wipe tower or volume with negative id
return false;
ModelObject* object = (*m_objects)[obj_idx];