Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

bdb8caf7

Commit bdb8caf7 authored 11 months ago by Andrey Lihatskiy

Downloads
- Plain Diff

Merge branch 'release/materials_featurette' into marchcat/x-mf-merge

parents c8217c15 29be88d6

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

doc/testplans/pbr_terrain_appearance.md 2 additions, 0 deletions

doc/testplans/pbr_terrain_appearance.md
indra/newview/app_settings/shaders/class1/deferred/pbrShadowAlphaMaskF.glsl 7 additions, 7 deletions

...settings/shaders/class1/deferred/pbrShadowAlphaMaskF.glsl
indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl 6 additions, 2 deletions

...view/app_settings/shaders/class1/deferred/pbropaqueF.glsl
indra/newview/app_settings/shaders/class1/deferred/pbrterrainV.glsl 7 additions, 7 deletions

...iew/app_settings/shaders/class1/deferred/pbrterrainV.glsl
indra/newview/app_settings/shaders/class1/deferred/textureUtilV.glsl 35 additions, 0 deletions

...ew/app_settings/shaders/class1/deferred/textureUtilV.glsl
indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl 1 addition, 1 deletion

..._settings/shaders/class1/windlight/atmosphericsFuncs.glsl
indra/newview/lldrawpoolterrain.cpp 1 addition, 9 deletions

indra/newview/lldrawpoolterrain.cpp
indra/newview/llface.cpp 1 addition, 1 deletion

indra/newview/llface.cpp
indra/newview/llfetchedgltfmaterial.cpp 1 addition, 10 deletions

indra/newview/llfetchedgltfmaterial.cpp

with 61 additions and 37 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment