FIX: avoid wipe tower conflict with objects

Change-Id: I09f6937a4bb698e4981c094c5694b3ce50efd2b4
(cherry picked from commit 2fc3f05732b8e5c7132b6c8a5f4403d30c516bff)
This commit is contained in:
manch1n 2023-04-10 16:03:28 +08:00 committed by Lane.Wei
parent 229b173894
commit 29459fe4cb
3 changed files with 22 additions and 11 deletions

View file

@ -311,9 +311,12 @@ void ArrangeJob::prepare_wipe_tower()
const GLCanvas3D* canvas3D=static_cast<const GLCanvas3D *>(m_plater->canvas3D());
for (int bedid = 0; bedid < MAX_NUM_PLATES; bedid++) {
if (!plates_have_wipe_tower[bedid]) {
wipe_tower_ap.translation = {0, 0};
wipe_tower_ap.poly.contour.points = canvas3D->estimate_wipe_tower_points(bedid);
wipe_tower_ap.bed_idx = bedid;
wipe_tower_ap.translation = {0, 0};
bool global = true;
int state = m_plater->get_prepare_state();
if (state == Job::JobPrepareState::PREPARE_STATE_MENU) { global = false; }
wipe_tower_ap.poly.contour.points = canvas3D->estimate_wipe_tower_points(bedid, global);
wipe_tower_ap.bed_idx = bedid;
m_unselected.emplace_back(wipe_tower_ap);
}
}