When generating a g-code for a layer, collect layers of multiple objects

with not exactly the same print_z, but support a slight deviation.

1 files changed, 3 insertions, 1 deletions

diff --git a/xs/src/libslic3r/GCode.hpp b/xs/src/libslic3r/GCode.hpp
index 91762237c..1fca849e2 100644
--- a/xs/src/libslic3r/GCode.hpp
+++ b/xs/src/libslic3r/GCode.hpp
@@ -140,8 +140,10 @@ protected:
         const SupportLayer   *support_layer;
         const Layer*          layer() const { return (object_layer != nullptr) ? object_layer : support_layer; }
         const PrintObject*    object() const { return (this->layer() != nullptr) ? this->layer()->object() : nullptr; }
-        coordf_t              print_z() const { return this->layer()->print_z; }
+        coordf_t              print_z() const { return (object_layer != nullptr && support_layer != nullptr) ? 0.5 * (object_layer->print_z + support_layer->print_z) : this->layer()->print_z; }
     };
+    static std::vector<GCode::LayerToPrint>                            collect_layers_to_print(const PrintObject &object);
+    static std::vector<std::pair<coordf_t, std::vector<LayerToPrint>>> collect_layers_to_print(const Print &print);
     void            process_layer(
         // Write into the output file.
         FILE                            *file,