From 8d8a5b4b41b8e8d2bd6ab3a42dd64da31a50029c Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Fri, 25 Mar 2022 09:27:26 +0100 Subject: [PATCH] Fixed warning Fixed conflicts during rebase with master --- src/slic3r/GUI/GCodeViewer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index caf0d169dd..89c5095c1f 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -3000,7 +3000,9 @@ void GCodeViewer::render_toolpaths() const std::array light_intensity = { 0.25f, 0.70f, 0.75f, 0.75f }; #endif // !ENABLE_GL_SHADERS_ATTRIBUTES const Camera& camera = wxGetApp().plater()->get_camera(); +#if !ENABLE_GL_CORE_PROFILE const double zoom = camera.get_zoom(); +#endif // !ENABLE_GL_CORE_PROFILE #if !ENABLE_GL_SHADERS_ATTRIBUTES auto shader_init_as_lines = [light_intensity](GLShaderProgram &shader) {