From 77578f4a3e36d1efd184c458429101a65d7cba53 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Thu, 17 May 2018 09:26:50 +0200 Subject: [PATCH 1/2] Reset tooltips for manifold objects into object info panel --- lib/Slic3r/GUI/Plater.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index 9d546db9d..0b3aea1e6 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -2012,6 +2012,8 @@ sub selection_changed { } else { $self->{object_info_manifold}->SetLabel(L("Yes")); $self->{object_info_manifold_warning_icon}->Hide; + $self->{object_info_manifold}->SetToolTipString(""); + $self->{object_info_manifold_warning_icon}->SetToolTipString(""); } } else { $self->{object_info_facets}->SetLabel($object->facets); @@ -2020,6 +2022,7 @@ sub selection_changed { $self->{"object_info_$_"}->SetLabel("") for qw(size volume facets materials manifold); $self->{object_info_manifold_warning_icon}->Hide; $self->{object_info_manifold}->SetToolTipString(""); + $self->{object_info_manifold_warning_icon}->SetToolTipString(""); } $self->Layout; } From e13564cb190458a818f6ad40dc8705c9c6ae8a5e Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Thu, 17 May 2018 09:50:40 +0200 Subject: [PATCH 2/2] Fixed shell visualization in g-code preview --- xs/src/slic3r/GUI/3DScene.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xs/src/slic3r/GUI/3DScene.cpp b/xs/src/slic3r/GUI/3DScene.cpp index df8b1fbfc..6569f480f 100644 --- a/xs/src/slic3r/GUI/3DScene.cpp +++ b/xs/src/slic3r/GUI/3DScene.cpp @@ -1762,12 +1762,13 @@ void _3DScene::load_gcode_preview(const Print* print, const GCodePreviewData* pr else { _generate_legend_texture(*preview_data, tool_colors); - _load_shells(*print, *volumes, use_VBOs); // removes empty volumes volumes->volumes.erase(std::remove_if(volumes->volumes.begin(), volumes->volumes.end(), [](const GLVolume *volume) { return volume->print_zs.empty(); }), volumes->volumes.end()); + + _load_shells(*print, *volumes, use_VBOs); } }