Merge branch 'master' of cane:bkaradzic/bgfx

This commit is contained in:
Branimir Karadžić 2016-02-27 17:23:57 -08:00
commit e21752919a

View file

@ -117,7 +117,7 @@ namespace bgfx
case TextureFormat::PTC14: case TextureFormat::PTC14:
{ {
using namespace Javelin; using namespace Javelin;
RgbBitmap bmp; RgbaBitmap bmp;
bmp.width = _width; bmp.width = _width;
bmp.height = _height; bmp.height = _height;
bmp.data = (uint8_t*)const_cast<void*>(_src); bmp.data = (uint8_t*)const_cast<void*>(_src);