3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 10:17:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed a regression bug (bundling of multiple STLs into a single model).

Browse source
This commit is contained in:
bubnikv 2017-08-28 14:54:46 +02:00
parent 3469bb2ea6
commit 61b89865ff
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xs/src/libslic3r/Model.cpp
View file

@ -341,7 +341,7 @@ void Model::convert_multipart_object()
if (this->objects.empty()) if (this->objects.empty())
return; return;
ModelObject* object = this->add_object(); ModelObject* object = new ModelObject(this);
object->input_file = this->objects.front()->input_file; object->input_file = this->objects.front()->input_file;
for (const ModelObject* o : this->objects) for (const ModelObject* o : this->objects)
@ -351,8 +351,8 @@ void Model::convert_multipart_object()
for (const ModelInstance* i : this->objects.front()->instances) for (const ModelInstance* i : this->objects.front()->instances)
object->add_instance(*i); object->add_instance(*i);
while (this->objects.size() > 1) this->clear_objects();
this->delete_object(0); this->objects.push_back(object);
} }
ModelObject::ModelObject(Model *model, const ModelObject &other, bool copy_volumes) : ModelObject::ModelObject(Model *model, const ModelObject &other, bool copy_volumes) :