3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 01:37:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

#5690 - Fixed thumbnail generation when a gizmo is active

Browse source
This commit is contained in:
enricoturri1966 2021-01-05 11:58:48 +01:00
parent a629401916
commit b93c2aea44
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -1331,7 +1331,7 @@ void GLCanvas3D::toggle_model_objects_visibility(bool visible, const ModelObject
{ {
for (GLVolume* vol : m_volumes.volumes) { for (GLVolume* vol : m_volumes.volumes) {
if (vol->composite_id.object_id == 1000) { // wipe tower if (vol->composite_id.object_id == 1000) { // wipe tower
vol->is_active = (visible && mo == nullptr); vol->is_active = (visible && mo == nullptr);
} }
else { else {
if ((mo == nullptr || m_model->objects[vol->composite_id.object_id] == mo) if ((mo == nullptr || m_model->objects[vol->composite_id.object_id] == mo)
@ -4151,9 +4151,13 @@ void GLCanvas3D::_render_thumbnail_internal(ThumbnailData& thumbnail_data, bool
shader->start_using(); shader->start_using();
shader->set_uniform("print_box.volume_detection", 0); shader->set_uniform("print_box.volume_detection", 0);
for (const GLVolume* vol : visible_volumes) { for (GLVolume* vol : visible_volumes) {
shader->set_uniform("uniform_color", (vol->printable && !vol->is_outside) ? orange : gray); shader->set_uniform("uniform_color", (vol->printable && !vol->is_outside) ? orange : gray);
// the volume may have been deactivated by an active gizmo
bool is_active = vol->is_active;
vol->is_active = true;
vol->render(); vol->render();
vol->is_active = is_active;
} }
shader->stop_using(); shader->stop_using();