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

Merge remote-tracking branch 'PRIVATE/master' into ys_cut

Browse source
This commit is contained in:
YuSanka 2022-10-25 16:07:46 +02:00
commit bba6d8b94d
58 changed files with 3185 additions and 1299 deletions
src/slic3r/GUI
GUI_ObjectList.cpp

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

@ -1989,15 +1989,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)
{
assert(idx >= 0);
#if ENABLE_WIPETOWER_OBJECTID_1000_REMOVAL
if (m_objects->empty() || int(m_objects->size()) <= obj_idx)
// Cannot delete a wipe tower
return false;
#else
if (obj_idx == 1000 || idx<0)
// Cannot delete a wipe tower or volume with negative id
return false;
#endif // ENABLE_WIPETOWER_OBJECTID_1000_REMOVAL
ModelObject* object = (*m_objects)[obj_idx];