Commit 17d94c30 authored by Maire Nicolas's avatar Maire Nicolas

Correction d'un conflit dans shaderPhong.cpp

parent 6ca39fbe
......@@ -248,20 +248,12 @@ void ShaderPhong::restoreUniformsAttribs()
getLocations();
bind();
<<<<<<< HEAD
=======
>>>>>>> 04f3042b58ff23e91cb7277bd02643f6a7e846ce
sendParams();
bindVA_VBO("VertexPosition", m_vboPos);
bindVA_VBO("VertexNormal", m_vboNormal);
if (m_vboColor)
bindVA_VBO("VertexColor", m_vboColor);
<<<<<<< HEAD
=======
>>>>>>> 04f3042b58ff23e91cb7277bd02643f6a7e846ce
unbind();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment