diff options
author | Dave Parks <davep@lindenlab.com> | 2012-05-11 16:20:21 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-05-11 16:20:21 -0500 |
commit | 8fc4195ac0ab523b0940dd9a6af0c2a58b044006 (patch) | |
tree | 1e52f6a62d68d7842a70ba83c1081f225509fbe6 /indra/newview | |
parent | c946408519450a577a81e741091bf84e3822a4b6 (diff) |
Fix for linux build that doesn't stomp memory randomly or break particle rendering
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llvopartgroup.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index 49356467a0..b6adc776cc 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -619,13 +619,13 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group) S32 geom_idx = (S32) facep->getGeomIndex(); - verticesp += geom_idx; - normalsp += geom_idx; - texcoordsp += geom_idx; - colorsp += geom_idx; - indicesp += facep->getIndicesStart(); + LLStrider<U16> cur_idx = indicesp + facep->getIndicesStart(); + LLStrider<LLVector4a> cur_vert = verticesp + geom_idx; + LLStrider<LLVector3> cur_norm = normalsp + geom_idx; + LLStrider<LLVector2> cur_tc = texcoordsp + geom_idx; + LLStrider<LLColor4U> cur_col = colorsp + geom_idx; - object->getGeometry(facep->getTEOffset(), verticesp, normalsp, texcoordsp, colorsp, indicesp); + object->getGeometry(facep->getTEOffset(), cur_vert, cur_norm, cur_tc, cur_col, cur_idx); llassert(facep->getGeomCount() == 4); llassert(facep->getIndicesCount() == 6); |