From e52caca712a347cb6e76b429efaba059bd18e4a5 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 20 Jul 2011 23:50:44 -0500
Subject: [PATCH] SH-2048 Fix for invisiprims infecting neighboring prims with
their invisi-ness.
---
indra/newview/llvovolume.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 40afabdb650..4c137d33947 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;
--
GitLab