Merge remote-tracking branch 'remotes/origin/vb_undo_redo'

src/libslic3r/CMakeLists.txt

@@ -113,6 +113,8 @@ add_library(libslic3r STATIC
     MultiPoint.cpp
     MultiPoint.hpp
     MutablePriorityQueue.hpp
+    ObjectID.cpp
+    ObjectID.hpp
     PerimeterGenerator.cpp
     PerimeterGenerator.hpp
     PlaceholderParser.cpp
@@ -188,6 +190,7 @@ target_include_directories(libslic3r PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${LIBNE
 target_link_libraries(libslic3r
     libnest2d
     admesh
+    cereal
     libigl
     miniz
     boost_libs