diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-07-07 20:49:46 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-07-07 20:49:46 +0800 |
| commit | c659a085f05f5a9f62abf8a4c2e394d910af4ae9 (patch) | |
| tree | 4e18706c29a8d0d95078c438b67b2e7a81f24005 /indra/llprimitive/lltextureentry.cpp | |
| parent | 2121d3b20269baeb8bb88cef534307628f1adb2e (diff) | |
| parent | 3d465f6c966f0a2fcfd5d3c9effb6ce20c2754c8 (diff) | |
Merge tag 'Second_Life_Release#3d465f6c-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 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(); } |