GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-10-04 01:36:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename property

Browse Source
This commit is contained in:
Michael Kirsch 2019-07-13 00:21:20 +02:00 committed by Joseph Lenox
parent 23e141b1d7
commit 6f88bcd7b4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Slic3r/GUI/Plater.pm
View File

@ -2549,25 +2549,25 @@ sub reload_from_disk {
} }
my $reload_behavior = $Slic3r::GUI::Settings->{_}{reload_behavior}; my $reload_behavior = $Slic3r::GUI::Settings->{_}{reload_behavior};
my $reload_preserve = $Slic3r::GUI::Settings->{_}{reload_preserve}; my $reload_preserve_trafo = $Slic3r::GUI::Settings->{_}{reload_preserve_trafo};
# ask the user how to proceed, if option is selected in preferences # ask the user how to proceed, if option is selected in preferences
if (!$Slic3r::GUI::Settings->{_}{reload_hide_dialog}) { if (!$Slic3r::GUI::Settings->{_}{reload_hide_dialog}) {
my $dlg = Slic3r::GUI::ReloadDialog->new(undef,$reload_behavior,$reload_preserve); my $dlg = Slic3r::GUI::ReloadDialog->new(undef,$reload_behavior,$reload_preserve_trafo);
my $res = $dlg->ShowModal; my $res = $dlg->ShowModal;
if ($res==wxID_CANCEL) { if ($res==wxID_CANCEL) {
$dlg->Destroy; $dlg->Destroy;
return; return;
} }
$reload_behavior = $dlg->GetAdditionalOption; $reload_behavior = $dlg->GetAdditionalOption;
$reload_preserve = $dlg->GetPreserveTrafo; $reload_preserve_trafo = $dlg->GetPreserveTrafo;
my $save = 0; my $save = 0;
if ($reload_behavior != $Slic3r::GUI::Settings->{_}{reload_behavior}) { if ($reload_behavior != $Slic3r::GUI::Settings->{_}{reload_behavior}) {
$Slic3r::GUI::Settings->{_}{reload_behavior} = $reload_behavior; $Slic3r::GUI::Settings->{_}{reload_behavior} = $reload_behavior;
$save = 1; $save = 1;
} }
if ($reload_preserve != $Slic3r::GUI::Settings->{_}{reload_preserve}) { if ($reload_preserve_trafo != $Slic3r::GUI::Settings->{_}{reload_preserve_trafo}) {
$Slic3r::GUI::Settings->{_}{reload_preserve} = $reload_preserve; $Slic3r::GUI::Settings->{_}{reload_preserve_trafo} = $reload_preserve_trafo;
$save = 1; $save = 1;
} }
if ($dlg->GetHideOnNext) { if ($dlg->GetHideOnNext) {