diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-23 11:19:56 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-23 11:19:56 -0500 |
| commit | 8f1d22686551f4d6783d03cd3685085ed7fcb96c (patch) | |
| tree | 09dd1c2a7c13a433e8756080638448624281a86c /indra/newview/skins/default | |
| parent | 01d667109159666150816ff728fa941d2fb54299 (diff) | |
SL-18134 Rename Albedo to Base Color to be more consistent with GLTF spec
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_material_editor.xml | 14 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml index eda28c5a4b..67cbb253d9 100644 --- a/indra/newview/skins/default/xui/en/floater_material_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml @@ -50,7 +50,7 @@ layout="topleft" left="1" mouse_opaque="false" - name="albedo_texture_pnl" + name="base_color_texture_pnl" top_pad="5" > <text @@ -62,8 +62,8 @@ layout="topleft" left="10" top="5" - width="64"> - Albedo: + width="128"> + Base Color: </text> <texture_picker can_apply_immediately="true" @@ -75,8 +75,8 @@ height="151" layout="topleft" left="10" - name="albedo_texture" - tool_tip="Albedo map. Alpha channel is optional and used for transparency." + name="base_color_texture" + tool_tip="Base Color map. Alpha channel is optional and used for transparency." width="128" /> <text type="string" @@ -88,7 +88,7 @@ layout="topleft" left="10" top_pad="-17" - name="albedo_upload_fee" + name="base_color_upload_fee" > No upload fee </text> @@ -111,7 +111,7 @@ layout="topleft" left_delta="0" top_pad="5" - name="albedo color" + name="base color" width="40" /> <text type="string" 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 30774ab18e..104bcb9257 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -191,8 +191,8 @@ visible = "false" name="radio_pbr_type"> <radio_item - label="Albedo/emissive" - name="Albedo/emissive" + label="Color/emissive" + name="Color/emissive" top="0" layout="topleft" height="16" |