From c0226d4640e56d018955d47b8cd6dfd342d2d52f Mon Sep 17 00:00:00 2001 From: Brian Roberts Date: Thu, 5 Dec 2019 21:30:01 -0600 Subject: [PATCH] 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 --- Engine/source/gfx/bitmap/gBitmap.cpp | 2 +- Engine/source/renderInstance/renderProbeMgr.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/source/gfx/bitmap/gBitmap.cpp b/Engine/source/gfx/bitmap/gBitmap.cpp index 1ae980427..fe73ecf7e 100644 --- a/Engine/source/gfx/bitmap/gBitmap.cpp +++ b/Engine/source/gfx/bitmap/gBitmap.cpp @@ -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 ); diff --git a/Engine/source/renderInstance/renderProbeMgr.cpp b/Engine/source/renderInstance/renderProbeMgr.cpp index 8632c3969..3b83d279c 100644 --- a/Engine/source/renderInstance/renderProbeMgr.cpp +++ b/Engine/source/renderInstance/renderProbeMgr.cpp @@ -771,7 +771,7 @@ void RenderProbeMgr::render( SceneRenderState *state ) } else { - mProbeArrayEffect->setTexture(6, NULL); + mProbeArrayEffect->setTexture(6, GFXTexHandle(NULL)); } mProbeArrayEffect->setTexture(3, mBRDFTexture);