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.

0f897638

Commit 0f897638 authored 12 years ago by David Parks

Downloads
- Plain Diff

Automated merge with https://bitbucket.org/lindenlab/davep-materials

parents 48f43321 5121dd1a

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/shaders/class1/deferred/materialF.glsl 2 additions, 2 deletions

...wview/app_settings/shaders/class1/deferred/materialF.glsl
indra/newview/lldrawpool.h 4 additions, 4 deletions

indra/newview/lldrawpool.h
indra/newview/lldrawpoolalpha.cpp 26 additions, 8 deletions

indra/newview/lldrawpoolalpha.cpp
indra/newview/lldrawpoolalpha.h 2 additions, 0 deletions

indra/newview/lldrawpoolalpha.h
indra/newview/lldrawpoolmaterials.cpp 4 additions, 4 deletions

indra/newview/lldrawpoolmaterials.cpp
indra/newview/llvovolume.cpp 53 additions, 26 deletions

indra/newview/llvovolume.cpp
indra/newview/pipeline.cpp 13 additions, 2 deletions

indra/newview/pipeline.cpp

with 104 additions and 46 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