diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-04-29 12:28:26 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-04-29 12:28:26 -0600 |
commit | 59ab227c4020565f85e6fc2edf3e3fcc16abb574 (patch) | |
tree | 94265895fdc0df4d3c38f74288cbd87bc2e01c20 /indra/newview/pipeline.cpp | |
parent | 029f179719907d674f89e39577c37e82e654b59d (diff) | |
parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) |
DRTVWR-528 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 9924b02a95..b5baa777bc 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. |