diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-12-17 11:44:54 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-12-17 11:44:54 +0800 |
| commit | b26441798c26a7b0fc6b1eb3e88cecb19ecfbfe9 (patch) | |
| tree | 46d67fbc85d95e3722f543e5d4afa2497f6c427b /indra/llrender | |
| parent | ca2d88ddabcc638245ab4d8a17a4f33d95aeef49 (diff) | |
| parent | bb5fa35900e52ed34d0bf2cab1fbc9883abaa2a3 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 18fafa201c..4e2658dcdc 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -2537,7 +2537,9 @@ bool LLImageGL::scaleDown(S32 desired_discard) { LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE; - if (mTarget != GL_TEXTURE_2D) + if (mTarget != GL_TEXTURE_2D + || mFormatInternal == -1 // not initialized + ) { return false; } |