diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-01-08 23:49:38 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-01-08 23:49:38 +0200 |
| commit | 7d4de08fa9c43f6e21267cb861cbac8a9280e5ec (patch) | |
| tree | 6187d0f264efa1122a76245db6a1def6f1ca13c4 /indra/newview/llviewermenu.cpp | |
| parent | a1c36a3218a7fe6eb7b646e64c6bf9bc29b24886 (diff) | |
| parent | 77395eddc911e0801e50fd693f7bbaee8046aa95 (diff) | |
Merge branch 'main' into DRTVWR-489
# Conflicts:
# indra/newview/llmaterialeditor.cpp
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index da27a2a427..69edb54997 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; |