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

Fixed conflicts after merge with master

Browse source
This commit is contained in:
enricoturri1966 2022-07-21 08:55:52 +02:00
commit ca34518bcc
264 changed files with 69447 additions and 49874 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -416,16 +416,29 @@ void GLGizmoCut::update_contours()
const ModelObject* model_object = wxGetApp().model().objects[selection.get_object_idx()];
const int instance_idx = selection.get_instance_idx();
std::vector<ObjectID> volumes_idxs = std::vector<ObjectID>(model_object->volumes.size());
std::vector<Transform3d> volumes_trafos = std::vector<Transform3d>(model_object->volumes.size());
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();
}
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;
}
}
}
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) {
m_cut_contours.instance_idx != instance_idx || m_cut_contours.volumes_idxs != volumes_idxs ||
!trafos_match) {
m_cut_contours.cut_z = m_cut_z;
if (m_cut_contours.object_id != model_object->id() || m_cut_contours.volumes_idxs != volumes_idxs)
if (m_cut_contours.object_id != model_object->id() || m_cut_contours.volumes_idxs != volumes_idxs || !trafos_match)
m_cut_contours.mesh = model_object->raw_mesh();
m_cut_contours.position = box.center();
@ -433,6 +446,7 @@ void GLGizmoCut::update_contours()
m_cut_contours.object_id = model_object->id();
m_cut_contours.instance_idx = instance_idx;
m_cut_contours.volumes_idxs = volumes_idxs;
m_cut_contours.volumes_trafos = volumes_trafos;
m_cut_contours.contours.reset();
MeshSlicingParams slicing_params;