Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer

src/PrusaSlicer.cpp

@@ -579,7 +579,7 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn
 #endif /* SLIC3R_GUI */
         << std::endl
         << "https://github.com/prusa3d/PrusaSlicer" << std::endl << std::endl
-        << "Usage: slic3r [ ACTIONS ] [ TRANSFORM ] [ OPTIONS ] [ file.stl ... ]" << std::endl
+        << "Usage: prusa-slicer [ ACTIONS ] [ TRANSFORM ] [ OPTIONS ] [ file.stl ... ]" << std::endl
         << std::endl
         << "Actions:" << std::endl;
     cli_actions_config_def.print_cli_help(boost::nowide::cout, false);

src/libnest2d/tests/test.cpp

@@ -555,7 +555,7 @@ TEST(GeometryAlgorithms, NestTest) {
     size_t partsum = std::accumulate(result.begin(),
                                      result.end(),
                                      size_t(0),
-                                     [](int s,
+                                     [](size_t s,
                                         const decltype(
                                             result)::value_type &bin) {
                                          return s += bin.size();

src/libslic3r/MTUtils.hpp

@@ -286,7 +286,7 @@ template<class Tout,
          class = FloatingOnly<Tout>>
 inline SLIC3R_CONSTEXPR Tout scaled(const Tin &v) SLIC3R_NOEXCEPT
 {
-    return static_cast<Tout>(v / static_cast<Tout>(SCALING_FACTOR));
+    return static_cast<Tout>(v / static_cast<Tin>(SCALING_FACTOR));
 }
 
 // Conversion definition from unscaled to integer 'scaled coord'.
@@ -297,7 +297,7 @@ template<class Tout = coord_t, class Tin, class = FloatingOnly<Tin>>
 inline SLIC3R_CONSTEXPR ScaledCoordOnly<Tout> scaled(const Tin &v) SLIC3R_NOEXCEPT
 {
     //return static_cast<Tout>(std::round(v / SCALING_FACTOR));
-    return static_cast<Tout>(v / static_cast<Tout>(SCALING_FACTOR));
+    return static_cast<Tout>(v / static_cast<Tin>(SCALING_FACTOR));
 }
 
 // Conversion for Eigen vectors (N dimensional points)

src/libslic3r/SLAPrint.cpp

@@ -720,8 +720,9 @@ void SLAPrint::process()
 
         if(slindex_it == po.m_slice_index.end())
             //TRN To be shown at the status bar on SLA slicing error.
-            throw std::runtime_error(L("Slicing had to be stopped "
-                                       "due to an internal error."));
+            throw std::runtime_error(
+                L("Slicing had to be stopped due to an internal error: "
+                  "Inconsistent slice index."));
 
         po.m_model_height_levels.clear();
         po.m_model_height_levels.reserve(po.m_slice_index.size());

src/libslic3r/Technologies.hpp

@@ -15,6 +15,8 @@
 #define ENABLE_RENDER_STATISTICS 0
 // Shows an imgui dialog with camera related data
 #define ENABLE_CAMERA_STATISTICS 0
+//  Render the picking pass instead of the main scene 
+#define ENABLE_RENDER_PICKING_PASS 0
 
 
 //====================

src/slic3r/GUI/Camera.cpp

@@ -24,7 +24,7 @@ namespace GUI {
 const double Camera::DefaultDistance = 1000.0;
 double Camera::FrustrumMinZSize = 50.0;
 double Camera::FrustrumZMargin = 10.0;
-double Camera::FovMinDeg = 5.0;
+double Camera::FovMinDeg = 0.5;
 double Camera::FovMaxDeg = 75.0;
 
 Camera::Camera()

src/slic3r/GUI/GLCanvas3D.cpp

@@ -1627,6 +1627,7 @@ void GLCanvas3D::render()
             _picking_pass();
     }
 
+#if !ENABLE_RENDER_PICKING_PASS
     // draw scene
     glsafe(::glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
     _render_background();
@@ -1656,6 +1657,7 @@ void GLCanvas3D::render()
 
     _render_current_gizmo();
     _render_selection_sidebar_hints();
+#endif // !ENABLE_RENDER_PICKING_PASS
 
 #if ENABLE_SHOW_CAMERA_TARGET
     _render_camera_target();

src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp

@@ -259,6 +259,10 @@ void GLGizmoSlaSupports::render_clipping_plane(const Selection& selection) const
 
 void GLGizmoSlaSupports::on_render_for_picking(const Selection& selection) const
 {
+#if ENABLE_RENDER_PICKING_PASS
+	m_z_shift = selection.get_volume(*selection.get_volume_idxs().begin())->get_sla_shift_z();
+#endif
+
     glsafe(::glEnable(GL_DEPTH_TEST));
     render_points(selection, true);
 }