chart2/source/view/main/OpenGLRender.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit cc47e75fc2fdb09130809836fe24eb360e8fa3ad Author: Markus Mohrhard <[email protected]> Date: Mon Jan 13 00:51:02 2014 +0100 fix the line color again still was set to my debug values Change-Id: I1b993450fee7be75a0a9e98fb99ffdea0c23baca diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index e6d2393..b736b93 100644 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -616,8 +616,7 @@ int OpenGLRender::RenderLine2FBO(int) glUseProgram(m_CommonProID); CHECK_GL_ERROR(); - glm::vec4 aColor(1.0,0.5,0.5,0.5); - glUniform4fv(m_2DColorID, 1, &aColor[0]); + glUniform4fv(m_2DColorID, 1, &m_Line2DColor[0]); CHECK_GL_ERROR(); glUniformMatrix4fv(m_MatrixID, 1, GL_FALSE, &m_MVP[0][0]); //CHECK_GL_ERROR(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
