diff options
author | bubnikv <bubnikv@gmail.com> | 2018-08-17 19:07:45 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2018-08-17 19:07:45 +0300 |
commit | 9e7634b6e8370bb63e92c91ff87f88f0a98b06c0 (patch) | |
tree | 93374effb494d80ecb86e0459bde5a51517a7198 /xs/src/libslic3r/Model.hpp | |
parent | 0eba590fc62e57b6dc6e520f0b340f8cbf140e6b (diff) | |
parent | 3433e8e3743f8aebea940ae92e3f26fec03c7a22 (diff) |
Merged with master
Diffstat (limited to 'xs/src/libslic3r/Model.hpp')
-rw-r--r-- | xs/src/libslic3r/Model.hpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xs/src/libslic3r/Model.hpp b/xs/src/libslic3r/Model.hpp index 06f727ccf..8dcfff024 100644 --- a/xs/src/libslic3r/Model.hpp +++ b/xs/src/libslic3r/Model.hpp @@ -291,8 +291,7 @@ public: void center_instances_around_point(const Pointf &point); void translate(coordf_t x, coordf_t y, coordf_t z) { for (ModelObject *o : this->objects) o->translate(x, y, z); } TriangleMesh mesh() const; - bool arrange_objects(coordf_t dist, const BoundingBoxf* bb = NULL, - std::function<void(unsigned)> progressind = [](unsigned){}); + bool arrange_objects(coordf_t dist, const BoundingBoxf* bb = NULL); // Croaks if the duplicated objects do not fit the print bed. void duplicate(size_t copies_num, coordf_t dist, const BoundingBoxf* bb = NULL); void duplicate_objects(size_t copies_num, coordf_t dist, const BoundingBoxf* bb = NULL); |