Merge pull request #73 from teamfisk/CapturePointFixBranch

Several changes/fixes based on the latest broken refactoring in master
2016-02-02 13:22:03 +01:00
parent 9090be8acf 42b52a6766
commit 0e5f6da9a9
9 changed files with 205 additions and 10 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);
 }