viewit/OrcaSlicer-KX
5
3
Fork 1
Code Issues 1 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Follow-up on aaaa85c1f8

Browse Source 
Fix of #5007 - "Reload from disk" causes objects converted to inches to revert to mm
1) Storing and reloading the "source_in_inches" source flag from AMF and 3MF
2) When converting objects with mixed "inches" volumes, do the right thing
   and do not convert those that do not need conversion.
This commit is contained in:
Vojtech Bubnik
2020-12-12 12:06:15 +01:00
parent 0ca2472329
commit a6cf909405
3 changed files with 70 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libslic3r/Model.cpp
View File

@@ -1060,9 +1060,11 @@ void ModelObject::convert_units(ModelObjectPtrs& new_objects, bool from_imperial
vol->source.object_idx = (int)new_objects.size();
vol->source.volume_idx = vol_idx;
// Perform conversion
if (volume_idxs.empty() ||
std::find(volume_idxs.begin(), volume_idxs.end(), vol_idx) != volume_idxs.end()) {
// Perform conversion only if the target "imperial" state is different from the current one.
// This check supports conversion of "mixed" set of volumes, each with different "imperial" state.
if (vol->source.is_converted_from_inches != from_imperial &&
(volume_idxs.empty() ||
std::find(volume_idxs.begin(), volume_idxs.end(), vol_idx) != volume_idxs.end())) {
vol->scale_geometry_after_creation(versor);
vol->set_offset(versor.cwiseProduct(volume->get_offset()));
vol->source.is_converted_from_inches = from_imperial;