juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-01 09:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into xsdata

Browse Source 
Conflicts:
	lib/Slic3r.pm
	lib/Slic3r/ExPolygon.pm
	lib/Slic3r/Fill.pm
	lib/Slic3r/Fill/Rectilinear.pm
	lib/Slic3r/GCode.pm
	lib/Slic3r/GUI/Plater.pm
	lib/Slic3r/Geometry/Clipper.pm
	lib/Slic3r/Layer/Region.pm
	lib/Slic3r/Print.pm
	lib/Slic3r/Print/Object.pm
	lib/Slic3r/TriangleMesh.pm
	t/shells.t
	xs/MANIFEST
This commit is contained in:
Alessandro Ranellucci
2013-08-08 02:10:34 +02:00
parent d881c5ab2f 4438aec12c
commit b38cc2c244
60 changed files with 1432 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xs/src/ExPolygon.hpp
View File

@@ -11,7 +11,6 @@ class ExPolygon
public:
Polygon contour;
Polygons holes;
bool in_collection;
void from_SV(SV* poly_sv);
void from_SV_check(SV* poly_sv);
SV* to_SV();
@@ -23,7 +22,6 @@ class ExPolygon
};
typedef std::vector<ExPolygon> ExPolygons;
typedef std::vector<ExPolygon*> ExPolygonsPtr;
}