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

Fixed conflicts after merge

Browse source
This commit is contained in:
Lukas Matena 2022-08-15 14:02:50 +02:00
parent bce2b148f4
commit deac513faa
13 changed files with 280 additions and 6844 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -420,19 +420,6 @@ 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();
if (trafos_match) {
for (size_t i = 0; i < model_object->volumes.size(); ++i) {
if (!volumes_trafos[i].isApprox(m_cut_contours.volumes_trafos[i])) {
trafos_match = false;
break;
}
}
=======
>>>>>>> master_250
}
bool trafos_match = std::equal(volumes_trafos.begin(), volumes_trafos.end(),