From ecfffca12dd19d013fb98653d204b04d41725ba4 Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 28 Jun 2023 16:47:42 +0800 Subject: [PATCH] FIX: raft contact distance should not trigger warning Jira: STUDIO-3344 Change-Id: I1d0e7431cad468acaf4830caf002a47c6a33be41 (cherry picked from commit f2a926da614443fdf8631f4412f70fa741a8bf11) --- src/libslic3r/GCode.cpp | 4 ++++ src/slic3r/GUI/Gizmos/GLGizmoText.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 41358c832..731b706bf 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -828,6 +828,10 @@ std::vector GCode::collect_layers_to_print(const PrintObjec double extra_gap = (layer_to_print.support_layer ? bottom_cd : top_cd); + // raft contact distance should not trigger any warning + if(last_extrusion_layer && last_extrusion_layer->support_layer) + extra_gap = std::max(extra_gap, object.config().raft_contact_distance.value); + double maximal_print_z = (last_extrusion_layer ? last_extrusion_layer->print_z() : 0.) + layer_to_print.layer()->height + std::max(0., extra_gap); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp index 94cad1e92..0bd02648f 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp @@ -1318,7 +1318,7 @@ bool GLGizmoText::update_text_positions(const std::vector& texts) } TriangleMesh mesh = slice_meshs; - std::vector mesh_values(m_position_points.size(), 1'000'000'000); + std::vector mesh_values(m_position_points.size(), 1e9); m_normal_points.resize(m_position_points.size()); auto point_in_triangle_delete_area = [](const Vec3d &point, const Vec3d &point0, const Vec3d &point1, const Vec3d &point2) { Vec3d p0_p = point - point0;