Merge branch 'master' into fs_QuadricEdgeCollapse

2021-08-02 09:04:15 +02:00
parent 56c5b85aa1 bf5293012f
commit 7b6a65eaea
160 changed files with 5982 additions and 5094 deletions
--- a/src/slic3r/GUI/ObjectDataViewModel.hpp
+++ b/src/slic3r/GUI/ObjectDataViewModel.hpp
@@ -51,6 +51,7 @@ enum class InfoItemType
    CustomSupports,
    CustomSeam,
    MmuSegmentation,
+    Sinking,
    VariableLayerHeight
 };