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 #1119 from Lopuska/patch-18

Browse source 
OpenGL fix - fixed a crash when you activate Alpha Threshold checkbox wi...
This commit is contained in:
Luis Anton Rebollo 2015-01-24 22:58:47 +01:00
commit ca382f56a6
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
View file

@ -986,11 +986,8 @@ void DiffuseMapFeatGLSL::setTexData( Material::StageData &stageDat,
U32 &texIndex ) U32 &texIndex )
{ {
GFXTextureObject *tex = stageDat.getTex( MFT_DiffuseMap ); GFXTextureObject *tex = stageDat.getTex( MFT_DiffuseMap );
if ( tex ) passData.mSamplerNames[ texIndex ] = "diffuseMap";
{ passData.mTexSlot[ texIndex++ ].texObject = tex;
passData.mSamplerNames[ texIndex ] = "diffuseMap";
passData.mTexSlot[ texIndex++ ].texObject = tex;
}
} }