Fixed conflicts after merge with master

2026-07-26 10:25:49 +00:00 · 2020-05-27 10:32:02 +02:00
parent aa04f0e555 e6317cdefb
commit 2eb4b2caed
68 changed files with 467 additions and 1030 deletions
@@ -25,10 +25,13 @@ namespace Slic3r {

 class Model;
 class ModelObject;
+class ModelInstance;
 class Print;
 class SLAPrint;
 enum SLAPrintObjectStep : unsigned int;

+using ModelInstancePtrs = std::vector<ModelInstance*>;
+
 namespace UndoRedo {
    class Stack;
    struct Snapshot;