diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-05-01 15:33:16 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-05-01 15:33:16 -0500 |
| commit | 7a20b5be7844d1f41307d3186b0a9e297efd797a (patch) | |
| tree | a3d1499a8cad393c565c3ee8bf1752972e90e773 /indra/newview/llvovolume.cpp | |
| parent | 0249a0d1e7564d06eadb8a23b0f058008dfd6068 (diff) | |
MAINT-775, MAINT-1022 Regression cleanup.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 433fa475ee..3430e1a610 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -684,7 +684,7 @@ void LLVOVolume::updateTextures() { updateTextureVirtualSize(); - /*if (mDrawable.notNull() && !isVisible() && !mDrawable->isActive()) + if (mDrawable.notNull() && !isVisible() && !mDrawable->isActive()) { //delete vertex buffer to free up some VRAM LLSpatialGroup* group = mDrawable->getSpatialGroup(); if (group) @@ -695,7 +695,7 @@ void LLVOVolume::updateTextures() //it becomes visible group->setState(LLSpatialGroup::GEOM_DIRTY | LLSpatialGroup::MESH_DIRTY | LLSpatialGroup::NEW_DRAWINFO); } - }*/ + } } } @@ -1497,7 +1497,7 @@ void LLVOVolume::updateRelativeXform(bool force_identity) { if (mVolumeImpl) { - mVolumeImpl->updateRelativeXform(); + mVolumeImpl->updateRelativeXform(force_identity); return; } @@ -3984,6 +3984,8 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, } } + //drawable->getVObj()->setDebugText(llformat("%d", drawable->isState(LLDrawable::ANIMATED_CHILD))); + U8 bump = (type == LLRenderPass::PASS_BUMP || type == LLRenderPass::PASS_POST_BUMP) ? facep->getTextureEntry()->getBumpmap() : 0; LLViewerTexture* tex = facep->getTexture(); |