diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-05-26 18:53:28 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-05-26 18:53:28 +0000 |
| commit | 4cb5d10a3fe746ce5eb41da355ebceaebc460f26 (patch) | |
| tree | ea062b13c8e53ca8d040d6377d0e40d28070c654 /indra/newview/pipeline.cpp | |
| parent | 272da688f75880f73e227ae62bad1c5a9b28b288 (diff) | |
| parent | 7199ce45142f47003ba04381a76c1a4c7545f127 (diff) | |
Merged in euclid-15299 (pull request #580)
SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.
Approved-by: Andrey Kleshchev
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index d5c98fc908..cd1b9c7c69 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1668,7 +1668,7 @@ U32 LLPipeline::getPoolTypeFromTE(const LLTextureEntry* te, LLViewerTexture* ima if (alpha && mat) { - switch (mat->getDiffuseAlphaModeRender()) + switch (mat->getDiffuseAlphaMode()) { case 1: alpha = true; // Material's alpha mode is set to blend. Toss it into the alpha draw pool. |