fix the line color again

still was set to my debug values Change-Id: I1b993450fee7be75a0a9e98fb99ffdea0c23baca

fix the line color again
still was set to my debug values Change-Id: I1b993450fee7be75a0a9e98fb99ffdea0c23baca
ae119407 · Markus Mohrhard · Markus Mohrhard · b391832c · ae119407
Kaydet (Commit) ae119407 authored Ock 12, 2014 tarafından Markus Mohrhard Kaydeden (comit) Markus Mohrhard Ock 29, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

OpenGLRender.cxx chart2/source/view/main/OpenGLRender.cxx +1 -2

No files found.
--- 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();