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

@ -389,7 +389,7 @@ void ShaderGen::_printDependencies(Stream &stream)
{
mPrinter->printLine(stream, "// Dependencies:");
for( int i = 0; i < dependencies.size(); i++ )
for( S32 i = 0; i < dependencies.size(); i++ )
dependencies[i]->print( stream );
mPrinter->printLine(stream, "");