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

Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

Browse Source
This commit is contained in:
Enrico Turri 2020-05-21 10:32:29 +02:00
commit a9e2444d29
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GLShadersManager.cpp
View File

@ -79,7 +79,7 @@ GLShaderProgram* GLShadersManager::get_current_shader()
GLint id = 0; GLint id = 0;
glsafe(::glGetIntegerv(GL_CURRENT_PROGRAM, &id)); glsafe(::glGetIntegerv(GL_CURRENT_PROGRAM, &id));
if (id == 0) if (id == 0)
return false; return nullptr;
auto it = std::find_if(m_shaders.begin(), m_shaders.end(), [id](std::unique_ptr<GLShaderProgram>& p) { return p->get_id() == id; }); auto it = std::find_if(m_shaders.begin(), m_shaders.end(), [id](std::unique_ptr<GLShaderProgram>& p) { return p->get_id() == id; });
return (it != m_shaders.end()) ? it->get() : nullptr; return (it != m_shaders.end()) ? it->get() : nullptr;