mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-14 17:45:58 +08:00
Merge branch 'master' into fs_emboss
This commit is contained in:
commit
d521df7486
BIN
resources/shapes/universal wall mount hole.png
Normal file
BIN
resources/shapes/universal wall mount hole.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 6.4 KiB |
BIN
resources/shapes/universal wall mount hole.stl
Normal file
BIN
resources/shapes/universal wall mount hole.stl
Normal file
Binary file not shown.
@ -1376,13 +1376,11 @@ void GLCanvas3D::toggle_model_objects_visibility(bool visible, const ModelObject
|
|||||||
} else {
|
} else {
|
||||||
const GLGizmosManager& gm = get_gizmos_manager();
|
const GLGizmosManager& gm = get_gizmos_manager();
|
||||||
auto gizmo_type = gm.get_current_type();
|
auto gizmo_type = gm.get_current_type();
|
||||||
if ( (gizmo_type == GLGizmosManager::FdmSupports
|
if ( (gizmo_type == GLGizmosManager::FdmSupports
|
||||||
|| gizmo_type == GLGizmosManager::Seam
|
|| gizmo_type == GLGizmosManager::Seam
|
||||||
|| gizmo_type == GLGizmosManager::Cut)
|
|| gizmo_type == GLGizmosManager::Cut)
|
||||||
&& !vol->is_modifier) {
|
&& !vol->is_modifier) {
|
||||||
vol->force_neutral_color = true;
|
vol->force_neutral_color = true;
|
||||||
if (gizmo_type == GLGizmosManager::Cut)
|
|
||||||
vol->color.a(0.95f);
|
|
||||||
}
|
}
|
||||||
else if (gizmo_type == GLGizmosManager::MmuSegmentation)
|
else if (gizmo_type == GLGizmosManager::MmuSegmentation)
|
||||||
vol->is_active = false;
|
vol->is_active = false;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user