Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons

This commit is contained in:
Enrico Turri 2019-03-04 13:47:34 +01:00
commit 5ddf45806b
6 changed files with 39 additions and 6 deletions

View file

@ -896,7 +896,11 @@ void GLCanvas3D::Selection::add(unsigned int volume_idx, bool as_single_selectio
if (needs_reset)
clear();
m_mode = volume->is_modifier ? Volume : Instance;
if (volume->is_modifier)
m_mode = Volume;
else if (!contains_volume(volume_idx))
m_mode = Instance;
// else -> keep current mode
switch (m_mode)
{