diff options
author | Rider Linden <rider@lindenlab.com> | 2025-03-25 09:58:43 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2025-03-25 09:58:43 -0700 |
commit | b86c36eafcdb0fb42c1b68ef671050dea67dc6c3 (patch) | |
tree | dfa54e83a9ccac2c5346210c05626e61760e2822 /indra/llrender/llglslshader.h | |
parent | 48ccb0f75b078670ced1f8fe8d4942abe0a6f293 (diff) | |
parent | 423df2ba4b731417796478c449e3e8f3d166ef21 (diff) |
Merge remote-tracking branch 'remotes/origin/develop' into rider/bot_tattle
Fix conflicts
Diffstat (limited to 'indra/llrender/llglslshader.h')
-rw-r--r-- | indra/llrender/llglslshader.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 58c456f134..873ab0cff5 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -59,6 +59,7 @@ public: bool attachNothing = false; bool hasHeroProbes = false; bool isPBRTerrain = false; + bool hasTonemap = false; }; // ============= Structure for caching shader uniforms =============== |