Fix regression causing non-global config options to be ignored when replacing placeholders in output filename format. #1831

This commit is contained in:
Alessandro Ranellucci 2014-03-15 20:45:10 +01:00
parent 96c2c21707
commit bc054e613c
2 changed files with 18 additions and 2 deletions

View file

@ -1050,7 +1050,14 @@ sub expanded_output_filepath {
} else {
# path is a full path to a file so we use it as it is
}
return $self->config->replace_options($path, { %{$self->extra_variables}, %$extra_variables });
# get a full set options for replacing placeholders in output filename format
# (only use the first region's and first object's options)
my $full_config = Slic3r::Config->new;
$full_config->apply_static($self->config);
$full_config->apply_static($self->regions->[0]->config) if @{$self->regions};
$full_config->apply_static($self->objects->[0]->config) if @{$self->objects};
return $full_config->replace_options($path, { %{$self->extra_variables}, %$extra_variables });
}
# given the path to a file, this function returns its filename with and without extension