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

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

Browse source
This commit is contained in:
Enrico Turri 2019-01-21 15:46:05 +01:00
commit 6107b7fd2f
9 changed files with 103 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libslic3r/Fill/FillBase.hpp
View file

@ -38,6 +38,7 @@ struct FillParams
// in this case we don't try to make more continuous paths
bool complete;
};
static_assert(std::is_trivially_copyable<FillParams>::value, "FillParams class is not POD (and it should be - see constructor).");
class Fill
{

3
src/libslic3r/Slicing.hpp
View file

@ -6,6 +6,7 @@
#include <set>
#include <vector>
#include <map>
#include <cstring>
#include "libslic3r.h"
namespace Slic3r
@ -91,6 +92,8 @@ struct SlicingParameters
coordf_t object_print_z_min;
coordf_t object_print_z_max;
};
static_assert(std::is_trivially_copyable<SlicingParameters>::value, "SlicingParameters class is not POD (and it should be - see constructor).");
// The two slicing parameters lead to the same layering as long as the variable layer thickness is not in action.
inline bool equal_layering(const SlicingParameters &sp1, const SlicingParameters &sp2)