Skip to content

Commit

Permalink
Make sure that objects are correctly shown/hidden when switched
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasmatena committed Feb 21, 2020
1 parent 4c22023 commit 003a546
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
7 changes: 5 additions & 2 deletions src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,11 @@ void GLGizmoHollow::set_sla_support_data(ModelObject*, const Selection&)
m_parent.toggle_model_objects_visibility(true, m_c->m_model_object, m_c->m_active_instance);
m_parent.toggle_sla_auxiliaries_visibility(m_show_supports, m_c->m_model_object, m_c->m_active_instance);
}
else
m_parent.toggle_model_objects_visibility(true, nullptr, -1);
// following was removed so that it does not show the object when it should
// be hidden because the supports gizmo is active. on_set_state takes care
// of showing the object.
//else
// m_parent.toggle_model_objects_visibility(true, nullptr, -1);
}
}

Expand Down
7 changes: 5 additions & 2 deletions src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,11 @@ void GLGizmoSlaSupports::set_sla_support_data(ModelObject* model_object, const S
m_parent.toggle_model_objects_visibility(/*! m_c->m_cavity_mesh*/ true, m_c->m_model_object, m_c->m_active_instance);
m_parent.toggle_sla_auxiliaries_visibility(! m_editing_mode, m_c->m_model_object, m_c->m_active_instance);
}
else
m_parent.toggle_model_objects_visibility(true, nullptr, -1);
// following was removed so that it does not show the object when it should
// be hidden because the supports gizmo is active. on_set_state takes care
// of showing the object.
//else
// m_parent.toggle_model_objects_visibility(true, nullptr, -1);

disable_editing_mode();
if (m_c->m_model_object)
Expand Down

0 comments on commit 003a546

Please sign in to comment.