3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Keep correct instance selection after reload from disk

Browse source
This commit is contained in:
Enrico Turri 2019-09-06 14:36:47 +02:00
parent fe07bde385
commit 4f1747d5f6
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3083,6 +3083,7 @@ void Plater::priv::reload_from_disk()
auto& selection = get_selection(); auto& selection = get_selection();
const auto obj_orig_idx = selection.get_object_idx(); const auto obj_orig_idx = selection.get_object_idx();
if (selection.is_wipe_tower() || obj_orig_idx == -1) { return; } if (selection.is_wipe_tower() || obj_orig_idx == -1) { return; }
int instance_idx = selection.get_instance_idx();
auto *object_orig = model.objects[obj_orig_idx]; auto *object_orig = model.objects[obj_orig_idx];
std::vector<fs::path> input_paths(1, object_orig->input_file); std::vector<fs::path> input_paths(1, object_orig->input_file);
@ -3091,6 +3092,12 @@ void Plater::priv::reload_from_disk()
view3D->get_canvas3d()->enable_render(false); view3D->get_canvas3d()->enable_render(false);
const auto new_idxs = load_files(input_paths, true, false); const auto new_idxs = load_files(input_paths, true, false);
if (new_idxs.empty())
{
// error while loading
view3D->get_canvas3d()->enable_render(true);
return;
}
for (const auto idx : new_idxs) { for (const auto idx : new_idxs) {
ModelObject *object = model.objects[idx]; ModelObject *object = model.objects[idx];
@ -3119,7 +3126,7 @@ void Plater::priv::reload_from_disk()
selection.clear(); selection.clear();
for (const auto idx : new_idxs) for (const auto idx : new_idxs)
{ {
selection.add_object((unsigned int)idx - 1, false); selection.add_instance((unsigned int)idx - 1, instance_idx, false);
} }
} }