diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-20 14:24:48 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-20 14:24:48 +0800 |
| commit | 9e282949a79fe56b12a4fdfa8fa4552338d8a370 (patch) | |
| tree | 7cfc28e52827565f6955a0bdc9ecf20d6ff65d3b /indra/llrender/llrender.cpp | |
| parent | 84240037a2c1c7032fe2fdacec7099eabdfe24ac (diff) | |
| parent | 6c6b38821ef0ea452b640b31006a8ef4f2dfef55 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 9178fc16b9..d333a3fd54 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1585,7 +1585,8 @@ void LLRender::flush() if (mCount > 0) { LL_PROFILE_ZONE_SCOPED_CATEGORY_PIPELINE; - llassert(LLGLSLShader::sCurBoundShaderPtr != nullptr); + llassert_always(LLGLSLShader::sCurBoundShaderPtr != nullptr); + if (!mUIOffset.empty()) { sUICalls++; |