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

Code refactoring for d88ef826cd

Browse Source 
reload_scene() call were followed by update(). It synchronizes back-end with front-end and then it calls reload_scene() again.
However in SLA mode reload_scene() expects the back-end to be synchronized with front-end, thus we get asserts that we all have ignored for a long time.

So, we call ObjectList::update_info_items() after the call of update() where reload_scene() is already called and GLCanvas3D::is_object_sinking() will return correct value
This commit is contained in:
YuSanka 2021-12-02 11:24:21 +01:00
parent 48d88191e2
commit fc089fd2c5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2736,16 +2736,17 @@ std::vector<size_t> Plater::priv::load_model_objects(const ModelObjectPtrs& mode
_L("Object too large?")); _L("Object too large?"));
} }
// Now ObjectList uses GLCanvas3D::is_object_sinkin() to show/hide "Sinking" InfoItem,
// so 3D-scene should be updated before object additing to the ObjectList
this->view3D->reload_scene(false, (unsigned int)UpdateParams::FORCE_FULL_SCREEN_REFRESH);
notification_manager->close_notification_of_type(NotificationType::UpdatedItemsInfo); notification_manager->close_notification_of_type(NotificationType::UpdatedItemsInfo);
for (const size_t idx : obj_idxs) { for (const size_t idx : obj_idxs) {
wxGetApp().obj_list()->add_object_to_list(idx); wxGetApp().obj_list()->add_object_to_list(idx);
} }
update(); update();
// Update InfoItems in ObjectList after update() to use of a correct value of the GLCanvas3D::is_sinking(),
// which is updated after a view3D->reload_scene(false, flags & (unsigned int)UpdateParams::FORCE_FULL_SCREEN_REFRESH) call
for (const size_t idx : obj_idxs)
wxGetApp().obj_list()->update_info_items(idx);
object_list_changed(); object_list_changed();
this->schedule_background_process(); this->schedule_background_process();