TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #354 from Azaezel/alpha40_compositCreationCoughup

Browse source 
fix for empty r channel creation of composites crashing out
This commit is contained in:
Brian Roberts 2020-10-08 19:15:13 -05:00 • committed by GitHub
commit 6860bddf35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/gfx/gfxTextureManager.cpp
View file

@ -1196,7 +1196,10 @@ GFXTextureObject *GFXTextureManager::createCompositeTexture(GBitmap*bmp[4], U32
{ {
for (U32 y = 0; y < bmp[lastValidTex]->getHeight(); y++) for (U32 y = 0; y < bmp[lastValidTex]->getHeight(); y++)
{ {
rChan = bmp[0]->getChanelValueAt(x, y, inputKey[0]); if (bmp[0])
rChan = bmp[0]->getChanelValueAt(x, y, inputKey[0]);
else
gChan = 255;
if (bmp[1]) if (bmp[1])
gChan = bmp[1]->getChanelValueAt(x, y, inputKey[1]); gChan = bmp[1]->getChanelValueAt(x, y, inputKey[1]);