FIX:AssembleViewData crash
Change-Id: I759a385621b8a83d89abcc7c1b38786e067dbb33 (cherry picked from commit c218e7dd77fad970f637412dc9c230b1241c1f67)
This commit is contained in:
parent
ebf7a6c3c7
commit
c065c3a2e6
|
@ -816,7 +816,6 @@ void AssembleView::reload_scene(bool refresh_immediately, bool force_full_scene_
|
|||
m_canvas->render(true);
|
||||
}
|
||||
m_canvas->reload_scene(refresh_immediately, force_full_scene_refresh);
|
||||
m_canvas->reload_scene(refresh_immediately, force_full_scene_refresh);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -611,6 +611,9 @@ void ModelObjectsInfo::on_update()
|
|||
if (!get_pool()->get_canvas()->get_model()->objects.empty()) {
|
||||
m_model_objects = get_pool()->get_canvas()->get_model()->objects;
|
||||
}
|
||||
else {
|
||||
m_model_objects.clear();
|
||||
}
|
||||
}
|
||||
|
||||
void ModelObjectsInfo::on_release()
|
||||
|
|
|
@ -345,7 +345,7 @@ void GLGizmosManager::update(const Linef3& mouse_ray, const Point& mouse_pos)
|
|||
void GLGizmosManager::update_assemble_view_data()
|
||||
{
|
||||
if (m_assemble_view_data) {
|
||||
if (m_parent.get_canvas_type() != GLCanvas3D::CanvasAssembleView)
|
||||
if (!wxGetApp().plater()->get_assmeble_canvas3D()->get_wxglcanvas()->IsShown())
|
||||
m_assemble_view_data->update(AssembleViewDataID(0));
|
||||
else
|
||||
m_assemble_view_data->update(AssembleViewDataID((int)AssembleViewDataID::ModelObjectsInfo | (int)AssembleViewDataID::ModelObjectsClipper));
|
||||
|
|
Loading…
Reference in New Issue