diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-05-07 09:47:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-07 09:47:37 -0500 |
| commit | 155ddf23363f1d5c534c69f50505faf67e51948f (patch) | |
| tree | 976912ed4fa3bc2af7b0b68201460f08614748b5 /indra/newview/llvovolume.cpp | |
| parent | f79548ec68ebcef8f8f83705b65fd59da43c3e26 (diff) | |
| parent | f9473e8afcb624cc1b101195bf15943ec372b56f (diff) | |
Merge pull request #1421 from secondlife/DRTVWR-600-maint-A
Drtvwr 600 maint a
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 2bb543f132..78df9aa9cf 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3586,9 +3586,10 @@ bool LLVOVolume::isVolumeGlobal() const { if (mVolumeImpl) { - return mVolumeImpl->isVolumeGlobal() ? true : false; + return mVolumeImpl->isVolumeGlobal(); } - else if (mRiggedVolume.notNull()) + + if (mRiggedVolume.notNull()) { return true; } @@ -5331,7 +5332,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, if (mat) { - bool is_alpha = (facep->getPoolType() == LLDrawPool::POOL_ALPHA) || (te->getColor().mV[3] < 0.999f) ? true : false; + bool is_alpha = (facep->getPoolType() == LLDrawPool::POOL_ALPHA) || (te->getColor().mV[3] < 0.999f); if (type == LLRenderPass::PASS_ALPHA) { shader_mask = mat->getShaderMask(LLMaterial::DIFFUSE_ALPHA_MODE_BLEND, is_alpha); @@ -6481,7 +6482,7 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace tex = facep->getTexture(); - bool is_alpha = (facep->getPoolType() == LLDrawPool::POOL_ALPHA) ? true : false; + bool is_alpha = facep->getPoolType() == LLDrawPool::POOL_ALPHA; LLMaterial* mat = nullptr; bool can_be_shiny = false; @@ -6507,7 +6508,7 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace if (!gltf_mat) { - is_alpha = (is_alpha || blinn_phong_transparent) ? true : false; + is_alpha |= blinn_phong_transparent; } if (gltf_mat || (mat && !hud_group)) |