diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-06-28 08:45:07 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-06-28 08:45:07 -0700 |
| commit | b659e5596e6612d83ce41dd6ce44228103851875 (patch) | |
| tree | b8f773b30798037fbb6cf18eace38b9287881b3b /indra/llrender/llimagegl.cpp | |
| parent | 7c651f84234813eb0ceb2c72e0c19acf2bb15f55 (diff) | |
SL-11514
Convince Geenzo code to get a little DeMorgan in it.
Trophy Unlocked: make all alpha textures partcipate in picking.
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 790ba25112..ff74380217 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -2049,8 +2049,8 @@ void LLImageGL::updatePickMask(S32 width, S32 height, const U8* data_in) freePickMask(); if (mFormatType != GL_UNSIGNED_BYTE || - mFormatPrimary != GL_RGBA || - mFormatPrimary != GL_SRGB_ALPHA) + ((mFormatPrimary != GL_RGBA) + && (mFormatPrimary != GL_SRGB_ALPHA))) { //cannot generate a pick mask for this texture return; |