3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed merge conflict: Added ModelInstance ID to the SLAPrintObject Instance

Browse source
This commit is contained in:
bubnikv 2018-11-13 19:22:05 +01:00
parent fedc78dc91
commit 3858fecf0c
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/SLAPrint.cpp
View file

@ -96,11 +96,11 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model,
for (ModelObject *model_object : m_model.objects) {
auto po = new SLAPrintObject(this, model_object);
m_objects.emplace_back(po);
for(ModelInstance *oinst : model_object->instances) {
for (ModelInstance *oinst : model_object->instances) {
Point tr = Point::new_scale(oinst->get_offset()(X),
oinst->get_offset()(Y));
auto rotZ = float(oinst->get_rotation()(Z));
po->m_instances.emplace_back(tr, rotZ);
po->m_instances.emplace_back(oinst->id(), tr, rotZ);
}
}
}