From 23284b61eae71b94d4e1b3bfb8cca2fcddab24f8 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 13 Dec 2021 09:27:35 +0100 Subject: [PATCH 1/2] Fix for #7481 - Found typo in BitmapComboBox.cpp L257: _MSW_DAEK_MODE --- src/slic3r/GUI/BitmapComboBox.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/BitmapComboBox.cpp b/src/slic3r/GUI/BitmapComboBox.cpp index 24bc8dcfd..3396c627b 100644 --- a/src/slic3r/GUI/BitmapComboBox.cpp +++ b/src/slic3r/GUI/BitmapComboBox.cpp @@ -254,8 +254,8 @@ void BitmapComboBox::DrawBackground_(wxDC& dc, const wxRect& rect, int WXUNUSED( dc.SetTextForeground(flags & ODCB_PAINTING_DISABLED ? wxColour(108,108,108) : wxGetApp().get_label_clr_default()); wxColour selCol = flags & ODCB_PAINTING_DISABLED ? -#ifdef _MSW_DAEK_MODE - wxRGBToColour(NppDarkMode::InvertLightnessSofter(NppDarkMode::GetBackgroundColor())) : +#ifdef _MSW_DARK_MODE + wxRGBToColour(NppDarkMode::GetSofterBackgroundColor()) : #else wxGetApp().get_highlight_default_clr() : #endif From 0d68a534abb7c120489eabd71c9874c0e39f80dc Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Mon, 13 Dec 2021 09:50:13 +0100 Subject: [PATCH 2/2] Always use batched models to render options in preview --- src/slic3r/GUI/GCodeViewer.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 8f1990a57..5f61c84cc 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -581,14 +581,14 @@ void GCodeViewer::init() case EMoveType::Retract: case EMoveType::Unretract: case EMoveType::Seam: { - if (wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) { - buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::InstancedModel; - buffer.shader = "gouraud_light_instanced"; - buffer.model.model.init_from(diamond(16)); - buffer.model.color = option_color(type); - buffer.model.instances.format = InstanceVBuffer::EFormat::InstancedModel; - } - else { +// if (wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) { +// buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::InstancedModel; +// buffer.shader = "gouraud_light_instanced"; +// buffer.model.model.init_from(diamond(16)); +// buffer.model.color = option_color(type); +// buffer.model.instances.format = InstanceVBuffer::EFormat::InstancedModel; +// } +// else { buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::BatchedModel; buffer.vertices.format = VBuffer::EFormat::PositionNormal3; buffer.shader = "gouraud_light"; @@ -596,7 +596,7 @@ void GCodeViewer::init() buffer.model.data = diamond(16); buffer.model.color = option_color(type); buffer.model.instances.format = InstanceVBuffer::EFormat::BatchedModel; - } +// } break; } case EMoveType::Wipe: