1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-18 09:14:27 +00:00

Fixed conflicts after merge with master

This commit is contained in:
Enrico Turri
2019-04-01 14:21:55 +02:00
24 changed files with 693 additions and 569 deletions
+1
View File
@@ -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