diff options
author | ariel- <ariel-@users.noreply.github.com> | 2017-06-19 23:20:06 -0300 |
---|---|---|
committer | ariel- <ariel-@users.noreply.github.com> | 2017-06-19 23:20:06 -0300 |
commit | 85a7d5ce9ac68b30da2277cc91d4b70358f1880d (patch) | |
tree | df3d2084ee2e35008903c03178039b9c986e2d08 /src/common/Collision/BoundingIntervalHierarchyWrapper.h | |
parent | 052fc24315ace866ea1cf610e85df119b68100c9 (diff) |
Core: ported headers cleanup from master branch
Diffstat (limited to 'src/common/Collision/BoundingIntervalHierarchyWrapper.h')
-rw-r--r-- | src/common/Collision/BoundingIntervalHierarchyWrapper.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/Collision/BoundingIntervalHierarchyWrapper.h b/src/common/Collision/BoundingIntervalHierarchyWrapper.h index b7f78ea7baf..32c99798768 100644 --- a/src/common/Collision/BoundingIntervalHierarchyWrapper.h +++ b/src/common/Collision/BoundingIntervalHierarchyWrapper.h @@ -19,10 +19,10 @@ #ifndef _BIH_WRAP #define _BIH_WRAP -#include "G3D/Table.h" -#include "G3D/Array.h" -#include "G3D/Set.h" #include "BoundingIntervalHierarchy.h" +#include <G3D/Table.h> +#include <G3D/Array.h> +#include <G3D/Set.h> template<class T, class BoundsFunc = BoundsTrait<T> > @@ -80,7 +80,7 @@ public: uint32 Idx = 0; const T * temp; if (m_obj2Idx.getRemove(&obj, temp, Idx)) - m_objects[Idx] = NULL; + m_objects[Idx] = nullptr; else m_objects_to_push.remove(&obj); } |