3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev

Browse Source
This commit is contained in:
Enrico Turri 2018-09-10 13:19:53 +02:00
commit 333bc1523a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -879,6 +879,15 @@ sub load_files {
$model->convert_multipart_object(scalar(@$nozzle_dmrs)) if $dialog->ShowModal() == wxID_YES; $model->convert_multipart_object(scalar(@$nozzle_dmrs)) if $dialog->ShowModal() == wxID_YES;
} }
# objects imported from 3mf require a call to center_around_origin to have gizmos working properly and this call
# need to be done after looks_like_multipart_object detection
if ($input_file =~ /.3[mM][fF]$/)
{
foreach my $model_object (@{$model->objects}) {
$model_object->center_around_origin; # also aligns object to Z = 0
}
}
if ($one_by_one) { if ($one_by_one) {
push @obj_idx, $self->load_model_objects(@{$model->objects}); push @obj_idx, $self->load_model_objects(@{$model->objects});
} else { } else {

2
xs/src/libslic3r/Format/3mf.cpp
View File

@ -601,8 +601,6 @@ namespace Slic3r {
if (!_generate_volumes(*object.second, obj_geometry->second, *volumes_ptr)) if (!_generate_volumes(*object.second, obj_geometry->second, *volumes_ptr))
return false; return false;
object.second->center_around_origin();
} }
// fixes the min z of the model if negative // fixes the min z of the model if negative