diff options
author | enricoturri1966 <enricoturri@seznam.cz> | 2021-10-14 11:57:08 +0300 |
---|---|---|
committer | enricoturri1966 <enricoturri@seznam.cz> | 2021-10-14 11:57:08 +0300 |
commit | fe1c5f34a0072575d81da74d6f0d0f702dea4e56 (patch) | |
tree | 7764f6f2cbc167773fbbdf7d0544d8d1e41ec5cb /src/slic3r/GUI/GLCanvas3D.cpp | |
parent | 6b4014433fab660759b798723d83a16581940ed3 (diff) | |
parent | 2f9ce6bedb56f6ff8feb42ebc4fd7cddb96b66f9 (diff) |
Fixed conflicts after merge with master
Diffstat (limited to 'src/slic3r/GUI/GLCanvas3D.cpp')
-rw-r--r-- | src/slic3r/GUI/GLCanvas3D.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 9ba72e629..ca31645c1 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1286,12 +1286,14 @@ bool GLCanvas3D::is_reload_delayed() const void GLCanvas3D::enable_layers_editing(bool enable) { m_layers_editing.set_enabled(enable); +#if !ENABLE_MODIFIERS_ALWAYS_TRANSPARENT const Selection::IndicesList& idxs = m_selection.get_volume_idxs(); for (unsigned int idx : idxs) { GLVolume* v = m_volumes.volumes[idx]; if (v->is_modifier) v->force_transparent = enable; } +#endif // !ENABLE_MODIFIERS_ALWAYS_TRANSPARENT set_as_dirty(); } |