3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-23 00:31:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev

Browse source
This commit is contained in:
Enrico Turri 2018-08-31 08:46:47 +02:00
commit ae9355e634
21 changed files with 375 additions and 729 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xs/src/libslic3r/Print.cpp
View file

@ -13,7 +13,7 @@
#include <boost/lexical_cast.hpp>
#include <boost/log/trivial.hpp>
#include "slic3r/IProgressIndicator.hpp"
#include "slic3r/ProgressIndicator.hpp"
#include "PrintExport.hpp"
//! macro used to mark string used at localization,

4
xs/src/libslic3r/Print.hpp
View file

@ -227,8 +227,8 @@ private:
typedef std::vector<PrintObject*> PrintObjectPtrs;
typedef std::vector<PrintRegion*> PrintRegionPtrs;
class IProgressIndicator;
using ProgressIndicatorPtr = std::shared_ptr<IProgressIndicator>;
class ProgressIndicator;
using ProgressIndicatorPtr = std::shared_ptr<ProgressIndicator>;
// The complete print tray with possibly multiple objects.
class Print