diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-09-11 08:47:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-09-11 08:47:33 -0400 |
| commit | 5eb6614913b97963d185afe698e677c880399c78 (patch) | |
| tree | c7e342b7b68192fc0eb4eba09ef52c17ac16ffa5 /indra/newview/lldrawpooltree.cpp | |
| parent | 8189b28d2247bf99f76ace63e78021a43b5e15a1 (diff) | |
| parent | 2aadccd30843f3a29882d13ed2db50cebcba0374 (diff) | |
merge changes for DRTVWR-212
Diffstat (limited to 'indra/newview/lldrawpooltree.cpp')
| -rw-r--r-- | indra/newview/lldrawpooltree.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp index 83f04e45a8..3165a3516c 100644 --- a/indra/newview/lldrawpooltree.cpp +++ b/indra/newview/lldrawpooltree.cpp @@ -37,7 +37,6 @@ #include "llviewershadermgr.h" #include "llrender.h" #include "llviewercontrol.h" -#include "llviewerregion.h" S32 LLDrawPoolTree::sDiffTex = 0; static LLGLSLShader* shader = NULL; @@ -105,22 +104,8 @@ void LLDrawPoolTree::render(S32 pass) { LLFace *face = *iter; LLVertexBuffer* buff = face->getVertexBuffer(); - if(buff) { - LLMatrix4* model_matrix = &(face->getDrawable()->getRegion()->mRenderMatrix); - - if (model_matrix != gGLLastMatrix) - { - gGLLastMatrix = model_matrix; - gGL.loadMatrix(gGLModelView); - if (model_matrix) - { - gGL.multMatrix((GLfloat*) model_matrix->mMatrix); - } - gPipeline.mMatrixOpCount++; - } - buff->setBuffer(LLDrawPoolTree::VERTEX_DATA_MASK); buff->drawRange(LLRender::TRIANGLES, 0, buff->getNumVerts()-1, buff->getNumIndices(), 0); gPipeline.addTrianglesDrawn(buff->getNumIndices()); |