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

Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED)

Browse source
This commit is contained in:
Lukas Matena 2022-08-15 13:41:34 +02:00
commit bce2b148f4
99 changed files with 22989 additions and 14036 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View file

@ -420,6 +420,7 @@ void GLGizmoCut::update_contours()
for (size_t i = 0; i < model_object->volumes.size(); ++i) {
volumes_idxs[i] = model_object->volumes[i]->id();
volumes_trafos[i] = model_object->volumes[i]->get_matrix();
<<<<<<< HEAD
}
bool trafos_match = volumes_trafos.size() == m_cut_contours.volumes_trafos.size();
@ -430,8 +431,14 @@ void GLGizmoCut::update_contours()
break;
}
}
=======
>>>>>>> master_250
}
bool trafos_match = std::equal(volumes_trafos.begin(), volumes_trafos.end(),
m_cut_contours.volumes_trafos.begin(), m_cut_contours.volumes_trafos.end(),
[](const Transform3d& a, const Transform3d& b) { return a.isApprox(b); });
if (0.0 < m_cut_z && m_cut_z < m_max_z) {
if (m_cut_contours.cut_z != m_cut_z || m_cut_contours.object_id != model_object->id() ||
m_cut_contours.instance_idx != instance_idx || m_cut_contours.volumes_idxs != volumes_idxs ||