Merge pull request #2146 from Azaezel/specializationShenanigans

changes find, swap, for_each, and delete_pointer from global to t3d namespace
This commit is contained in:
Areloch 2018-04-17 03:02:03 -05:00 committed by GitHub
commit bc1b506205
20 changed files with 70 additions and 69 deletions

View file

@ -289,7 +289,7 @@ void TerrainCellMaterial::init( TerrainBlock *block,
// The pass failed to be generated... give up.
mPasses.last().materials.clear();
mPasses.clear();
for_each( materials.begin(), materials.end(), delete_pointer() );
T3D::for_each( materials.begin(), materials.end(), T3D::delete_pointer() );
return;
}
@ -298,7 +298,7 @@ void TerrainCellMaterial::init( TerrainBlock *block,
}
// Cleanup any remaining matinfo.
for_each( materials.begin(), materials.end(), delete_pointer() );
T3D::for_each( materials.begin(), materials.end(), T3D::delete_pointer() );
// If we have attached mats then update them too.
if ( mDeferredMat )