diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-06-07 21:53:41 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-06-07 21:53:41 +0000 |
| commit | c3d7cd4ac12fd73bf3d7abd402312765a71e06c3 (patch) | |
| tree | 3778170a54540aeda742494df8d18b8383e11f23 /indra/newview/pipeline.cpp | |
| parent | 639acb6ff7495a6840d437dd8473172ec03e200a (diff) | |
| parent | 9dc6a6a1b7ec21a578ac6f5a92eb16037f323824 (diff) | |
Merged in DV528-merge-6.4.20 (pull request #591)
DRTVWR-528 merge up to 6.4.20
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 b5baa777bc..9924b02a95 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. |