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

Conflicts: src/Engine/Rendering/CubeMapPass.cpp src/Engine/Rendering/DrawFinalPass.cpp
2016-03-01 12:11:27 +01:00
parent df7ace6626
commit 77eaa45702
60 changed files with 1481 additions and 701 deletions
@@ -24,6 +24,7 @@ public:
 private:
    Octree<EntityAABB>* m_Octree;
    std::vector<EntityAABB> m_OctreeResult;
+    std::unordered_map<EntityWrapper, glm::vec3> m_PrevPositions;
 };

 #endif