GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-12 19:59:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a regression bug due to some Perl to C++ porting

Browse Source 
of a configuration layer. Fixes https://github.com/prusa3d/Slic3r/issues/627
This commit is contained in:
bubnikv 2017-12-14 11:35:38 +01:00
parent cdab27d337
commit eaaac8b2a4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slic3r.pl
View File

@ -71,10 +71,10 @@ my @external_configs = ();
if ($opt{load}) { if ($opt{load}) {
foreach my $configfile (@{$opt{load}}) { foreach my $configfile (@{$opt{load}}) {
if (-e $configfile) { if (-e $configfile) {
push @external_configs, Slic3r::Config->load($configfile); push @external_configs, Slic3r::Config::load($configfile);
} elsif (-e "$FindBin::Bin/$configfile") { } elsif (-e "$FindBin::Bin/$configfile") {
printf STDERR "Loading $FindBin::Bin/$configfile\n"; printf STDERR "Loading $FindBin::Bin/$configfile\n";
push @external_configs, Slic3r::Config->load("$FindBin::Bin/$configfile"); push @external_configs, Slic3r::Config::load("$FindBin::Bin/$configfile");
} else { } else {
$opt{ignore_nonexistent_config} or die "Cannot find specified configuration file ($configfile).\n"; $opt{ignore_nonexistent_config} or die "Cannot find specified configuration file ($configfile).\n";
} }

2
utils/view-toolpaths.pl
View File

@ -35,7 +35,7 @@ my %opt = ();
# load config # load config
my $config = Slic3r::Config::new_from_defaults; my $config = Slic3r::Config::new_from_defaults;
if ($opt{load}) { if ($opt{load}) {
$config->apply(Slic3r::Config->load($opt{load})); $config->apply(Slic3r::Config::load($opt{load}));
} }
# init print # init print