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

Merge branch 'PBR_ProbeArrayForward' into PBR_ProbeArrayGLWIP

Browse source 
# Conflicts:
#	Engine/source/renderInstance/renderProbeMgr.cpp
This commit is contained in:
AzaezelX 2019-04-16 09:34:01 -05:00
commit 28f55b9cc8
5 changed files with 80 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -834,7 +834,7 @@ void GFXDevice::setCubeTexture( U32 stage, GFXCubemap *cubemap )
//-----------------------------------------------------------------------------
void GFXDevice::setCubeArrayTexture(U32 stage, GFXCubemapArray *cubemapArray)
{
AssertFatal(stage < getNumSamplers(), "GFXDevice::setTexture - out of range stage!");
AssertFatal(stage < getNumSamplers(), avar("GFXDevice::setTexture - out of range stage! %i>%i", stage, getNumSamplers()));
if (mTexType[stage] == GFXTDT_CubeArray &&
((mTextureDirty[stage] && mNewCubemapArray[stage].getPointer() == cubemapArray) ||