diff options
author | Dave Parks <davep@lindenlab.com> | 2013-04-02 15:45:17 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-04-02 15:45:17 -0500 |
commit | 679a095aa04234f48c10139138ca54939099defa (patch) | |
tree | 9a9b91a0b941dcd6da0ef5fde323fa34701d18b1 /indra/newview/lldrawpoolmaterials.cpp | |
parent | 8037601dedbe9e0a3f1e588b6109bbad6adb1cff (diff) |
NORSPEC-74 Fix for assert when Debug GL enabled when rendering materials.
Diffstat (limited to 'indra/newview/lldrawpoolmaterials.cpp')
-rw-r--r-- | indra/newview/lldrawpoolmaterials.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolmaterials.cpp b/indra/newview/lldrawpoolmaterials.cpp index d6cca9abe2..3e0f9c9d4d 100644 --- a/indra/newview/lldrawpoolmaterials.cpp +++ b/indra/newview/lldrawpoolmaterials.cpp @@ -113,6 +113,9 @@ void LLDrawPoolMaterials::renderDeferred(S32 pass) llassert(pass < sizeof(type_list)/sizeof(U32)); U32 type = type_list[pass]; + + U32 mask = mShader->mAttributeMask; + LLCullResult::drawinfo_iterator begin = gPipeline.beginRenderMap(type); LLCullResult::drawinfo_iterator end = gPipeline.endRenderMap(type); @@ -137,7 +140,7 @@ void LLDrawPoolMaterials::renderDeferred(S32 pass) mShader->setMinimumAlpha(params.mAlphaMaskCutoff); - pushBatch(params, VERTEX_DATA_MASK, TRUE); + pushBatch(params, mask, TRUE); } } |