Fixed conflicts after merge with master

2026-06-05 19:42:47 +00:00 · 2019-04-01 14:21:55 +02:00
parent 7cfcf8fb9a 32a49d1468
commit 83aaa471cf
24 changed files with 693 additions and 569 deletions
--- a/src/slic3r/GUI/Selection.hpp
+++ b/src/slic3r/GUI/Selection.hpp
@@ -297,6 +297,7 @@ private:
    void synchronize_unselected_instances(SyncRotationType sync_rotation_type);
    void synchronize_unselected_volumes();
    void ensure_on_bed();
+    bool is_from_fully_selected_instance(unsigned int volume_idx) const;
 };

 } // namespace GUI