diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-07-24 11:24:12 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-07-24 11:24:12 +0800 |
| commit | fc46ce4c0c7d81349d55933fb4bef3260f79ac8b (patch) | |
| tree | 42b81558404432b253684661136dcd38722f59a7 /indra/llprimitive/lltextureentry.cpp | |
| parent | ffd174763119879d8be376c7c94b58e1961a7ebd (diff) | |
| parent | bcfda3b68a95bbbfb8b53f6313929fc5aeaa591c (diff) | |
Merge tag 'Second_Life_Release#bcfda3b6-26.3' into 26.3
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 2b0f989701..ac482ffbf9 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(); } |