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

Merge branch 'master' into xs

Browse Source
This commit is contained in:
Alessandro Ranellucci 2013-06-23 21:12:19 +02:00
commit de45b823e1
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Build.PL
View File

@ -69,7 +69,7 @@ EOF
my %modules = (%prereqs, %recommends); my %modules = (%prereqs, %recommends);
foreach my $module (sort keys %modules) { foreach my $module (sort keys %modules) {
my $version = $modules{$module}; my $version = $modules{$module};
system $cpanm, '--sudo', "$module~$version"; system $cpanm, "$module~$version";
} }
system $cpanm, '--sudo', '--reinstall', './xs'; system $cpanm, '--sudo', '--reinstall', './xs';

4
lib/Slic3r/Config.pm
View File

@ -1071,8 +1071,7 @@ sub new_from_cli {
for (qw(start end layer toolchange)) { for (qw(start end layer toolchange)) {
my $opt_key = "${_}_gcode"; my $opt_key = "${_}_gcode";
if ($args{$opt_key}) { if ($args{$opt_key}) {
die "Invalid value for --${_}-gcode: file does not exist\n" if (-e $args{$opt_key}) {
if !-e $args{$opt_key};
Slic3r::open(\my $fh, "<", $args{$opt_key}) Slic3r::open(\my $fh, "<", $args{$opt_key})
or die "Failed to open $args{$opt_key}\n"; or die "Failed to open $args{$opt_key}\n";
binmode $fh, ':utf8'; binmode $fh, ':utf8';
@ -1080,6 +1079,7 @@ sub new_from_cli {
close $fh; close $fh;
} }
} }
}
$args{$_} = $Options->{$_}{deserialize}->($args{$_}) $args{$_} = $Options->{$_}{deserialize}->($args{$_})
for grep exists $args{$_}, qw(print_center bed_size duplicate_grid extruder_offset retract_layer_change wipe); for grep exists $args{$_}, qw(print_center bed_size duplicate_grid extruder_offset retract_layer_change wipe);

4
lib/Slic3r/GCode/Layer.pm
View File

@ -44,7 +44,9 @@ sub process_layer {
$self->gcodegen->move_z_callback(sub { $self->gcodegen->move_z_callback(sub {
$self->gcodegen->move_z_callback(undef); # circular ref or not? $self->gcodegen->move_z_callback(undef); # circular ref or not?
return "" if !$Slic3r::Config->layer_gcode; return "" if !$Slic3r::Config->layer_gcode;
return $Slic3r::Config->replace_options($Slic3r::Config->layer_gcode) . "\n"; return $Slic3r::Config->replace_options($Slic3r::Config->layer_gcode, {
layer_num => $self->gcodegen->layer->id,
}) . "\n";
}); });
# extrude skirt # extrude skirt

4
lib/Slic3r/Print/Object.pm
View File

@ -715,8 +715,8 @@ sub combine_infill {
my @layerms = map $self->layers->[$_]->regions->[$region_id], my @layerms = map $self->layers->[$_]->regions->[$region_id],
($layer_id - ($combine[$layer_id]-1) .. $layer_id); ($layer_id - ($combine[$layer_id]-1) .. $layer_id);
# process internal and internal-solid infill separately # only combine internal infill
for my $type (S_TYPE_INTERNAL, S_TYPE_INTERNALSOLID) { for my $type (S_TYPE_INTERNAL) {
# we need to perform a multi-layer intersection, so let's split it in pairs # we need to perform a multi-layer intersection, so let's split it in pairs
# initialize the intersection with the candidates of the lowest layer # initialize the intersection with the candidates of the lowest layer