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

differenciate between plater and model object

Browse Source
This commit is contained in:
Michael Kirsch 2019-07-20 01:19:04 +02:00 committed by Joseph Lenox
parent 89929de599
commit d157dc7ef6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2536,14 +2536,14 @@ sub export_stl {
sub reload_from_disk { sub reload_from_disk {
my ($self) = @_; my ($self) = @_;
my ($obj_idx, $org_obj) = $self->selected_object; my ($obj_idx, $org_obj_plater) = $self->selected_object;
return if !defined $obj_idx; return if !defined $obj_idx;
if (!$org_obj->input_file) { if (!$org_obj_plater->input_file) {
Slic3r::GUI::warning_catcher($self)->("The selected object couldn't be reloaded because it isn't referenced to its input file any more. This is the case after performing operations like cut or split."); Slic3r::GUI::warning_catcher($self)->("The selected object couldn't be reloaded because it isn't referenced to its input file any more. This is the case after performing operations like cut or split.");
return; return;
} }
if (!-e $org_obj->input_file) { if (!-e $org_obj_plater->input_file) {
Slic3r::GUI::warning_catcher($self)->("The selected object couldn't be reloaded because the file doesn't exist anymore on the disk."); Slic3r::GUI::warning_catcher($self)->("The selected object couldn't be reloaded because the file doesn't exist anymore on the disk.");
return; return;
} }
@ -2579,12 +2579,14 @@ sub reload_from_disk {
} }
# Only reload the selected object and not all objects from the input file. # Only reload the selected object and not all objects from the input file.
my @new_obj_idx = $self->load_file($org_obj->input_file, $org_obj->input_file_obj_idx); my @new_obj_idx = $self->load_file($org_obj_plater->input_file, $org_obj_plater->input_file_obj_idx);
if (!@new_obj_idx) { if (!@new_obj_idx) {
Slic3r::GUI::warning_catcher($self)->("The selected object couldn't be reloaded because the new file doesn't contain the object."); Slic3r::GUI::warning_catcher($self)->("The selected object couldn't be reloaded because the new file doesn't contain the object.");
return; return;
} }
my $org_obj = my $new_obj = $self->{model}->objects->[$obj_idx];
my $volume_unmatched=0; my $volume_unmatched=0;
foreach my $new_obj_idx (@new_obj_idx) { foreach my $new_obj_idx (@new_obj_idx) {