TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 22:54:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #793 from lukaspj/Terrain-Basetex-Formats

Browse source 
Terrain basetex formats
This commit is contained in:
Daniel Buckmaster 2014-11-04 14:54:08 +11:00
commit 97ae3445c9
4 changed files with 89 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gfx/D3D9/gfxD3D9TextureObject.cpp
View file

@ -205,8 +205,8 @@ bool GFXD3D9TextureObject::copyToBmp(GBitmap* bmp)
// check format limitations
// at the moment we only support RGBA for the source (other 4 byte formats should
// be easy to add though)
AssertFatal(mFormat == GFXFormatR8G8B8A8, "copyToBmp: invalid format");
if (mFormat != GFXFormatR8G8B8A8)
AssertFatal(mFormat == GFXFormatR8G8B8A8 || mFormat == GFXFormatR8G8B8, "copyToBmp: invalid format");
if (mFormat != GFXFormatR8G8B8A8 && mFormat != GFXFormatR8G8B8)
return false;
PROFILE_START(GFXD3D9TextureObject_copyToBmp);