3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed conflicts after merge with master

Browse source
This commit is contained in:
enricoturri1966 2020-05-28 15:50:21 +02:00
commit e9d57c932a
18 changed files with 230 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/slic3r/GUI/Plater.hpp
View file

@ -319,6 +319,11 @@ public:
const Camera& get_camera() const;
Camera& get_camera();
#if ENABLE_ENVIRONMENT_MAP
void init_environment_texture();
unsigned int get_environment_texture_id() const;
#endif // ENABLE_ENVIRONMENT_MAP
const Bed3D& get_bed() const;
Bed3D& get_bed();