TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2146 from Azaezel/specializationShenanigans

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/decal/decalDataFile.cpp
View file

@ -131,7 +131,7 @@ bool DecalDataFile::write( Stream& stream )
{
DecalInstance *inst = allDecals[i];
dataIter = find( allDatablocks.begin(), allDatablocks.end(), inst->mDataBlock );
dataIter = T3D::find( allDatablocks.begin(), allDatablocks.end(), inst->mDataBlock );
U8 dataIndex = dataIter - allDatablocks.begin();
stream.write( dataIndex );

2
Engine/source/T3D/fx/windEmitter.cpp
View file

@ -47,7 +47,7 @@ WindEmitter::WindEmitter()
WindEmitter::~WindEmitter()
{
WindEmitterList::iterator iter = find( smAllEmitters.begin(), smAllEmitters.end(), this );
WindEmitterList::iterator iter = T3D::find( smAllEmitters.begin(), smAllEmitters.end(), this );
smAllEmitters.erase( iter );
}