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 #386 from Azaezel/alpha40_createCompositeCopypasta

Browse source 
adress #385
This commit is contained in:
Brian Roberts 2020-11-29 21:04:58 -06:00 • committed by GitHub
commit 80eb4ab2ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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