GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 06:35:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compilation and test cases.

Browse Source
This commit is contained in:
bubnikv 2018-03-28 19:47:26 +02:00
parent 33e1108f65
commit fca7c8abfe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xs/src/libslic3r/Print.cpp
View File

@ -159,7 +159,7 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
"wipe"
};
static std::unordered_set<std::string> steps_ignore = {};
static std::unordered_set<std::string> steps_ignore;
std::vector<PrintStep> steps;
std::vector<PrintObjectStep> osteps;

2
xs/src/libslic3r/TriangleMesh.hpp
View File

@ -134,7 +134,7 @@ public:
typedef std::function<void()> throw_on_cancel_callback_type;
TriangleMeshSlicer() : mesh(nullptr) {}
// Not quite nice, but the constructor and init() methods require non-const mesh pointer to be able to call mesh->require_shared_vertices()
TriangleMeshSlicer(TriangleMesh* mesh) { this->init(mesh, throw_on_cancel_callback_type()); }
TriangleMeshSlicer(TriangleMesh* mesh) { this->init(mesh, [](){}); }
void init(TriangleMesh *mesh, throw_on_cancel_callback_type throw_on_cancel);
void slice(const std::vector<float> &z, std::vector<Polygons>* layers, throw_on_cancel_callback_type throw_on_cancel) const;
void slice(const std::vector<float> &z, std::vector<ExPolygons>* layers, throw_on_cancel_callback_type throw_on_cancel) const;