From feece92f2bb7525a7b2a99170ed60a40fac7777e Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 14 Dec 2023 14:58:20 +0200
Subject: [PATCH] SL-20717 Add PBR to Advanced > Rendering Types
---
indra/newview/llviewermenu.cpp | 4 ++++
indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
2 files changed, 14 insertions(+)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 553eaaf9b2a..9db9d97ddc8 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 2c4b03251ae..660f4b62c71 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"
--
GitLab