From dd108f4513c8dcd105dfd8ecd399c36eaa615cfe Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Wed, 26 Jun 2019 14:59:39 +0200
Subject: [PATCH] Hotfix for inconsistent slice index

---
 src/libslic3r/MTUtils.hpp  | 4 ++--
 src/libslic3r/SLAPrint.cpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libslic3r/MTUtils.hpp b/src/libslic3r/MTUtils.hpp
index 70603cd15f..ce26887f2c 100644
--- a/src/libslic3r/MTUtils.hpp
+++ b/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)
diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp
index 7ae481ffbf..1902e74ae6 100644
--- a/src/libslic3r/SLAPrint.cpp
+++ b/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());