diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2020-02-03 17:42:54 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2020-02-03 17:42:54 +0300 |
| commit | 227cc4dc3378c1350618f12f2f1b61437666f92b (patch) | |
| tree | e80895b44462896b1601f2b13a188eab186f9cb2 /src/slic3r/GUI/Gizmos | |
| parent | a1d4dab9995a3fb41021fa3a87dc96b65d22113b (diff) | |
Fixed conflicts after merge
slaposHollowing was divided into slaposHollowing and slaposDrillHoles on master
This commit takes this into account on the code that was merged from lm_drilling_backend_rebased
Diffstat (limited to 'src/slic3r/GUI/Gizmos')
| -rw-r--r-- | src/slic3r/GUI/Gizmos/GLGizmoBase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index 653bfefb5..af022352e 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -354,7 +354,7 @@ bool CommonGizmosData::update_from_backend(GLCanvas3D& canvas, ModelObject* mode // saved, a copy is stored as a member (FIXME) if (m_print_object_idx >=0) { const SLAPrintObject* po = canvas.sla_print()->objects()[m_print_object_idx]; - if (po->is_step_done(slaposHollowing)) { + if (po->is_step_done(slaposDrillHoles)) { m_backend_mesh_transformed = po->get_mesh_to_print(); m_backend_mesh_transformed.transform(canvas.sla_print()->sla_trafo(*m_model_object).inverse()); m_mesh = &m_backend_mesh_transformed; |