Merge branch 'master' into fs_emboss
This commit is contained in:
commit
ae5f594e1e
16 changed files with 126 additions and 65 deletions
src/slic3r/GUI
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue