Merge branch 'master' into fs_emboss

This commit is contained in:
Filip Sykala 2021-10-21 19:43:05 +02:00
commit ae5f594e1e
16 changed files with 126 additions and 65 deletions
src/slic3r/GUI

View file

@ -1448,7 +1448,7 @@ void ObjectList::load_subobject(ModelVolumeType type, bool from_galery/* = false
selection_changed();
}
/*
void ObjectList::load_part(ModelObject& model_object, std::vector<ModelVolume*>& added_volumes, ModelVolumeType type, bool from_galery/* = false* /)
void ObjectList::load_part(ModelObject& model_object, std::vector<ModelVolume*>& added_volumes, ModelVolumeType type, bool from_galery = false)
{
if (type != ModelVolumeType::MODEL_PART)
return;