TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-25 23:29:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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 59130078e2
22 changed files with 72 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/scene/sceneContainer.cpp
View file

@ -183,7 +183,7 @@ bool SceneContainer::removeObject(SceneObject* obj)
// Remove water and physical zone types from the special vector.
if ( obj->getTypeMask() & ( WaterObjectType | PhysicalZoneObjectType ) )
{
Vector<SceneObject*>::iterator iter = find( mWaterAndZones.begin(), mWaterAndZones.end(), obj );
Vector<SceneObject*>::iterator iter = T3D::find( mWaterAndZones.begin(), mWaterAndZones.end(), obj );
if( iter != mTerrains.end() )
mWaterAndZones.erase_fast(iter);
}
@ -191,7 +191,7 @@ bool SceneContainer::removeObject(SceneObject* obj)
// Remove terrain objects from special vector.
if( obj->getTypeMask() & TerrainObjectType )
{
Vector< SceneObject* >::iterator iter = find( mTerrains.begin(), mTerrains.end(), obj );
Vector< SceneObject* >::iterator iter = T3D::find( mTerrains.begin(), mTerrains.end(), obj );
if( iter != mTerrains.end() )
mTerrains.erase_fast(iter);
}