diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-04-29 18:23:44 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-04-29 18:23:44 +0000 |
| commit | 5e757b2841941e8e5a9b918dbae4fd7b36a84896 (patch) | |
| tree | deee2618a9c33681e038845605db6719babd1d77 /indra/newview/pipeline.cpp | |
| parent | 18316191cd7d1e1f8c3a4940eb5ed6cdf2695575 (diff) | |
| parent | 2386125ae0db3218c620667b05449cd25ee05ad5 (diff) | |
Merged in DV525-merge-6.4.19 (pull request #559)
DRTVWR-525 merge up to 6.4.19
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 cd1b9c7c69..d5c98fc908 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->getDiffuseAlphaMode()) + switch (mat->getDiffuseAlphaModeRender()) { case 1: alpha = true; // Material's alpha mode is set to blend. Toss it into the alpha draw pool. |