diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-06-23 14:43:58 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-06-23 14:43:58 -0700 |
| commit | c68e469d88f2817ee49bbf23ffe5207c432e3c45 (patch) | |
| tree | 19002264566158631bfabb25c0082b449a7e20f3 /indra/newview | |
| parent | b5867cf5e663f3308a914600d71d09868142dedf (diff) | |
| parent | beb763c4a0b657de40cd7c02734b70babfccc26b (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 21171701e1..82a5b28576 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1651,6 +1651,7 @@ U32 LLPipeline::getPoolTypeFromTE(const LLTextureEntry* te, LLViewerTexture* ima } LLMaterial* mat = te->getMaterialParams().get(); + LLGLTFMaterial* gltf_mat = te->getGLTFMaterial(); bool color_alpha = te->getColor().mV[3] < 0.999f; bool alpha = color_alpha; @@ -1684,6 +1685,10 @@ U32 LLPipeline::getPoolTypeFromTE(const LLTextureEntry* te, LLViewerTexture* ima { return LLDrawPool::POOL_BUMP; } + else if (gltf_mat && !alpha) + { + return LLDrawPool::POOL_PBR_OPAQUE; + } else if (mat && !alpha) { return LLDrawPool::POOL_MATERIALS; |