diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-20 23:50:44 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-20 23:50:44 -0500 |
| commit | e52caca712a347cb6e76b429efaba059bd18e4a5 (patch) | |
| tree | 54c8d8885ee414b0a381b2a3f17a1414914ee344 /indra | |
| parent | 78f1bad0e66a172099b7f3ede033ea5576ee81e7 (diff) | |
SH-2048 Fix for invisiprims infecting neighboring prims with their invisi-ness.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 40afabdb65..4c137d3394 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3743,6 +3743,11 @@ bool can_batch_texture(LLFace* facep) return false; } + if (facep->getTexture() && facep->getTexture()->getPrimaryFormat() == GL_ALPHA) + { //can't batch invisiprims + return false; + } + if (facep->isState(LLFace::TEXTURE_ANIM) && facep->getVirtualSize() > MIN_TEX_ANIM_SIZE) { //texture animation breaks batches return false; @@ -4711,6 +4716,7 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: } const LLTextureEntry* te = facep->getTextureEntry(); + tex = facep->getTexture(); BOOL is_alpha = (facep->getPoolType() == LLDrawPool::POOL_ALPHA) ? TRUE : FALSE; |