diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-10-03 18:04:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-10-03 18:04:27 -0400 |
| commit | 4dccf30bf318649c7b371355fd34cde6c143e867 (patch) | |
| tree | 4acbdefe0bb187a817583e835112f4317e11d596 /indra/newview/llvograss.cpp | |
| parent | bd18f3c097304504c398df02613229a64f7eac81 (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
merge changes for 3.6.7-release
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(); |