diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-04-27 11:42:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-27 11:42:45 -0700 |
| commit | 5d379adceaaccd4aaa57f209ff9a54abf33b82fd (patch) | |
| tree | 2f401a447810e296e533395d1a1cea2a62b236b1 /indra | |
| parent | 88adfdcee4941dbc57725c8251c3435fbca1792e (diff) | |
| parent | 1b9a9cc976161080a821c85897c704b5af9a0e34 (diff) | |
Merge pull request #195 from secondlife/SL-19653
SL-19653: Fix some vertex buffer data mask asserts
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) { |