3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -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-08-03 14:17:40 +02:00
commit 0eb6ba96d6
9 changed files with 34 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/3DBed.cpp
View file

@ -710,23 +710,11 @@ void Bed3D::render_default(bool bottom) const
}
// draw grid
#if ENABLE_LAYOUT_NO_RESTART
glsafe(::glLineWidth(1.5f * m_scale_factor));
#else
glsafe(::glLineWidth(3.0f * m_scale_factor));
#endif // ENABLE_LAYOUT_NO_RESTART
if (has_model && !bottom)
#if ENABLE_LAYOUT_NO_RESTART
glsafe(::glColor4f(0.9f, 0.9f, 0.9f, 1.0f));
#else
glsafe(::glColor4f(0.75f, 0.75f, 0.75f, 1.0f));
#endif // ENABLE_LAYOUT_NO_RESTART
else
#if ENABLE_LAYOUT_NO_RESTART
glsafe(::glColor4f(0.9f, 0.9f, 0.9f, 0.6f));
#else
glsafe(::glColor4f(0.2f, 0.2f, 0.2f, 0.4f));
#endif //ENABLE_LAYOUT_NO_RESTART
glsafe(::glVertexPointer(3, GL_FLOAT, m_triangles.get_vertex_data_size(), (GLvoid*)m_gridlines.get_vertices_data()));
glsafe(::glDrawArrays(GL_LINES, 0, (GLsizei)m_gridlines.get_vertices_count()));