Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

XDG Integration
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

49b576d3

Commit 49b576d3 authored 1 year ago by Logue

Downloads
- Plain Diff

Merge branch 'main' of git.alchemyviewer.org:alchemy/alchemy-next

parents 0b2bbd8f 2b3a3fad

No related branches found

No related tags found

2 merge requests!3Update to main branch,!2Rebase onto current main branch

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

autobuild.xml 12 additions, 12 deletions

autobuild.xml
indra/llrender/llimagegl.cpp 8 additions, 8 deletions

indra/llrender/llimagegl.cpp
indra/llrender/llimagegl.h 3 additions, 3 deletions

indra/llrender/llimagegl.h
indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl 17 additions, 7 deletions

...ew/app_settings/shaders/class1/deferred/deferredUtil.glsl
indra/newview/app_settings/shaders/class1/deferred/genbrdflutF.glsl 1 addition, 1 deletion

...iew/app_settings/shaders/class1/deferred/genbrdflutF.glsl
indra/newview/app_settings/shaders/class3/environment/waterF.glsl 1 addition, 1 deletion

...wview/app_settings/shaders/class3/environment/waterF.glsl
indra/newview/llviewertexture.cpp 4 additions, 1 deletion

indra/newview/llviewertexture.cpp
indra/newview/pipeline.cpp 15 additions, 16 deletions

indra/newview/pipeline.cpp

with 61 additions and 49 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