From a59e782e85d296e953298cb33446600f96885bb8 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Mon, 22 Jul 2019 11:36:56 +0200 Subject: [PATCH 1/2] Update Arrange tooltip: [Shift+A] --- src/slic3r/GUI/GLCanvas3D.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 7388ec2196..38c0315abf 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3588,7 +3588,7 @@ bool GLCanvas3D::_init_main_toolbar() item.name = "arrange"; item.icon_filename = "arrange.svg"; - item.tooltip = _utf8(L("Arrange")) + " [A]"; + item.tooltip = _utf8(L("Arrange")) + " [A]\n" + _utf8(L("Arrange selection")) + " [Shift+A]"; item.sprite_id = 3; item.left.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_ARRANGE)); }; item.enabling_callback = []()->bool { return wxGetApp().plater()->can_arrange(); }; From dcedb9e3d3a3a3933116a43afb491f1268d25079 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Mon, 22 Jul 2019 11:47:23 +0200 Subject: [PATCH 2/2] Follow-up of 699319cd861737feedae77a1f052320860904c49 -> Fixed build on Mac --- src/libslic3r/GCode/Analyzer.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libslic3r/GCode/Analyzer.hpp b/src/libslic3r/GCode/Analyzer.hpp index 5bd240e94d..c9c81d429f 100644 --- a/src/libslic3r/GCode/Analyzer.hpp +++ b/src/libslic3r/GCode/Analyzer.hpp @@ -96,7 +96,7 @@ private: EPositioningType e_local_positioning_type; Metadata data; Vec3d start_position = Vec3d::Zero(); - float cached_position[5]{ FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX }; + float cached_position[5]; float start_extrusion; float position[Num_Axis]; unsigned int cur_cp_color_id = 0;