Merge remote-tracking branch 'origin/master' into Menu

# Conflicts: # resources/Schema/Entities/Player.xml
2016-01-24 22:23:53 +01:00
parent 7e92d6f53f 47d2fb6a9b
commit d03b3fb071
23 changed files with 506 additions and 296 deletions
@@ -90,7 +90,7 @@ void PickingPass::Draw(RenderScene& scene)

            glBindVertexArray(modelJob->Model->VAO);
            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer);
-            glDrawElementsBaseVertex(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, nullptr, modelJob->StartIndex);
+            glDrawElements(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, (void*)(modelJob->StartIndex * sizeof(unsigned int)));
        }
    }