From b5fcc234605cfde0c1dd8ac4955567ade9ec7aa8 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 20 Apr 2020 08:09:19 +0200 Subject: [PATCH 1/2] ConfigWizard: fixed first column name on SLA Material page --- src/slic3r/GUI/ConfigWizard.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index d0c768de50..e242033d95 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -2096,7 +2096,7 @@ ConfigWizard::ConfigWizard(wxWindow *parent) p->add_page(p->page_filaments = new PageMaterials(this, &p->filaments, _(L("Filament Profiles Selection")), _(L("Filaments")), _(L("Type:")) )); p->add_page(p->page_sla_materials = new PageMaterials(this, &p->sla_materials, - _(L("SLA Material Profiles Selection")) + " ", _(L("SLA Materials")), _(L("Layer height:")) )); + _(L("SLA Material Profiles Selection")) + " ", _(L("SLA Materials")), _(L("Type:")) )); p->add_page(p->page_update = new PageUpdate(this)); From 40e4be6ede7a2140cf114eab5e8fd1dd9098effe Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Mon, 20 Apr 2020 09:15:52 +0200 Subject: [PATCH 2/2] Fixed a crash in the FDM supports gizmo when the wipe tower was shown The crash happened during showing/hiding of volumes, which historically assumed to always run in SLA mode and so did not expect to encounter the wipe tower. --- src/slic3r/GUI/GLCanvas3D.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 9127fcaf4a..e2cac93dfb 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1743,6 +1743,8 @@ void GLCanvas3D::toggle_sla_auxiliaries_visibility(bool visible, const ModelObje m_render_sla_auxiliaries = visible; for (GLVolume* vol : m_volumes.volumes) { + if (vol->composite_id.object_id == 1000) + continue; // the wipe tower if ((mo == nullptr || m_model->objects[vol->composite_id.object_id] == mo) && (instance_idx == -1 || vol->composite_id.instance_id == instance_idx) && vol->composite_id.volume_id < 0)