GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 06:45:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#7792 - Fixed relative positions of objects loaded from plain (non zipped) amf files

Browse Source
This commit is contained in:
enricoturri1966 2022-01-31 13:13:06 +01:00
parent 8d94841fa3
commit 08abdc27a0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/Plater.cpp
View File

@ -2586,8 +2586,13 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
} }
for (ModelObject* model_object : model.objects) { for (ModelObject* model_object : model.objects) {
if (!type_3mf && !type_zip_amf) if (!type_3mf && !type_zip_amf) {
model_object->center_around_origin(false); model_object->center_around_origin(false);
if (type_any_amf && model_object->instances.empty()) {
ModelInstance* instance = model_object->add_instance();
instance->set_offset(-model_object->origin_translation);
}
}
model_object->ensure_on_bed(is_project_file); model_object->ensure_on_bed(is_project_file);
} }
@ -2603,7 +2608,7 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
} }
if (one_by_one) { if (one_by_one) {
if (type_3mf && !is_project_file) if ((type_3mf && !is_project_file) || (type_any_amf && !type_zip_amf))
model.center_instances_around_point(this->bed.build_volume().bed_center()); model.center_instances_around_point(this->bed.build_volume().bed_center());
auto loaded_idxs = load_model_objects(model.objects, is_project_file); auto loaded_idxs = load_model_objects(model.objects, is_project_file);
obj_idxs.insert(obj_idxs.end(), loaded_idxs.begin(), loaded_idxs.end()); obj_idxs.insert(obj_idxs.end(), loaded_idxs.begin(), loaded_idxs.end());