1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-26 10:25:49 +00:00

Fixed conflicts after merge with master

This commit is contained in:
Enrico Turri
2020-03-10 13:09:32 +01:00
8 changed files with 88 additions and 31 deletions
+1 -1
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();