diff options
author | bubnikv <bubnikv@gmail.com> | 2017-05-30 19:33:17 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2017-05-30 19:33:17 +0300 |
commit | e1ca1a82fb57367fb54e417d2ca19d071e43755b (patch) | |
tree | 49a39e2fe4a804b6d6afbdd5ba2daab9d9d3c24a /xs/src/libslic3r/Layer.hpp | |
parent | efb1fd20666bf69aeed210588d7a3c252b024638 (diff) |
Fixed a regression bug from the last commit. Some more code simplification
and inlining.
Diffstat (limited to 'xs/src/libslic3r/Layer.hpp')
-rw-r--r-- | xs/src/libslic3r/Layer.hpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/xs/src/libslic3r/Layer.hpp b/xs/src/libslic3r/Layer.hpp index ec34f3353..2f0228453 100644 --- a/xs/src/libslic3r/Layer.hpp +++ b/xs/src/libslic3r/Layer.hpp @@ -130,15 +130,13 @@ protected: size_t _id; // sequential number of layer, 0-based PrintObject *_object; - Layer(size_t id, PrintObject *object, coordf_t height, coordf_t print_z, - coordf_t slice_z); + Layer(size_t id, PrintObject *object, coordf_t height, coordf_t print_z, coordf_t slice_z) : + upper_layer(nullptr), lower_layer(nullptr), slicing_errors(false), + slice_z(slice_z), print_z(print_z), height(height), + _id(id), _object(object) {} virtual ~Layer(); - - void clear_regions(); - void delete_region(int idx); }; - class SupportLayer : public Layer { friend class PrintObject; @@ -149,12 +147,11 @@ public: ExtrusionEntityCollection support_fills; protected: - SupportLayer(size_t id, PrintObject *object, coordf_t height, coordf_t print_z, - coordf_t slice_z); + SupportLayer(size_t id, PrintObject *object, coordf_t height, coordf_t print_z, coordf_t slice_z) : + Layer(id, object, height, print_z, slice_z) {} virtual ~SupportLayer() {} }; - } #endif |