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

Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency

Browse source 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
This commit is contained in:
Daniel Buckmaster 2014-04-04 13:43:25 +11:00
commit 87d9e245b7
210 changed files with 896 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gui/worldEditor/editTSCtrl.cpp
View file

@ -1298,7 +1298,7 @@ DefineEngineMethod( EditTSCtrl, renderCircle, void, ( Point3F pos, Point3F norma
PrimBuild::begin( GFXLineStrip, points.size() + 1 );
for( int i = 0; i < points.size(); i++ )
for( S32 i = 0; i < points.size(); i++ )
PrimBuild::vertex3fv( points[i] );
// GFX does not have a LineLoop primitive, so connect the last line
@ -1321,7 +1321,7 @@ DefineEngineMethod( EditTSCtrl, renderCircle, void, ( Point3F pos, Point3F norma
PrimBuild::vertex3fv( pos );
// Edge verts
for( int i = 0; i < points.size(); i++ )
for( S32 i = 0; i < points.size(); i++ )
PrimBuild::vertex3fv( points[i] );
PrimBuild::vertex3fv( points[0] );