summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-01-09 10:14:41 +0800
committerErik Kundiman <erik@megapahit.org>2024-01-09 10:14:41 +0800
commitf6dec0bf7b9baa990fa26398e77faf5a410b8be6 (patch)
tree9ed732e6801157018faff52d4782c2688fefdd73 /indra/newview/llviewermenu.cpp
parent0fd4a8b59677e1a85d19308379ab9967345749dc (diff)
parent3c858d7e2d6633df14df473a918d2fb848403972 (diff)
Merge tag '7.1.2-release'
source for viewer 7.1.2.7215179142
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp4
1 files changed, 4 insertions, 0 deletions
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;