Merge branch 'master' into fs_emboss

2022-05-11 16:05:40 +02:00 · 2022-05-11 16:05:40 +02:00 · 34304a40bf
commit 34304a40bf
parent a8b283bcf7 e0e34f6a53
42 changed files with 1155 additions and 695 deletions
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@ -828,7 +828,7 @@ public:
    
    class WipeTowerInfo {
    protected:
-        Vec2d m_pos = {std::nan(""), std::nan("")};
+        Vec2d m_pos = {NaNd, NaNd};
        double m_rotation = 0.;
        BoundingBoxf m_bb;
        friend class GLCanvas3D;