Merge branch 'sidebar_fixes' of https://github.com/prusa3d/Slic3r

src/libslic3r/Geometry.cpp

@@ -1182,8 +1182,6 @@ Vec3d extract_euler_angles(const Eigen::Matrix<double, 3, 3, Eigen::DontAlign>&
 {
 #if ENABLE_NEW_EULER_ANGLES
     // reference: http://www.gregslabaugh.net/publications/euler.pdf
-    auto is_approx = [](double value, double test_value) -> bool { return std::abs(value - test_value) < EPSILON; };
-
     Vec3d angles1 = Vec3d::Zero();
     Vec3d angles2 = Vec3d::Zero();
     if (is_approx(std::abs(rotation_matrix(2, 0)), 1.0))

src/libslic3r/Technologies.hpp

@@ -32,8 +32,6 @@
 //====================
 #define ENABLE_1_42_0_ALPHA2 1
 
-// Improves navigation between sidebar fields
-#define ENABLE_IMPROVED_SIDEBAR_OBJECTS_MANIPULATION (1 && ENABLE_1_42_0_ALPHA2)
 // Adds print bed models to 3D scene
 #define ENABLE_PRINT_BED_MODELS (1 && ENABLE_1_42_0_ALPHA2)
 #endif // _technologies_h_

src/libslic3r/libslic3r.h

@@ -16,6 +16,7 @@
 #include <stdarg.h>
 #include <vector>
 #include <cassert>
+#include <cmath>
 
 #include "Technologies.hpp"
 
@@ -164,6 +165,12 @@ static inline T lerp(const T& a, const T& b, Number t)
     return (Number(1) - t) * a + t * b;
 }
 
+template <typename Number>
+static inline bool is_approx(Number value, Number test_value)
+{
+    return std::fabs(double(value) - double(test_value)) < double(EPSILON);
+};
+
 } // namespace Slic3r
 
 #endif