diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-01-22 09:16:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-22 09:16:12 -0800 |
| commit | 2adecc6fac9852974e44e3d58ccf2619b45642a9 (patch) | |
| tree | 0465739323a25c7d1457ed17e13a6db8a612ea0b /indra/newview/lldrawpooltree.cpp | |
| parent | 09ee84f675cf08f98cbd49516c5e01c289b42a20 (diff) | |
| parent | 42623ad81142f93290b31b380cc0f888a1c3c3b6 (diff) | |
Merge pull request #658 from secondlife/SL-20606
SL-20606: PBR swatches in build floater should show entire material
Diffstat (limited to 'indra/newview/lldrawpooltree.cpp')
| -rw-r--r-- | indra/newview/lldrawpooltree.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp index 9dcbc48697..50c4a2c1b3 100644 --- a/indra/newview/lldrawpooltree.cpp +++ b/indra/newview/lldrawpooltree.cpp @@ -85,17 +85,8 @@ void LLDrawPoolTree::renderDeferred(S32 pass) { LLMatrix4* model_matrix = &(face->getDrawable()->getRegion()->mRenderMatrix); - if (model_matrix != gGLLastMatrix) - { - gGLLastMatrix = model_matrix; - gGL.loadMatrix(gGLModelView); - if (model_matrix) - { - llassert(gGL.getMatrixMode() == LLRender::MM_MODELVIEW); - gGL.multMatrix((GLfloat*)model_matrix->mMatrix); - } - gPipeline.mMatrixOpCount++; - } + llassert(gGL.getMatrixMode() == LLRender::MM_MODELVIEW); + LLRenderPass::applyModelMatrix(model_matrix); buff->setBuffer(); buff->drawRange(LLRender::TRIANGLES, 0, buff->getNumVerts() - 1, buff->getNumIndices(), 0); |