Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Turri <enricoturri@seznam.cz>2019-12-04 12:35:28 +0300
committerEnrico Turri <enricoturri@seznam.cz>2019-12-04 12:35:28 +0300
commit8604e193847cac0ce92229759f1f239997ca8b9c (patch)
tree9c1958107b5d5dceb1dafefcf2ff16fd9c1cae11
parent6440c8ccfd432b725b49c920660aa3d539cdf37d (diff)
Fix into GLShader::load_from_text()
-rw-r--r--src/slic3r/GUI/GLShader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/slic3r/GUI/GLShader.cpp b/src/slic3r/GUI/GLShader.cpp
index 577f6e1b5..11f109fd5 100644
--- a/src/slic3r/GUI/GLShader.cpp
+++ b/src/slic3r/GUI/GLShader.cpp
@@ -118,9 +118,9 @@ bool GLShader::load_from_text(const char *fragment_shader, const char *vertex_sh
glsafe(::glGetProgramiv(this->shader_program_id, GL_LINK_STATUS, &params));
if (params == GL_FALSE) {
// Linking failed. Get the log.
- glsafe(::glGetProgramiv(this->vertex_program_id, GL_INFO_LOG_LENGTH, &params));
+ glsafe(::glGetProgramiv(this->shader_program_id, GL_INFO_LOG_LENGTH, &params));
std::vector<char> msg(params);
- glsafe(::glGetProgramInfoLog(this->vertex_program_id, params, &params, msg.data()));
+ glsafe(::glGetProgramInfoLog(this->shader_program_id, params, &params, msg.data()));
this->last_error = std::string("Shader linking failed:\n") + msg.data();
this->release();
return false;