TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-11 00:10:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into walkabout

Browse source 
Conflicts:
	Engine/source/T3D/aiPlayer.cpp
This commit is contained in:
Daniel Buckmaster 2015-01-29 21:38:20 +11:00
commit bd437cda1c
981 changed files with 304060 additions and 7888 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/environment/river.cpp
View file

@ -227,8 +227,8 @@ void RiverNodeEvent::padListToSize()
newlist->mDepths.merge(list->mDepths);
newlist->mNormals.merge(list->mNormals);
mNodeList = newlist;
delete list;
mNodeList = list = newlist;
}
// Pad our list end?