diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 13:51:35 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 13:51:35 +0000 |
| commit | 49b37a4dc362679e94fe04ff3cd7094f0e0e9f68 (patch) | |
| tree | 9832afd6820bc0122fb8eef0552bbfab58736492 /indra/newview/lldrawpool.cpp | |
| parent | c3a71b7dcbfe855058a84e22651aea3910133aa1 (diff) | |
| parent | 8bafcc0491d0131a53226365f18b3ba68648a742 (diff) | |
merge from viewer2, conflicts resolved...
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
| -rw-r--r-- | indra/newview/lldrawpool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index 95ddacb722..ef946ac49e 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -496,8 +496,8 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture) params.mGroup->rebuildMesh(); } params.mVertexBuffer->setBuffer(mask); - params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset); - gPipeline.addTrianglesDrawn(params.mCount/3); + params.mVertexBuffer->drawRange(params.mDrawMode, params.mStart, params.mEnd, params.mCount, params.mOffset); + gPipeline.addTrianglesDrawn(params.mCount, params.mDrawMode); } if (params.mTextureMatrix && texture && params.mTexture.notNull()) |