Fixed conflicts after merge with master

2021-09-30 10:31:25 +02:00 · 2021-09-30 10:31:25 +02:00 · b19c742455
commit b19c742455
parent e24bd2d2d4 f7a479a90e
84 changed files with 1743 additions and 601 deletions
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@ -1619,6 +1619,7 @@ TriangleMeshStats ModelObject::get_object_stl_stats() const
        const TriangleMeshStats& stats = volume->mesh().stats();

        // initialize full_stats (for repaired errors)
+        full_stats.open_edges           += stats.open_edges;
        full_stats.degenerate_facets    += stats.degenerate_facets;
        full_stats.edges_fixed          += stats.edges_fixed;
        full_stats.facets_removed       += stats.facets_removed;