diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-04-27 16:06:08 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-04-27 16:06:08 -0500 |
| commit | 03c6263fa705b77e9fa2cb458e67d79762e16f09 (patch) | |
| tree | d924f0969eabe8afd72e102b4610a76b5fee6fec /indra | |
| parent | a3b1d0beb610338d9f7c9c6618bc15bc7e9be40d (diff) | |
| parent | 5d379adceaaccd4aaa57f209ff9a54abf33b82fd (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index a73d149b10..b482ded121 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -5826,7 +5826,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) const LLTextureEntry* te = facep->getTextureEntry(); LLViewerTexture* tex = facep->getTexture(); - if (te->getGlow() >= 1.f/255.f) + if (te->getGlow() > 0.f) { emissive = true; } @@ -5910,7 +5910,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) { LLGLTFMaterial* gltf_mat = te->getGLTFRenderMaterial(); - if (gltf_mat != nullptr || (te->getMaterialParams().notNull() && !te->getMaterialID().isNull())) + if (gltf_mat != nullptr || (te->getMaterialParams().notNull())) { if (gltf_mat != nullptr) { |