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.

53a6341e

Commit 53a6341e authored 10 months ago by Rye Mutt

Downloads
- Plain Diff

Merge remote-tracking branch 'linden/release/materials_featurette' into next

parents 73b8383b 65c9386d

No related branches found

No related tags found

No related merge requests found

Changes 158

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.editorconfig 14 additions, 0 deletions

.editorconfig
.github/workflows/build.yaml 1 addition, 1 deletion

.github/workflows/build.yaml
doc/contributions.txt 1 addition, 1 deletion

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

doc/testplans/pbr_terrain_appearance.md
indra/llcommon/indra_constants.cpp 28 additions, 28 deletions

indra/llcommon/indra_constants.cpp
indra/llcommon/indra_constants.h 169 additions, 169 deletions

indra/llcommon/indra_constants.h
indra/llcommon/llrefcount.h 85 additions, 85 deletions

indra/llcommon/llrefcount.h
indra/llcommon/llstrider.h 46 additions, 46 deletions

indra/llcommon/llstrider.h
indra/llimage/llimage.cpp 1744 additions, 1744 deletions

indra/llimage/llimage.cpp
indra/llimage/llimage.h 203 additions, 203 deletions

indra/llimage/llimage.h
indra/llmath/llmatrix4a.h 724 additions, 724 deletions

indra/llmath/llmatrix4a.h
indra/llmath/llvolume.cpp 6280 additions, 6280 deletions

indra/llmath/llvolume.cpp
indra/llmath/llvolume.h 852 additions, 852 deletions

indra/llmath/llvolume.h
indra/llmath/llvolumeoctree.cpp 182 additions, 182 deletions

indra/llmath/llvolumeoctree.cpp
indra/llmath/llvolumeoctree.h 46 additions, 46 deletions

indra/llmath/llvolumeoctree.h
indra/llplugin/llpluginprocessparent.cpp 984 additions, 984 deletions

indra/llplugin/llpluginprocessparent.cpp
indra/llprimitive/llprimitive.cpp 1444 additions, 1444 deletions

indra/llprimitive/llprimitive.cpp
indra/llprimitive/llprimitive.h 448 additions, 448 deletions

indra/llprimitive/llprimitive.h
indra/llprimitive/lltextureentry.cpp 357 additions, 357 deletions

indra/llprimitive/lltextureentry.cpp
indra/llrender/llglslshader.cpp 31 additions, 31 deletions

indra/llrender/llglslshader.cpp

with 13641 additions and 13625 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