public_mirrors/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-19 09:24:27 +00:00
Code Issues Activity

Fixed conflicts after merge with master

Browse Source
This commit is contained in:
Enrico Turri
2020-03-09 16:03:15 +01:00
parent de7a09f833 56fa84c9d9
commit 5693545d15
71 changed files with 3265 additions and 2634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/GLCanvas3D.cpp
-6
View File
@@ -4088,12 +4088,6 @@ void GLCanvas3D::handle_layers_data_focus_event(const t_layer_height_range range
void GLCanvas3D::update_ui_from_settings()
{
#if ENABLE_NON_STATIC_CANVAS_MANAGER
Camera& camera = wxGetApp().plater()->get_camera();
camera.set_type(wxGetApp().app_config->get("use_perspective_camera"));
#else
m_camera.set_type(wxGetApp().app_config->get("use_perspective_camera"));
#endif // ENABLE_NON_STATIC_CANVAS_MANAGER
m_dirty = true;
#if ENABLE_RETINA_GL