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

Fixed conflicts after merge with dev branch

Browse source
This commit is contained in:
enricoturri1966 2022-01-14 11:59:08 +01:00
parent 1c3c7696a6
commit 8057a70b11
2 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/Selection.cpp
View file

@ -2081,7 +2081,7 @@ void Selection::render_sidebar_position_hints(const std::string& sidebar_field)
void Selection::render_sidebar_rotation_hints(const std::string& sidebar_field) const
{
auto render_sidebar_rotation_hint = [this](const std::array<float, 4>& color) {
auto render_sidebar_rotation_hint = [this](const ColorRGBA& color) {
const_cast<GLModel*>(&m_curved_arrow)->set_color(-1, color);
m_curved_arrow.render();
glsafe(::glRotated(180.0, 0.0, 0.0, 1.0));