amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Bugfix: dirty filament options were ignored when using multiple extruders. Patch by @markwal. #2740

Browse source
This commit is contained in:
Alessandro Ranellucci 2015-03-23 21:48:31 +01:00
parent 92b980b10e
commit 2d7bfbb805
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/Slic3r/GUI/MainFrame.pm
View file

@ -635,13 +635,19 @@ sub config {
if (!$self->{plater} || $self->{plater}->filament_presets == 1 || $self->{mode} eq 'simple') { if (!$self->{plater} || $self->{plater}->filament_presets == 1 || $self->{mode} eq 'simple') {
$filament_config = $self->{options_tabs}{filament}->config; $filament_config = $self->{options_tabs}{filament}->config;
} else { } else {
# TODO: handle dirty presets.
# perhaps plater shouldn't expose dirty presets at all in multi-extruder environments.
my $i = -1; my $i = -1;
foreach my $preset_idx ($self->{plater}->filament_presets) { foreach my $preset_idx ($self->{plater}->filament_presets) {
$i++; $i++;
my $preset = $self->{options_tabs}{filament}->get_preset($preset_idx); my $config;
my $config = $self->{options_tabs}{filament}->get_preset_config($preset); if ($preset_idx == $self->{options_tabs}{filament}->current_preset) {
# the selected preset for this extruder is the one in the tab
# use the tab's config instead of the preset in case it is dirty
# perhaps plater shouldn't expose dirty presets at all in multi-extruder environments.
$config = $self->{options_tabs}{filament}->config;
} else {
my $preset = $self->{options_tabs}{filament}->get_preset($preset_idx);
$config = $self->{options_tabs}{filament}->get_preset_config($preset);
}
if (!$filament_config) { if (!$filament_config) {
$filament_config = $config->clone; $filament_config = $config->clone;
next; next;