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

Fixed conflict after merge with master

Browse source
This commit is contained in:
Enrico Turri 2020-03-11 13:16:15 +01:00
commit 4d39050dcd
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -3311,10 +3311,8 @@ std::string format_mouse_event_debug_message(const wxMouseEvent &evt)
void GLCanvas3D::on_mouse(wxMouseEvent& evt)
{
#if ENABLE_NON_STATIC_CANVAS_MANAGER
if (!m_initialized)
if (!m_initialized || !_set_current())
return;
#endif // ENABLE_NON_STATIC_CANVAS_MANAGER
#if ENABLE_RETINA_GL
const float scale = m_retina_helper->get_scale_factor();
@ -3389,9 +3387,6 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
return;
}
if (m_picking_enabled)
_set_current();
int selected_object_idx = m_selection.get_object_idx();
int layer_editing_object_idx = is_layers_editing_enabled() ? selected_object_idx : -1;
m_layers_editing.select_object(*m_model, layer_editing_object_idx);