diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index da2b28dcdf..b83d4ffbb7 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -255,8 +255,6 @@ bool GLGizmoCut3D::render_combo(const std::string& label, const std::vectortext(_L("Build size")); @@ -1158,7 +1155,7 @@ void GLGizmoCut3D::render_connectors(bool picking) for (size_t i = 0; i < connectors.size(); ++i) { const CutConnector& connector = connectors[i]; - const bool& point_selected = m_selected[i]; +// const bool& point_selected = m_selected[i]; double height = connector.height; // recalculate connector position to world position @@ -1449,14 +1446,11 @@ bool GLGizmoCut3D::gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_posi if (is_dragging() || m_connector_mode == CutConnectorMode::Auto || (!m_keep_upper || !m_keep_lower)) return false; - CutConnectors& connectors = m_c->selection_info()->model_object()->cut_connectors; - const Camera& camera = wxGetApp().plater()->get_camera(); - if ( m_hover_id < 0 && shift_down && (action == SLAGizmoEventType::LeftDown || action == SLAGizmoEventType::Moving) ) return process_cut_line(action, mouse_position); - int mesh_id = -1; + CutConnectors& connectors = m_c->selection_info()->model_object()->cut_connectors; // left down without selection rectangle - place connector on the cut plane: if (action == SLAGizmoEventType::LeftDown && /*!m_selection_rectangle.is_dragging() && */!shift_down) { @@ -1469,7 +1463,6 @@ bool GLGizmoCut3D::gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_posi std::pair pos_and_normal; if (unproject_on_cut_plane(mouse_position.cast(), pos_and_normal)) { const Vec3d& hit = pos_and_normal.first; - const Vec3d& normal = pos_and_normal.second; // The clipping plane was clicked, hit containts coordinates of the hit in world coords. std::cout << hit.x() << "\t" << hit.y() << "\t" << hit.z() << std::endl; Plater::TakeSnapshot snapshot(wxGetApp().plater(), _L("Add connector"), UndoRedo::SnapshotType::GizmoAction); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index a1773c649b..a1694dc176 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2977,10 +2977,11 @@ bool Plater::priv::delete_object_from_model(size_t obj_idx) // show warning message that "cut consistancy" will not be supported any more ModelObject* obj = model.objects[obj_idx]; if (obj->is_cut()) { - MessageDialog dialog(q, _L("You try to delete an object which is a part of a cut object.\n" - "This action will break a cut correspondence.\n" - "After that PrusaSlicer can't garantie model consistency"), - _L("Delete object which is a part of cut object"), wxYES | wxCANCEL | wxCANCEL_DEFAULT); + InfoDialog dialog(q, _L("Delete object which is a part of cut object"), + _L("You try to delete an object which is a part of a cut object.\n" + "This action will break a cut correspondence.\n" + "After that PrusaSlicer can't garantie model consistency"), + false, wxYES | wxCANCEL | wxCANCEL_DEFAULT | wxICON_WARNING); dialog.SetButtonLabel(wxID_YES, _L("Delete object")); if (dialog.ShowModal() == wxID_CANCEL) return false;