3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

Browse Source
This commit is contained in:
enricoturri1966 2020-08-27 08:00:45 +02:00
commit 88b6835258
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/PrintConfig.hpp
View File

@ -239,9 +239,13 @@ class DynamicPrintConfig : public DynamicConfig
public: public:
DynamicPrintConfig() {} DynamicPrintConfig() {}
DynamicPrintConfig(const DynamicPrintConfig &rhs) : DynamicConfig(rhs) {} DynamicPrintConfig(const DynamicPrintConfig &rhs) : DynamicConfig(rhs) {}
DynamicPrintConfig(DynamicPrintConfig &&rhs) noexcept : DynamicConfig(std::move(rhs)) {}
explicit DynamicPrintConfig(const StaticPrintConfig &rhs); explicit DynamicPrintConfig(const StaticPrintConfig &rhs);
explicit DynamicPrintConfig(const ConfigBase &rhs) : DynamicConfig(rhs) {} explicit DynamicPrintConfig(const ConfigBase &rhs) : DynamicConfig(rhs) {}
DynamicPrintConfig& operator=(const DynamicPrintConfig &rhs) { DynamicConfig::operator=(rhs); return *this; }
DynamicPrintConfig& operator=(DynamicPrintConfig &&rhs) noexcept { DynamicConfig::operator=(std::move(rhs)); return *this; }
static DynamicPrintConfig full_print_config(); static DynamicPrintConfig full_print_config();
static DynamicPrintConfig* new_from_defaults_keys(const std::vector<std::string> &keys); static DynamicPrintConfig* new_from_defaults_keys(const std::vector<std::string> &keys);

7
src/slic3r/GUI/MainFrame.cpp
View File

@ -13,7 +13,6 @@
#include <wx/debug.h> #include <wx/debug.h>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/process/spawn.hpp>
#include "libslic3r/Print.hpp" #include "libslic3r/Print.hpp"
#include "libslic3r/Polygon.hpp" #include "libslic3r/Polygon.hpp"
@ -41,6 +40,12 @@
#include <shlobj.h> #include <shlobj.h>
#endif // _WIN32 #endif // _WIN32
// For starting another PrusaSlicer instance on OSX.
// Fails to compile on Windows on the build server.
#ifdef __APPLE__
#include <boost/process/spawn.hpp>
#endif
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {