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

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

View file

@ -760,7 +760,7 @@ MatrixF PlaneReflector::getCameraReflection( const MatrixF &camTrans )
return newTrans;
}
inline float sgn(float a)
inline F32 sgn(F32 a)
{
if (a > 0.0F) return (1.0F);
if (a < 0.0F) return (-1.0F);