Fixed conflicts after merging with master

2026-05-19 11:23:42 +00:00 · 2019-10-09 11:17:48 +02:00
parent 59a6318931 2dc9949a4c
commit 835ee148e5
12 changed files with 449 additions and 154 deletions
--- a/src/libslic3r/Geometry.hpp
+++ b/src/libslic3r/Geometry.hpp
@@ -280,6 +280,7 @@ public:
    void set_mirror(Axis axis, double mirror);

    void set_from_transform(const Transform3d& transform);
+    void set_from_string(const std::string& transform_str);

    void reset();