TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-09 07:20:40 +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/console/simSet.h
View file

@ -154,9 +154,9 @@ class SimSet : public SimObject, public TamlChildren
value operator[] (S32 index) { return mObjectList[U32(index)]; }
inline iterator find( iterator first, iterator last, SimObject *obj)
{ return ::find(first, last, obj); }
{ return T3D::find(first, last, obj); }
inline iterator find(SimObject *obj)
{ return ::find(begin(), end(), obj); }
{ return T3D::find(begin(), end(), obj); }
/// Reorder the position of "obj" to either be the last object in the list or, if
/// "target" is given, to come before "target" in the list of children.