diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-08-13 10:34:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-13 10:34:35 -0700 |
| commit | d696010cea1dd0abf6821d6756bc1f33a955cb3f (patch) | |
| tree | 43e1ed90604e83704c0140bce6836dc427f56190 /indra/llrender/llshadermgr.cpp | |
| parent | 50e05c70d38c0e9da654cbc0f1758809e7159744 (diff) | |
| parent | f1fac8127fb7ea7107c2f5af39b9933523fbadca (diff) | |
Merge pull request #2210 from secondlife/v-1883
secondlife/viewer#1883: Local-only PBR terrain paintmap with developer tools
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index bc542d325e..512ef340f9 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1409,6 +1409,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("detail_3"); mReservedUniforms.push_back("alpha_ramp"); + mReservedUniforms.push_back("paint_map"); mReservedUniforms.push_back("detail_0_base_color"); mReservedUniforms.push_back("detail_1_base_color"); @@ -1433,6 +1434,8 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("emissiveColors"); mReservedUniforms.push_back("minimum_alphas"); + mReservedUniforms.push_back("region_scale"); + mReservedUniforms.push_back("origin"); mReservedUniforms.push_back("display_gamma"); |