mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-16 05:36:03 +08:00
Merge branch 'et_spe2388'
This commit is contained in:
commit
9bea31cfd2
@ -5555,6 +5555,8 @@ void Plater::export_stl_obj(bool extended, bool selection_only)
|
|||||||
TriangleMesh vols_mesh(mesh);
|
TriangleMesh vols_mesh(mesh);
|
||||||
mesh = TriangleMesh();
|
mesh = TriangleMesh();
|
||||||
for (const ModelInstance* i : mo.instances) {
|
for (const ModelInstance* i : mo.instances) {
|
||||||
|
if (!i->is_printable())
|
||||||
|
continue;
|
||||||
TriangleMesh m = vols_mesh;
|
TriangleMesh m = vols_mesh;
|
||||||
m.transform(i->get_matrix(), true);
|
m.transform(i->get_matrix(), true);
|
||||||
mesh.merge(m);
|
mesh.merge(m);
|
||||||
@ -5570,8 +5572,10 @@ void Plater::export_stl_obj(bool extended, bool selection_only)
|
|||||||
|
|
||||||
const SLAPrintObject *object = this->p->sla_print.get_print_object_by_model_object_id(mo.id());
|
const SLAPrintObject *object = this->p->sla_print.get_print_object_by_model_object_id(mo.id());
|
||||||
|
|
||||||
if (!object || !object->get_mesh_to_print() || object->get_mesh_to_print()->empty())
|
if (!object || !object->get_mesh_to_print() || object->get_mesh_to_print()->empty()) {
|
||||||
mesh = mesh_to_export_fff(mo, instance_id);
|
if (!extended)
|
||||||
|
mesh = mesh_to_export_fff(mo, instance_id);
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
const Transform3d mesh_trafo_inv = object->trafo().inverse();
|
const Transform3d mesh_trafo_inv = object->trafo().inverse();
|
||||||
const bool is_left_handed = object->is_left_handed();
|
const bool is_left_handed = object->is_left_handed();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user