diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-31 19:45:23 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-09-01 13:26:10 +0300 |
| commit | 20dc30450cb50d08e6c7d23613a6a59aae1a6a16 (patch) | |
| tree | 8d44ac139360ed72216442d87bd8c7c6d498ee5a /indra/newview/skins | |
| parent | 8df1856f84cf2d76b207ab43b05f1f930db50c51 (diff) | |
SL-17999 PBR material in tool's texture tab
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 2af7ccaa7a..922c58fa94 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -144,6 +144,10 @@ name="Materials" value="Materials" /> <combo_box.item + label="PBR" + name="PBR" + value="PBR" /> + <combo_box.item label="Media" name="Media" value="Media" /> @@ -179,6 +183,37 @@ top_pad="1" value="2"/> </radio_group> + <radio_group + control_name="ComboMaterialType" + height="50" + layout="topleft" + left_delta="0" + top_delta="0" + width="150" + visible = "false" + name="radio_pbr_type"> + <radio_item + label="Albedo/emissive" + name="Albedo/emissive" + top="0" + layout="topleft" + height="16" + value="0"/> + <radio_item + label="Normal" + layout="topleft" + top_pad="1" + height="16" + name="Normal" + value="1"/> + <radio_item + label="Metallic/roughness" + name="Metallic/roughness" + height="16" + layout="topleft" + top_pad="1" + value="2"/> + </radio_group> <menu_button menu_filename="menu_copy_paste_texture.xml" follows="top|left" @@ -217,6 +252,19 @@ tool_tip="Click to choose a picture" top_pad="5" width="64" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + fallback_image="materials_ui_x_24.png" + follows="left|top" + height="80" + label="PBR " + layout="topleft" + left="10" + name="pbr_control" + tool_tip="Click to choose a pbr material" + top_delta="0" + width="64" /> <text type="string" length="1" |