mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-09 16:51:12 +00:00
Merge Main into Belt Printer
This commit is contained in:
@@ -4,7 +4,6 @@
|
||||
#include "IMSlider.hpp"
|
||||
#include "GUI_Preview.hpp"
|
||||
#include "GUI_App.hpp"
|
||||
#include "GUI.hpp"
|
||||
#include <wx/slider.h>
|
||||
#include <wx/gdicmn.h>
|
||||
#include <string>
|
||||
@@ -21,19 +20,16 @@
|
||||
#include "libslic3r/PrintConfig.hpp"
|
||||
#include "libslic3r/ExPolygon.hpp"
|
||||
#include <cmath>
|
||||
#include "libvgcode/include/Types.hpp"
|
||||
#include <cstdint>
|
||||
#if ENABLE_OPENGL_AUTO_AA_SAMPLES
|
||||
#include "GUI_Init.hpp"
|
||||
#endif // ENABLE_OPENGL_AUTO_AA_SAMPLES
|
||||
#include "I18N.hpp"
|
||||
#include "3DScene.hpp"
|
||||
#include "BackgroundSlicingProcess.hpp"
|
||||
#include "OpenGLManager.hpp"
|
||||
#include "GLCanvas3D.hpp"
|
||||
#include "libslic3r/PresetBundle.hpp"
|
||||
#include "Plater.hpp"
|
||||
#include "MainFrame.hpp"
|
||||
#include "format.hpp"
|
||||
|
||||
#include <wx/listbook.h>
|
||||
#include <wx/notebook.h>
|
||||
@@ -47,8 +43,15 @@
|
||||
|
||||
// this include must follow the wxWidgets ones or it won't compile on Windows -> see http://trac.wxwidgets.org/ticket/2421
|
||||
#include "libslic3r/Print.hpp"
|
||||
#include "libslic3r/SLAPrint.hpp"
|
||||
#include "NotificationManager.hpp"
|
||||
#include "libslic3r/Model.hpp"
|
||||
#include "libslic3r/MultiMaterialSegmentation.hpp"
|
||||
#include "slic3r/GUI/GCodeViewer.hpp"
|
||||
#include "slic3r/GUI/PartPlate.hpp"
|
||||
#include "slic3r/GUI/Selection.hpp"
|
||||
|
||||
class wxDropTarget;
|
||||
namespace libvgcode { enum class EViewType : uint8_t; }
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "BitmapComboBox.hpp"
|
||||
|
||||
Reference in New Issue
Block a user