livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

protect against missing mNormalMap or mSpecularMap

meow-7.2.2
Oz Linden 2013-03-01 17:34:03 -05:00
parent 3c65f7fef0
commit 90536f6cdf
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/lldrawpoolmaterials.cpp
View File

@ -89,11 +89,17 @@ void LLDrawPoolMaterials::renderDeferred(S32 pass)
mShader->uniform4f(LLShaderMgr::SPECULAR_COLOR, params.mSpecColor.mV[0], params.mSpecColor.mV[1], params.mSpecColor.mV[2], params.mSpecColor.mV[3]);
mShader->uniform1f(LLShaderMgr::ENVIRONMENT_INTENSITY, params.mEnvIntensity);
params.mNormalMap->addTextureStats(params.mVSize);
bindNormalMap(params.mNormalMap);
if (params.mNormalMap)
{
params.mNormalMap->addTextureStats(params.mVSize);
bindNormalMap(params.mNormalMap);
}
params.mSpecularMap->addTextureStats(params.mVSize);
bindSpecularMap(params.mSpecularMap);
if (params.mSpecularMap)
{
params.mSpecularMap->addTextureStats(params.mVSize);
bindSpecularMap(params.mSpecularMap);
}
diffuse_channel = mShader->enableTexture(LLShaderMgr::DIFFUSE_MAP);
pushBatch(params, VERTEX_DATA_MASK, TRUE);