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

Fix the 'extruder' behavior in CLI and test that Print::Simple accepts an incomplete DynamicConfig object

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-04-05 10:18:00 +02:00
parent 6f3844c1ba
commit d2a6194960
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
slic3r.pl
View file

@ -72,7 +72,10 @@ if ($opt{load}) {
# merge configuration # merge configuration
my $config = Slic3r::Config->new_from_defaults; my $config = Slic3r::Config->new_from_defaults;
$config->apply($_) for @external_configs, $cli_config; foreach my $c (@external_configs, $cli_config) {
$c->normalize; # expand shortcuts before applying, otherwise destination values would be already filled with defaults
$config->apply($c);
}
# save configuration # save configuration
if ($opt{save}) { if ($opt{save}) {

12
t/multi.t
View file

@ -1,4 +1,4 @@
use Test::More tests => 7; use Test::More tests => 8;
use strict; use strict;
use warnings; use warnings;
@ -67,7 +67,15 @@ use Slic3r::Test;
} }
{ {
my $config = Slic3r::Config->new_from_defaults; my $config = Slic3r::Config->new;
$config->set('extruder', 2);
my $print = Slic3r::Test::init_print('20mm_cube', config => $config);
like Slic3r::Test::gcode($print), qr/ T1/, 'extruder shortcut';
}
{
my $config = Slic3r::Config->new;
$config->set('perimeter_extruder', 2); $config->set('perimeter_extruder', 2);
$config->set('infill_extruder', 2); $config->set('infill_extruder', 2);
$config->set('support_material_extruder', 2); $config->set('support_material_extruder', 2);