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.

82311e4b

Commit 82311e4b authored 3 years ago by Dave Houlton

Downloads
- Plain Diff

Merge branch 'DRTVWR-559' into euclid-17277

parents f05e5871 93a02596

No related branches found

No related tags found

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

indra/llrender/llcubemap.cpp 37 additions, 185 deletions

indra/llrender/llcubemap.cpp
indra/llrender/llcubemap.h 7 additions, 9 deletions

indra/llrender/llcubemap.h
indra/llrender/llglslshader.cpp 17 additions, 1 deletion

indra/llrender/llglslshader.cpp
indra/llrender/llshadermgr.cpp 1 addition, 0 deletions

indra/llrender/llshadermgr.cpp
indra/llrender/llshadermgr.h 1 addition, 0 deletions

indra/llrender/llshadermgr.h
indra/newview/CMakeLists.txt 2 additions, 0 deletions

indra/newview/CMakeLists.txt
indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl 0 additions, 1 deletion

...pp_settings/shaders/class1/deferred/multiPointLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl 0 additions, 1 deletion

...app_settings/shaders/class1/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl 0 additions, 1 deletion

...iew/app_settings/shaders/class1/deferred/pointLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl 20 additions, 1 deletion

...ew/app_settings/shaders/class2/deferred/softenLightF.glsl
indra/newview/llenvironmentmap.cpp 116 additions, 0 deletions

indra/newview/llenvironmentmap.cpp
indra/newview/llenvironmentmap.h 48 additions, 0 deletions

indra/newview/llenvironmentmap.h
indra/newview/llviewermenu.cpp 8 additions, 0 deletions

indra/newview/llviewermenu.cpp
indra/newview/pipeline.cpp 41 additions, 7 deletions

indra/newview/pipeline.cpp
indra/newview/pipeline.h 4 additions, 0 deletions

indra/newview/pipeline.h
indra/newview/skins/default/xui/en/menu_viewer.xml 7 additions, 0 deletions

indra/newview/skins/default/xui/en/menu_viewer.xml

with 309 additions and 206 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