TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-27 15:25:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #133 from Azaezel/alpha40MacFixes

Browse source 
mac crashfix and compilation correction.
This commit is contained in:
Areloch 2019-12-08 15:55:00 -06:00 • committed by GitHub
commit 260452645d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
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 ); rColor.set( *pLoc, *pLoc, *pLoc, *pLoc );
break; break;
case GFXFormatL16: 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 GFXFormatR8G8B8:
case GFXFormatR8G8B8X8: case GFXFormatR8G8B8X8:
rColor.set( pLoc[0], pLoc[1], pLoc[2], 255 ); 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 else
{ {
mProbeArrayEffect->setTexture(6, NULL); mProbeArrayEffect->setTexture(6, GFXTexHandle(NULL));
} }
mProbeArrayEffect->setTexture(3, mBRDFTexture); mProbeArrayEffect->setTexture(3, mBRDFTexture);