diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-02-19 17:29:48 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-02-19 17:29:48 +0200 |
| commit | 847fd636cd5c1ae63dabfa76c3d1d0df36ddb9fa (patch) | |
| tree | 6c9dcef59ca8b809ee87d565524f0262580c7bec /indra/newview/lldrawpool.h | |
| parent | 483e85cbf31e08e3692d2fb267bdaacdd0ed38a4 (diff) | |
| parent | 8c1f00eebc6863c39d0143aeb7e37c68459d454f (diff) | |
Merge branch release/2025.03
# Conflicts:
# indra/newview/llmeshrepository.cpp
# indra/newview/llmeshrepository.h
Diffstat (limited to 'indra/newview/lldrawpool.h')
| -rw-r--r-- | indra/newview/lldrawpool.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h index bc412214c7..1c8864a9df 100644 --- a/indra/newview/lldrawpool.h +++ b/indra/newview/lldrawpool.h @@ -55,6 +55,7 @@ public: // based on fill rate and likelihood to occlude future passes (faster, large occluders first). // POOL_SKY = 1, + POOL_WATEREXCLUSION, POOL_WL_SKY, POOL_SIMPLE, POOL_FULLBRIGHT, @@ -140,7 +141,7 @@ public: PASS_GRASS, PASS_FULLBRIGHT, PASS_FULLBRIGHT_RIGGED, - PASS_INVISIBLE, + PASS_INVISIBLE, // Formerly, invisiprims. Now, water exclusion surfaces. PASS_INVISIBLE_RIGGED, PASS_INVISI_SHINY, PASS_INVISI_SHINY_RIGGED, |