Merge branch 'master' into fs_QuadricEdgeCollapse

2021-08-16 11:56:56 +02:00
parent 6e5bf6486a 47f485ea70
commit 2b4005d1f5
116 changed files with 3328 additions and 1335 deletions
--- a/src/libslic3r/QuadricEdgeCollapse.cpp
+++ b/src/libslic3r/QuadricEdgeCollapse.cpp
@@ -1,5 +1,6 @@
 #include "QuadricEdgeCollapse.hpp"
 #include <tuple>
+#include <optional>
 #include "MutablePriorityQueue.hpp"
 #include "SimplifyMeshImpl.hpp"
 #include <tbb/parallel_for.h>