TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 22:54:34 +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/terrain/terrCellMaterial.cpp
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 )