3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-22 06:04:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/ys_undo_redo' into vb_undo_redo

Browse source
This commit is contained in:
bubnikv 2019-07-04 20:15:50 +02:00
commit 1070991149
8 changed files with 89 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/Utils/UndoRedo.hpp
View file

@ -31,8 +31,8 @@ struct Snapshot
// Excerpt of Slic3r::GUI::Selection for serialization onto the Undo / Redo stack.
struct Selection : public Slic3r::ObjectBase {
unsigned char mode;
std::vector<std::pair<ObjectID, ObjectID>> volumes_and_instances;
unsigned char mode;
std::vector<std::pair<size_t, size_t>> volumes_and_instances;
template<class Archive> void serialize(Archive &ar) { ar(mode, volumes_and_instances); }
};