Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
This commit is contained in:
commit
bb56988916
1 changed files with 5 additions and 1 deletions
|
@ -4098,7 +4098,11 @@ bool Plater::priv::can_reload_from_disk() const
|
||||||
const GLVolume* v = selection.get_volume(idx);
|
const GLVolume* v = selection.get_volume(idx);
|
||||||
int v_idx = v->volume_idx();
|
int v_idx = v->volume_idx();
|
||||||
if (v_idx >= 0)
|
if (v_idx >= 0)
|
||||||
selected_volumes.push_back({ v->object_idx(), v_idx });
|
{
|
||||||
|
int o_idx = v->object_idx();
|
||||||
|
if ((0 <= o_idx) && (o_idx < (int)model.objects.size()))
|
||||||
|
selected_volumes.push_back({ o_idx, v_idx });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
std::sort(selected_volumes.begin(), selected_volumes.end());
|
std::sort(selected_volumes.begin(), selected_volumes.end());
|
||||||
selected_volumes.erase(std::unique(selected_volumes.begin(), selected_volumes.end()), selected_volumes.end());
|
selected_volumes.erase(std::unique(selected_volumes.begin(), selected_volumes.end()), selected_volumes.end());
|
||||||
|
|
Loading…
Reference in a new issue