From 97dc4755ff2559e81720bdf87051eb1a50ff9bbb Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Wed, 26 Apr 2023 11:53:09 -0700 Subject: SL-19653: Fix assert: Prims were added to glow draw pool when glow was at or near zero --- 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 a73d149b10..421205af97 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; } -- cgit v1.2.3 From 1b9a9cc976161080a821c85897c704b5af9a0e34 Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Wed, 26 Apr 2023 11:58:05 -0700 Subject: SL-19653: Fix data mask assert: specular-normal blinn-phong in wrong bin --- 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 421205af97..b482ded121 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -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) { -- cgit v1.2.3