Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-11-15 20:17:18 -04:00
32 changed files with 348 additions and 22 deletions
+8 -2
View File
@@ -117,11 +117,17 @@ CompressedData::Format ddsHandler::convertFormat(dds::Format ddsformat)
return CompressedData::FORMAT_BC5;
case dds::FORMAT_BC5s:
return CompressedData::FORMAT_BC5s;
case dds::FORMAT_BC6H:
return CompressedData::FORMAT_BC6H;
case dds::FORMAT_BC6Hs:
return CompressedData::FORMAT_BC6Hs;
case dds::FORMAT_BC7:
return CompressedData::FORMAT_BC7;
case dds::FORMAT_BC7srgb:
return CompressedData::FORMAT_BC7SRGB;
default:
return CompressedData::FORMAT_UNKNOWN;
}
return CompressedData::FORMAT_UNKNOWN;
}
} // magpie