summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2023-10-03 17:24:46 -0700
committercosmic-linden <111533034+cosmic-linden@users.noreply.github.com>2023-10-04 13:02:21 -0700
commit70abb3085d763f9d9dbb7bcaa49fe9e3004d54ed (patch)
tree876482172f5d111bb9f058e0149cd6b8407395e1 /indra
parent50133bdebe3f07e9d6889769077e4360b0a5ff8c (diff)
SL-20254: Fix blinn-phong alpha of 0 making GLTF materials invisible for non-root prims.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvovolume.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 20a6a189b4..468943423a 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5856,7 +5856,16 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
}
else
{
- if (te->getColor().mV[3] > 0.f || te->getGlow() > 0.f)
+ F32 alpha;
+ if (is_pbr)
+ {
+ alpha = gltf_mat ? gltf_mat->mBaseColor.mV[3] : 1.0;
+ }
+ else
+ {
+ alpha = te->getColor().mV[3];
+ }
+ if (alpha > 0.f || te->getGlow() > 0.f)
{ //only treat as alpha in the pipeline if < 100% transparent
drawablep->setState(LLDrawable::HAS_ALPHA);
add_face(sAlphaFaces, alpha_count, facep);