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/llrender/llshadermgr.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/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 21541c8bc8..8a0a7ce781 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -188,7 +188,7 @@ bool LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) if (!shader->attachFragmentObject("deferred/globalF.glsl")) { - return FALSE; + return false; } if (features->hasSrgb || features->hasAtmospherics || features->calculatesAtmospherics || features->isDeferred) @@ -280,7 +280,7 @@ bool LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) { if (!shader->attachFragmentObject("deferred/pbrterrainUtilF.glsl")) { - return FALSE; + return false; } } |