Merge changes from The Witness.

This commit is contained in:
castano
2012-02-14 16:37:15 +00:00
parent 1248743859
commit f1c943cd57
5 changed files with 149 additions and 83 deletions

View File

@ -721,8 +721,8 @@ void QuickCompress::outputBlock4(const ColorSet & set, const Vector3 & start, co
if (color0 < color1)
{
swap(maxColor, minColor);
swap(color0, color1);
swap(maxColor, minColor);
swap(color0, color1);
}
block->col0 = Color16(color0);
@ -741,8 +741,8 @@ void QuickCompress::outputBlock3(const ColorSet & set, const Vector3 & start, co
if (color0 > color1)
{
swap(maxColor, minColor);
swap(color0, color1);
swap(maxColor, minColor);
swap(color0, color1);
}
block->col0 = Color16(color0);