Merge branch 'master' into FrustumCulling

# Conflicts: # src/Engine/Collision/Collision.cpp
2016-02-10 15:08:40 +01:00
parent f3a76eb13e 019e85a425
commit b2d35c80f7
104 changed files with 5677 additions and 1455 deletions
@@ -64,7 +64,7 @@ bool RayVsModel(const Ray& ray,
    float& outVCoord);

 bool AABBvsTriangles(const AABB& box,
-    const std::vector<RawModel::Vertex>& modelVertices,
+    const RawModel::Vertex* modelVertices,
    const std::vector<unsigned int>& modelIndices,
    const glm::mat4& modelMatrix,
    glm::vec3& boxVelocity,