diff options
author | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
---|---|---|
committer | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
commit | 1b0e3d68183fb63ac5c160bc9aa7956746f33faf (patch) | |
tree | 260f0972726dc9d8957486f2e03773dac4a10afc /indra/llrender/llrender.cpp | |
parent | 7772ed0cb2ebf81d4e6b1a35dcffdfe88f6c1bcc (diff) | |
parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) |
Merge branch 'master' into DRTVWR-531
Diffstat (limited to 'indra/llrender/llrender.cpp')
-rw-r--r-- | indra/llrender/llrender.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 11d9ef3f57..d515fc707a 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -871,10 +871,10 @@ void LLTexUnit::setTextureColorSpace(eTextureColorSpace space) } } else -#endif { glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); } +#endif } LLLightState::LLLightState(S32 index) |