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:
enricoturri1966
2020-03-25 14:41:47 +01:00
parent ed0f3b3406 bf5d52f221
commit f12b39be25
171 changed files with 23530 additions and 14236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/3DScene.hpp
View File

@@ -12,7 +12,6 @@
#endif // !ENABLE_NON_STATIC_CANVAS_MANAGER
#include <functional>
#include <memory>
#ifndef NDEBUG
#define HAS_GLSAFE
@@ -36,13 +35,8 @@ struct Camera;
class GLToolbar;
} // namespace GUI
class Print;
class PrintObject;
class SLAPrint;
class SLAPrintObject;
enum SLAPrintObjectStep : unsigned int;
class Model;
class ModelObject;
class DynamicPrintConfig;
class ExtrusionPath;
class ExtrusionMultiPath;