3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed conflicts after merge with master

Browse source
This commit is contained in:
Enrico Turri 2019-04-01 14:21:55 +02:00
commit 83aaa471cf
24 changed files with 693 additions and 569 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/GUI/Selection.hpp
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