summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/assimp/code/SGSpatialSort.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/assimp/code/SGSpatialSort.cpp')
-rw-r--r--src/3rdparty/assimp/code/SGSpatialSort.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/3rdparty/assimp/code/SGSpatialSort.cpp b/src/3rdparty/assimp/code/SGSpatialSort.cpp
index 84061888e..7a80381e2 100644
--- a/src/3rdparty/assimp/code/SGSpatialSort.cpp
+++ b/src/3rdparty/assimp/code/SGSpatialSort.cpp
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
@@ -47,7 +48,6 @@ the 3ds loader handling smooth groups correctly */
using namespace Assimp;
-
// ------------------------------------------------------------------------------------------------
SGSpatialSort::SGSpatialSort()
{
@@ -88,12 +88,11 @@ void SGSpatialSort::FindPositions( const aiVector3D& pPosition,
float dist = pPosition * mPlaneNormal;
float minDist = dist - pRadius, maxDist = dist + pRadius;
- // clear the array in this strange fashion because a simple clear() would also deallocate
- // the array which we want to avoid
- poResults.erase( poResults.begin(), poResults.end());
+ // clear the array
+ poResults.clear();
// quick check for positions outside the range
- if( mPositions.size() == 0)
+ if( mPositions.empty() )
return;
if( maxDist < mPositions.front().mDistance)
return;