summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2023-10-04 15:42:10 -0500
committerRunitaiLinden <davep@lindenlab.com>2023-10-04 15:42:10 -0500
commitb553899087cb37391269eda15068291b335718ea (patch)
tree7a976e21ab2c65db3ef4f9dc4c70da110509c2d8 /indra/newview
parenta1a32edf52365415f35cea26b26c011fc4d35984 (diff)
parent70abb3085d763f9d9dbb7bcaa49fe9e3004d54ed (diff)
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvovolume.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index c9f3d86793..468943423a 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4617,7 +4617,7 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a&
if (!pick_unselectable)
{
- if (!LLSelectMgr::instance().canSelectObject(this))
+ if (!LLSelectMgr::instance().canSelectObject(this, TRUE))
{
return FALSE;
}
@@ -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);