3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed conflicts after merge with master

Browse source
This commit is contained in:
Enrico Turri 2019-04-02 15:13:26 +02:00
commit 89a0c84c83
26 changed files with 368 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -479,6 +479,7 @@ public:
m_sla_caps[id].reset();
}
}
void reset_clipping_planes_cache() { m_sla_caps[0].triangles.clear(); m_sla_caps[1].triangles.clear(); }
void set_use_clipping_planes(bool use) { m_use_clipping_planes = use; }
void set_color_by(const std::string& value);