Github-Mirrors/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-02 16:59:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts after merge with master

Browse Source
This commit is contained in:
Enrico Turri
2020-03-10 13:09:32 +01:00
parent 5693545d15 a6a9ab9dc7
commit a8dff7038f
8 changed files with 88 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/Plater.hpp
View File

@@ -283,9 +283,9 @@ public:
bool init_view_toolbar();
const Camera& get_camera() const;
#if ENABLE_NON_STATIC_CANVAS_MANAGER
Camera& get_camera();
#if ENABLE_NON_STATIC_CANVAS_MANAGER
const Bed3D& get_bed() const;
Bed3D& get_bed();