TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +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

2
Engine/source/math/mathUtils.cpp
View file

@ -1706,7 +1706,7 @@ bool clipFrustumByPolygon( const Point3F* points, U32 numPoints, const RectI& vi
// Make the output of the last iteration the
// input of this iteration.
swap( tempPolygon, clippedPolygon );
T3D::swap( tempPolygon, clippedPolygon );
numTempPolygonVertices = numClippedPolygonVertices;
// Clip our current remainder of the original polygon