From 667141302300229d5ea9fc5a1cd75381b8259459 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 15 Aug 2023 10:39:51 +0200 Subject: [PATCH 1/2] Fix for SPE-1843 - PresetComboBoxes on Settings Tabs doesn't revert the selection, when "Cancel" button is clicked in UnsaveChangesDilalog This bug was caused by mistakenly commented line of code in https://github.com/Prusa-Development/PrusaSlicerPrivate/commit/9e4859ebbf9006a454e905c0aef352be1cabf251 --- src/slic3r/GUI/Tab.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index ad93afa879..1a479e566b 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3652,7 +3652,8 @@ bool Tab::select_preset(std::string preset_name, bool delete_current /*=false*/, } } - // update_tab_ui(); //! ysFIXME delete after testing + // ! update preset combobox, to revert previously selection + update_tab_ui(); // Trigger the on_presets_changed event so that we also restore the previous value in the plater selector, // if this action was initiated from the plater. From a386d092b70c35c0f07d31e1190ad2855e9b072b Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 15 Aug 2023 14:37:00 +0200 Subject: [PATCH 2/2] CutGizmo: Set "emission_factor" for shader, when rendering GLModels to avoid flickering of the connectors on change camera view --- src/slic3r/GUI/Gizmos/GLGizmoCut.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index 9d23a51808..b8e64fafa6 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -948,6 +948,7 @@ void GLGizmoCut3D::render_model(GLModel& model, const ColorRGBA& color, Transfor shader->start_using(); shader->set_uniform("view_model_matrix", view_model_matrix); + shader->set_uniform("emission_factor", 0.2f); shader->set_uniform("projection_matrix", wxGetApp().plater()->get_camera().get_projection_matrix()); model.set_color(color);