TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-31 01:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mac crashfix and compilation correction. the former's down to a typo, the latter, needed specification for which class->setTexture(near identical sig) to use

Browse source
This commit is contained in:
Brian Roberts 2019-12-05 21:30:01 -06:00
parent 2046926b27
commit c0226d4640
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gfx/bitmap/gBitmap.cpp
View file

@ -771,7 +771,7 @@ bool GBitmap::getColor(const U32 x, const U32 y, ColorI& rColor) const
rColor.set( *pLoc, *pLoc, *pLoc, *pLoc );
break;
case GFXFormatL16:
rColor.set(U8(U16((pLoc[0] << 8) + pLoc[2])), 0, 0, 0);
rColor.set(U8(U16((pLoc[0] << 8) + pLoc[1])), 0, 0, 0);
case GFXFormatR8G8B8:
case GFXFormatR8G8B8X8:
rColor.set( pLoc[0], pLoc[1], pLoc[2], 255 );

2
Engine/source/renderInstance/renderProbeMgr.cpp
View file

@ -771,7 +771,7 @@ void RenderProbeMgr::render( SceneRenderState *state )
}
else
{
mProbeArrayEffect->setTexture(6, NULL);
mProbeArrayEffect->setTexture(6, GFXTexHandle(NULL));
}
mProbeArrayEffect->setTexture(3, mBRDFTexture);