Merge branch 'master' into BoxModelCollision

# Conflicts: # src/Game/Systems/PlayerMovementSystem.cpp
2016-02-05 14:59:14 +01:00
parent 428dca003d ff26e1235c
commit e3a44d37d2
55 changed files with 2450 additions and 217 deletions
@@ -149,7 +149,7 @@ template<typename T>
 template<typename Box>
 void Octree<T>::ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects)
 {
-    //static_assert(std::is_base_of<AABB, Box>::value, "template argument type Box in Octree<T>::ObjectsInSameRegion must be a subclass of AABB.");
+    static_assert(std::is_base_of<AABB, Box>::value, "template argument type Box in Octree<T>::ObjectsInSameRegion must be a subclass of AABB.");
    falsifyObjectChecks();
    m_Root->ObjectsInSameRegion(box, outObjects);
 }