livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559

master
RunitaiLinden 2023-04-27 16:06:08 -05:00
parent a3b1d0beb6 5d379adcea
commit 03c6263fa7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llvovolume.cpp
View File

@ -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)
{