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

Merge remote-tracking branch 'origin/master' into ys_color_print_extension

Browse source
This commit is contained in:
YuSanka 2019-10-10 16:17:09 +02:00
commit 5d9a136b8a
12 changed files with 319 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/Plater.cpp
View file

@ -3837,9 +3837,9 @@ bool Plater::priv::can_reload_from_disk() const
for (unsigned int idx : selected_volumes_idxs)
{
const GLVolume* v = selection.get_volume(idx);
int o_idx = v->object_idx();
int v_idx = v->volume_idx();
selected_volumes.push_back({ o_idx, v_idx });
if (v_idx >= 0)
selected_volumes.push_back({ v->object_idx(), v_idx });
}
std::sort(selected_volumes.begin(), selected_volumes.end());
selected_volumes.erase(std::unique(selected_volumes.begin(), selected_volumes.end()), selected_volumes.end());