SL-20717 Add PBR to Advanced > Rendering Types

maxim-productengine · web-flow · commit feece92f2bb7 · 2023-12-14T14:58:20.000+02:00
diff --git 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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -787,6 +787,10 @@ U32 render_type_from_string(std::string render_type)`
`787`	`787`	`{`
`788`	`788`	`return LLPipeline::RENDER_TYPE_BUMP;`
`789`	`789`	`}`
	`790`	`+ else if ("pbr" == render_type)`
	`791`	`+ {`
	`792`	`+ return LLPipeline::RENDER_TYPE_GLTF_PBR;`
	`793`	`+ }`
`790`	`794`	`else`
`791`	`795`	`{`
`792`	`796`	`return 0;`