From 50133bdebe3f07e9d6889769077e4360b0a5ff8c Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 4 Oct 2023 20:55:07 +0300 Subject: SL-20400 Fixed cannot touch objects with "Select Only My Objects" --- indra/newview/llvovolume.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index c9f3d86793..20a6a189b4 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; } -- cgit v1.2.3 From 70abb3085d763f9d9dbb7bcaa49fe9e3004d54ed Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Tue, 3 Oct 2023 17:24:46 -0700 Subject: SL-20254: Fix blinn-phong alpha of 0 making GLTF materials invisible for non-root prims. --- indra/newview/llvovolume.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'indra/newview') 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); -- cgit v1.2.3