Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicitly alphamasked faces on HUD attached prims were not going into correct drawpool.

Browse Source
This commit is contained in:
Shyotl
2017-11-18 17:33:57 -06:00
parent 8776876e93
commit 0e08d7d703
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llvovolume.cpp
View File

@@ -5086,10 +5086,15 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
} }
else if (force_fullbright) //Hud is done in a forward render. Fullbright cannot be shared with simple. else if (force_fullbright) //Hud is done in a forward render. Fullbright cannot be shared with simple.
{ {
if(type == LLDrawPool::POOL_ALPHA_MASK) LLMaterial* mat = te->getMaterialParams().get();
if (type == LLDrawPool::POOL_ALPHA_MASK || (mat && mat->getDiffuseAlphaMode() == LLMaterial::DIFFUSE_ALPHA_MODE_MASK ) )
{
type = LLDrawPool::POOL_FULLBRIGHT_ALPHA_MASK; type = LLDrawPool::POOL_FULLBRIGHT_ALPHA_MASK;
}
else else
{
type = LLDrawPool::POOL_FULLBRIGHT; type = LLDrawPool::POOL_FULLBRIGHT;
}
} }
else if(force_simple && type != LLDrawPool::POOL_FULLBRIGHT && type != LLDrawPool::POOL_ALPHA_MASK && type != LLDrawPool::POOL_FULLBRIGHT_ALPHA_MASK) else if(force_simple && type != LLDrawPool::POOL_FULLBRIGHT && type != LLDrawPool::POOL_ALPHA_MASK && type != LLDrawPool::POOL_FULLBRIGHT_ALPHA_MASK)
{ {