diff options
| author | Andrey Lihatskiy <118752495+marchcat@users.noreply.github.com> | 2026-07-17 12:57:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-17 12:57:48 +0300 |
| commit | 8a22869dfad731f8cd9f4164a7a2b57cd70af51c (patch) | |
| tree | 1d1133495ccf193a0b36d903db1407243935615f /indra/llprimitive/lltextureentry.cpp | |
| parent | f5e788b1b4ff5fb45f20ee5fa5daad7cca42069f (diff) | |
| parent | 8f05370e7ebccd086b5d4791a1b2dc052361b026 (diff) | |
Merge pull request #6016 from secondlife/marchcat/slua-26.3
SLua PV <- 26.3 merge
Diffstat (limited to 'indra/llprimitive/lltextureentry.cpp')
| -rw-r--r-- | indra/llprimitive/lltextureentry.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp index ac482ffbf9..2b0f989701 100644 --- a/indra/llprimitive/lltextureentry.cpp +++ b/indra/llprimitive/lltextureentry.cpp @@ -600,7 +600,7 @@ LLGLTFMaterial* LLTextureEntry::getGLTFRenderMaterial() const return mGLTFRenderMaterial; } - llassert(getGLTFMaterialOverride() == nullptr || getGLTFMaterialOverride()->isClearedForBaseMaterial()); + //llassert(getGLTFMaterialOverride() == nullptr || getGLTFMaterialOverride()->isClearedForBaseMaterial()); return getGLTFMaterial(); } |