diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-04-30 09:40:14 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-04-30 09:40:14 +0800 |
| commit | c0a2498fa1ff074fa29b31bbd63b2ac6f69b38bb (patch) | |
| tree | 0909d51200a3de225f20ebe7d0aa7cb95fb380e1 /indra/llrender | |
| parent | 39cc9a1706340d6f84b152593a4d8aaeeaa88b56 (diff) | |
| parent | d9e55c44152064133796bfb08f1da524387c1300 (diff) | |
Merge tag 'Second_Life_Release#d9e55c44-Second_Life_Release#d9e55c4-2025.04' into 2025.04
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index e0c2db058a..aac5e3abc8 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -1114,8 +1114,8 @@ void LLGLSLShader::bind() void LLGLSLShader::bind(U8 variant) { - llassert(mGLTFVariants.size() == LLGLSLShader::NUM_GLTF_VARIANTS); - llassert(variant < LLGLSLShader::NUM_GLTF_VARIANTS); + llassert_always(mGLTFVariants.size() == LLGLSLShader::NUM_GLTF_VARIANTS); + llassert_always(variant < LLGLSLShader::NUM_GLTF_VARIANTS); mGLTFVariants[variant].bind(); } @@ -1123,7 +1123,7 @@ void LLGLSLShader::bind(bool rigged) { if (rigged) { - llassert(mRiggedVariant); + llassert_always(mRiggedVariant); mRiggedVariant->bind(); } else |