diff options
author | Dave Parks <davep@lindenlab.com> | 2013-06-21 12:51:29 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-06-21 12:51:29 -0500 |
commit | 79029149a415a9f32e08d378653199a880d21e65 (patch) | |
tree | 14b6f7d59c66602affd77b6e21f1981b28995fa8 /indra/newview/llvograss.cpp | |
parent | 80552a465e9169b7326c346f4685790ea459823a (diff) | |
parent | 8511385a5407181ced7bb226d4054185c597d05e (diff) |
Automated merge with file:///F:%5Cviewer-bear
Diffstat (limited to 'indra/newview/llvograss.cpp')
-rwxr-xr-x | indra/newview/llvograss.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp index cab5c4bc1d..591d5cae0b 100755 --- a/indra/newview/llvograss.cpp +++ b/indra/newview/llvograss.cpp @@ -476,6 +476,7 @@ void LLVOGrass::getGeometry(S32 idx, LLStrider<LLVector3>& normalsp, LLStrider<LLVector2>& texcoordsp, LLStrider<LLColor4U>& colorsp, + LLStrider<LLColor4U>& emissivep, LLStrider<U16>& indicesp) { if(!mNumBlades)//stop rendering grass @@ -708,7 +709,11 @@ void LLGrassPartition::getGeometry(LLSpatialGroup* group) facep->setIndicesIndex(index_count); facep->setVertexBuffer(buffer); facep->setPoolType(LLDrawPool::POOL_ALPHA); - object->getGeometry(facep->getTEOffset(), verticesp, normalsp, texcoordsp, colorsp, indicesp); + + //dummy parameter (unused by this implementation) + LLStrider<LLColor4U> emissivep; + + object->getGeometry(facep->getTEOffset(), verticesp, normalsp, texcoordsp, colorsp, emissivep, indicesp); vertex_count += facep->getGeomCount(); index_count += facep->getIndicesCount(); |