Merge branch 'master' into feature/loadingscreen-refactor

This commit is contained in:
Alexander Bock
2017-11-09 22:49:07 -06:00
committed by GitHub
246 changed files with 4256 additions and 983 deletions

View File

@@ -273,7 +273,7 @@ void RenderableGalaxy::initializeGL() {
GLint colorAttrib = _pointsProgram->attributeLocation("inColor");
glBindBuffer(GL_ARRAY_BUFFER, _positionVbo);
glEnableVertexAttribArray(positionAttrib);
glEnableVertexAttribArray(positionAttrib);
glVertexAttribPointer(positionAttrib, 3, GL_FLOAT, GL_FALSE, 0, 0);
glBindBuffer(GL_ARRAY_BUFFER, _colorVbo);