PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-14 19:12:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts after merge with master

Browse Source
This commit is contained in:
enricoturri1966
2020-04-24 10:59:03 +02:00
parent 81a29169ae 4f622e4541
commit e5c45405d4
80 changed files with 4288 additions and 2581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/GCodeViewer.cpp
View File

@@ -624,12 +624,6 @@ void GCodeViewer::render_shells() const
}
void GCodeViewer::render_overlay() const
{
render_legend();
render_toolbar();
}
void GCodeViewer::render_legend() const
{
static const ImVec4 ORANGE(1.0f, 0.49f, 0.22f, 1.0f);
static const float ICON_BORDER_SIZE = 25.0f;
@@ -803,10 +797,6 @@ void GCodeViewer::render_legend() const
ImGui::PopStyleVar();
}
void GCodeViewer::render_toolbar() const
{
}
} // namespace GUI
} // namespace Slic3r