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

Merge branch 'master' into fs_emboss

Browse source 
# Conflicts:
#	src/slic3r/GUI/GUI_ObjectList.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
This commit is contained in:
Filip Sykala 2021-11-23 09:09:09 +01:00
commit eba68f9a9e
311 changed files with 42234 additions and 9837 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/libslic3r/test_meshboolean.cpp
View file

@ -3,7 +3,6 @@
#include <libslic3r/TriangleMesh.hpp>
#include <libslic3r/MeshBoolean.hpp>
#include <libslic3r/SimplifyMesh.hpp>
using namespace Slic3r;