diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-23 17:59:05 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-23 17:59:05 -0500 |
| commit | 57620a9da903f3c6fe482627d18c44b6411e6910 (patch) | |
| tree | b502aaa58018db970afede0ee441be1377f98e80 /indra/llrender/llimagegl.cpp | |
| parent | b9926e8f57787eb146b06260cc3d0260e34330ce (diff) | |
SH-2244 Vertex buffer cleanup, fix for bad vertices in rigged attachments, added "RenderUseVAO" debug setting to control whether or not to use VAO's in non-core GL profiles.
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 4da796dd1e..12089e5ad3 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1153,9 +1153,8 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt U32 pixel_count = (U32) (width*height); for (U32 i = 0; i < pixel_count; i++) { - U8 lum = ((U8*) pixels)[i*2+0]; - U8 alpha = ((U8*) pixels)[i*2+1]; - + U8 lum = ((U8*) pixels)[i]; + U8* pix = (U8*) &scratch[i]; pix[0] = pix[1] = pix[2] = lum; pix[3] = 255; |