Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Matena <lukasmatena@seznam.cz>2020-02-21 10:28:20 +0300
committerLukas Matena <lukasmatena@seznam.cz>2020-02-21 11:46:40 +0300
commit003a54600d1b09c06f0c2ec440fa3fad9749de3b (patch)
treea9b5815e3b05d86312a6e8d51cb658bb942077c8 /src/slic3r/GUI
parent4c22023762d4231df4823c7e0c9f85ca89b0f05a (diff)
Make sure that objects are correctly shown/hidden when switched
Diffstat (limited to 'src/slic3r/GUI')
-rw-r--r--src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp7
-rw-r--r--src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp7
2 files changed, 10 insertions, 4 deletions
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
index 260bc813d..a89d8f9e5 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
@@ -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);
}
}
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
index 247e643eb..aa9ce5014 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
@@ -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)