TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-23 08:33:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess

Browse source 
# Conflicts:
#	Engine/source/sfx/sfxSystem.cpp
This commit is contained in:
Azaezel 2018-04-23 10:08:14 -05:00
commit 13334b4d5c
22 changed files with 72 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/collision/clippedPolyList.cpp
View file

@ -330,7 +330,7 @@ void ClippedPolyList::cullUnusedVerts()
for ( vIter = mVertexList.begin(); vIter != mVertexList.end(); vIter++, i++ )
{
// Is this vertex used?
iNextIter = find( mIndexList.begin(), mIndexList.end(), i );
iNextIter = T3D::find( mIndexList.begin(), mIndexList.end(), i );
if ( iNextIter != mIndexList.end() )
continue;
@ -346,7 +346,7 @@ void ClippedPolyList::cullUnusedVerts()
for ( nextVIter = vIter + 1; nextVIter != mVertexList.end(); nextVIter++, n++ )
{
iNextIter = find( mIndexList.begin(), mIndexList.end(), n );
iNextIter = T3D::find( mIndexList.begin(), mIndexList.end(), n );
// If we found a used vertex
// grab its index for later use