diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-12-14 10:22:48 -0600 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-12-14 10:22:48 -0600 |
| commit | 7bfe590a3669a005d4269cdcf378891080264dce (patch) | |
| tree | 5d018f5cab9c37bd74bee773d64d255a33bfffbe | |
| parent | 9212e0944203fdbdefbaae01a89600a0050b3a36 (diff) | |
| parent | feece92f2bb7525a7b2a99170ed60a40fac7777e (diff) | |
Merge branch 'DRTVWR-601' of github.com:secondlife/viewer into DRTVWR-601
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 10 |
4 files changed, 16 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index af8b259c74..2fbe8ab7cc 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -596,6 +596,7 @@ Henri Beauchamp SL-15175 SL-19110 SL-19159 + [NO JIRA] (fullbright HUD alpha fix) herina Bode Hikkoshi Sakai VWR-429 diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl index 8b2a69b924..a6fab10791 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl @@ -76,9 +76,9 @@ void main() vec3 pos = vary_position; + color.a = final_alpha; #ifndef IS_HUD color.rgb = srgb_to_linear(color.rgb); - color.a = final_alpha; #ifdef IS_ALPHA vec3 sunlit; diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 553eaaf9b2..9db9d97ddc 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -787,6 +787,10 @@ U32 render_type_from_string(std::string render_type) { return LLPipeline::RENDER_TYPE_BUMP; } + else if ("pbr" == render_type) + { + return LLPipeline::RENDER_TYPE_GLTF_PBR; + } else { return 0; diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 2c4b03251a..660f4b62c7 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2162,6 +2162,16 @@ function="World.EnvPreset" function="Advanced.ToggleRenderType" parameter="bump" /> </menu_item_check> + <menu_item_check + label="PBR" + name="Rendering Type PBR"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="pbr" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="pbr" /> + </menu_item_check> </menu> <menu create_jump_keys="true" |