diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-05-14 14:24:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-14 14:24:21 -0500 |
| commit | 7bfb29687c2e621d3aae9e2794a57dc0168fdf1d (patch) | |
| tree | 50b128638c6ce451234ac71c734c3376ea1d6046 /indra/newview/lldrawpoolterrain.cpp | |
| parent | 193d9d5f767c2bfad1dc5ced4fa630d05ae798ae (diff) | |
| parent | d21f29b6439db5b954d630a4461fe77365cdb4b3 (diff) | |
Merge pull request #1446 from Ansariel/project/gltf_development
Fix broken merge and BOOL/bool issues
Diffstat (limited to 'indra/newview/lldrawpoolterrain.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index de48d315e6..7e089c77b7 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -202,11 +202,11 @@ void LLDrawPoolTerrain::drawLoop() void LLDrawPoolTerrain::renderFullShader() { - const BOOL use_local_materials = gLocalTerrainMaterials.materialsReady(true, false); + const bool use_local_materials = gLocalTerrainMaterials.materialsReady(true, false); // Hack! Get the region that this draw pool is rendering from! LLViewerRegion *regionp = mDrawFace[0]->getDrawable()->getVObj()->getRegion(); LLVLComposition *compp = regionp->getComposition(); - const BOOL use_textures = !use_local_materials && (compp->getMaterialType() == LLTerrainMaterials::Type::TEXTURE); + const bool use_textures = !use_local_materials && (compp->getMaterialType() == LLTerrainMaterials::Type::TEXTURE); if (use_textures) { @@ -325,7 +325,7 @@ void LLDrawPoolTerrain::renderFullShaderTextures() } // *TODO: Investigate use of bindFast for PBR terrain textures -void LLDrawPoolTerrain::renderFullShaderPBR(BOOL local_materials) +void LLDrawPoolTerrain::renderFullShaderPBR(bool local_materials) { // Hack! Get the region that this draw pool is rendering from! LLViewerRegion *regionp = mDrawFace[0]->getDrawable()->getVObj()->getRegion(); |