3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev

Browse Source
This commit is contained in:
Enrico Turri 2018-09-07 10:32:39 +02:00
commit e9d5cd726e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
View File

@ -136,7 +136,7 @@ sub update_optgroup {
full_labels => 1, full_labels => 1,
label_font => $Slic3r::GUI::small_font, label_font => $Slic3r::GUI::small_font,
sidetext_font => $Slic3r::GUI::small_font, sidetext_font => $Slic3r::GUI::small_font,
label_width => 120, label_width => 150,
on_change => sub { $self->{on_change}->() if $self->{on_change} }, on_change => sub { $self->{on_change}->() if $self->{on_change} },
extra_column => sub { extra_column => sub {
my ($line) = @_; my ($line) = @_;

6
xs/src/slic3r/GUI/3DScene.cpp
View File

@ -1204,7 +1204,7 @@ static void thick_lines_to_indexed_vertex_array(
b1_prev = b1; b1_prev = b1;
v_prev = v; v_prev = v;
if (bottom_z_different) if (bottom_z_different && (closed || (!is_first && !is_last)))
{ {
// Found a change of the layer thickness -> Add a cap at the beginning of this segment. // Found a change of the layer thickness -> Add a cap at the beginning of this segment.
volume.push_quad(idx_a[BOTTOM], idx_a[RIGHT], idx_a[TOP], idx_a[LEFT]); volume.push_quad(idx_a[BOTTOM], idx_a[RIGHT], idx_a[TOP], idx_a[LEFT]);
@ -1212,10 +1212,10 @@ static void thick_lines_to_indexed_vertex_array(
if (! closed) { if (! closed) {
// Terminate open paths with caps. // Terminate open paths with caps.
if (is_first && !bottom_z_different) if (is_first)
volume.push_quad(idx_a[BOTTOM], idx_a[RIGHT], idx_a[TOP], idx_a[LEFT]); volume.push_quad(idx_a[BOTTOM], idx_a[RIGHT], idx_a[TOP], idx_a[LEFT]);
// We don't use 'else' because both cases are true if we have only one line. // We don't use 'else' because both cases are true if we have only one line.
if (is_last && !bottom_z_different) if (is_last)
volume.push_quad(idx_b[BOTTOM], idx_b[LEFT], idx_b[TOP], idx_b[RIGHT]); volume.push_quad(idx_b[BOTTOM], idx_b[LEFT], idx_b[TOP], idx_b[RIGHT]);
} }