diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-09-09 15:34:02 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-09-09 15:34:02 -0700 |
| commit | cb902bf9a97177322c222a032715262987c98eb9 (patch) | |
| tree | 7e73f746e1de49b3f03bfa6487ec07620038f47a /indra/newview | |
| parent | dfe19c257dbb9d5af6f1e2961015e95847525412 (diff) | |
SL-17701: Fix enum compare using wrong types which broke macOS build
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index f1e3d27d7c..b5dd8379ce 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -5961,7 +5961,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) BOOL force_simple = (facep->getPixelArea() < FORCE_SIMPLE_RENDER_AREA); U32 type = gPipeline.getPoolTypeFromTE(te, tex); - if (is_pbr && gltf_mat && gltf_mat->mAlphaMode != LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) + if (is_pbr && gltf_mat && gltf_mat->mAlphaMode != LLGLTFMaterial::ALPHA_MODE_BLEND) { type = LLDrawPool::POOL_PBR_OPAQUE; } @@ -6781,7 +6781,7 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace if (gltf_mat) { // all other parameters ignored if gltf material is present - if (gltf_mat->mAlphaMode == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) + if (gltf_mat->mAlphaMode == LLGLTFMaterial::ALPHA_MODE_BLEND) registerFace(group, facep, LLRenderPass::PASS_ALPHA); else registerFace(group, facep, LLRenderPass::PASS_PBR_OPAQUE); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index abf0d457e2..5398243f55 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1684,7 +1684,7 @@ U32 LLPipeline::getPoolTypeFromTE(const LLTextureEntry* te, LLViewerTexture* ima } } - if (alpha || (gltf_mat && gltf_mat->mAlphaMode == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND)) + if (alpha || (gltf_mat && gltf_mat->mAlphaMode == LLGLTFMaterial::ALPHA_MODE_BLEND)) { return LLDrawPool::POOL_ALPHA; } |