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

Fixed conflicts after merge with master

Browse source
This commit is contained in:
enricoturri1966 2020-04-24 10:59:03 +02:00
commit e5c45405d4
80 changed files with 4288 additions and 2581 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/GCodeViewer.hpp
View file

@ -160,7 +160,7 @@ private:
std::vector<unsigned char> m_extruder_ids;
Extrusions m_extrusions;
Shells m_shells;
mutable EViewType m_view_type{ EViewType::FeatureType };
EViewType m_view_type{ EViewType::FeatureType };
bool m_legend_enabled{ true };
public:
@ -208,8 +208,6 @@ private:
void render_toolpaths() const;
void render_shells() const;
void render_overlay() const;
void render_legend() const;
void render_toolbar() const;
};
} // namespace GUI