diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-20 16:59:41 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-20 16:59:41 -0500 |
| commit | 8424ceb20f7baa6d5cf980d2b9ae92121d1dcb20 (patch) | |
| tree | eb691b2e04d91d0f994f1fc04acd066e4d474384 /indra/newview/lldrawpool.cpp | |
| parent | 433996c2014d2f5ff5037d1fbb8bb5edbe818e1f (diff) | |
| parent | 06e3d288e40e46204d84aed9c548a6ca529e78d8 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
| -rw-r--r-- | indra/newview/lldrawpool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index ef946ac49e..ae30af3647 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -442,7 +442,6 @@ void LLRenderPass::renderTexture(U32 type, U32 mask) void LLRenderPass::pushBatches(U32 type, U32 mask, BOOL texture) { - llpushcallstacks ; for (LLCullResult::drawinfo_list_t::iterator i = gPipeline.beginRenderMap(type); i != gPipeline.endRenderMap(type); ++i) { LLDrawInfo* pparams = *i; @@ -475,6 +474,7 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture) { if (params.mTexture.notNull()) { + params.mTexture->addTextureStats(params.mVSize); gGL.getTexUnit(0)->bind(params.mTexture, TRUE) ; if (params.mTextureMatrix) { |