Bugfix: priming lines for MM print were shown in preview even when disabled
This commit is contained in:
parent
8fc11c2f14
commit
751fe864e2
1 changed files with 4 additions and 4 deletions
|
@ -3383,7 +3383,7 @@ void GLCanvas3D::_camera_tranform() const
|
||||||
::glMatrixMode(GL_MODELVIEW);
|
::glMatrixMode(GL_MODELVIEW);
|
||||||
::glLoadIdentity();
|
::glLoadIdentity();
|
||||||
|
|
||||||
::glRotatef(-m_camera.get_theta(), 1.0f, 0.0f, 0.0f); // pitch
|
::glRotatef(-m_camera.get_theta(), 1.0f, 0.0f, 0.0f); // pitch
|
||||||
::glRotatef(m_camera.phi, 0.0f, 0.0f, 1.0f); // yaw
|
::glRotatef(m_camera.phi, 0.0f, 0.0f, 1.0f); // yaw
|
||||||
|
|
||||||
Pointf3 neg_target = m_camera.target.negative();
|
Pointf3 neg_target = m_camera.target.negative();
|
||||||
|
@ -4090,7 +4090,7 @@ void GLCanvas3D::_load_wipe_tower_toolpaths(const std::vector<std::string>& str_
|
||||||
|
|
||||||
ctxt.print = m_print;
|
ctxt.print = m_print;
|
||||||
ctxt.tool_colors = tool_colors.empty() ? nullptr : &tool_colors;
|
ctxt.tool_colors = tool_colors.empty() ? nullptr : &tool_colors;
|
||||||
if (m_print->m_wipe_tower_priming)
|
if (m_print->m_wipe_tower_priming && m_print->config.single_extruder_multi_material_priming)
|
||||||
ctxt.priming.emplace_back(*m_print->m_wipe_tower_priming.get());
|
ctxt.priming.emplace_back(*m_print->m_wipe_tower_priming.get());
|
||||||
if (m_print->m_wipe_tower_final_purge)
|
if (m_print->m_wipe_tower_final_purge)
|
||||||
ctxt.final.emplace_back(*m_print->m_wipe_tower_final_purge.get());
|
ctxt.final.emplace_back(*m_print->m_wipe_tower_final_purge.get());
|
||||||
|
@ -4823,7 +4823,7 @@ void GLCanvas3D::_on_move(const std::vector<int>& volume_idxs)
|
||||||
if (m_model == nullptr)
|
if (m_model == nullptr)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
std::set<std::string> done; // prevent moving instances twice
|
std::set<std::string> done; // prevent moving instances twice
|
||||||
bool object_moved = false;
|
bool object_moved = false;
|
||||||
Pointf3 wipe_tower_origin(0.0, 0.0, 0.0);
|
Pointf3 wipe_tower_origin(0.0, 0.0, 0.0);
|
||||||
for (int volume_idx : volume_idxs)
|
for (int volume_idx : volume_idxs)
|
||||||
|
@ -4832,7 +4832,7 @@ void GLCanvas3D::_on_move(const std::vector<int>& volume_idxs)
|
||||||
int obj_idx = volume->object_idx();
|
int obj_idx = volume->object_idx();
|
||||||
int instance_idx = volume->instance_idx();
|
int instance_idx = volume->instance_idx();
|
||||||
|
|
||||||
// prevent moving instances twice
|
// prevent moving instances twice
|
||||||
char done_id[64];
|
char done_id[64];
|
||||||
::sprintf(done_id, "%d_%d", obj_idx, instance_idx);
|
::sprintf(done_id, "%d_%d", obj_idx, instance_idx);
|
||||||
if (done.find(done_id) != done.end())
|
if (done.find(done_id) != done.end())
|
||||||
|
|
Loading…
Add table
Reference in a new issue