diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-10-30 16:40:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-30 16:40:04 +0200 |
| commit | e154fee226b4a33d5b55f3cebf1667e5d0604db5 (patch) | |
| tree | 49618229b499212732294d10d975fd6b4b8a40a4 | |
| parent | fb0bbba9c91829a58b5c271043fcc032a72f9eba (diff) | |
SL-20541 Reorder radio buttons in Edit tools Texture tab to match order in a Material
| -rw-r--r-- | indra/newview/llpanelface.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index cb28fb4770..9150b89de3 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -113,9 +113,9 @@ const S32 BUMPY_TEXTURE = 18; // use supplied normal map const S32 SHINY_TEXTURE = 4; // use supplied specular map const S32 PBRTYPE_RENDER_MATERIAL_ID = 0; // Render Material ID const S32 PBRTYPE_BASE_COLOR = 1; // PBR Base Color -const S32 PBRTYPE_NORMAL = 2; // PBR Normal -const S32 PBRTYPE_METALLIC_ROUGHNESS = 3; // PBR Metallic -const S32 PBRTYPE_EMISSIVE = 4; // PBR Emissive +const S32 PBRTYPE_METALLIC_ROUGHNESS = 2; // PBR Metallic +const S32 PBRTYPE_EMISSIVE = 3; // PBR Emissive +const S32 PBRTYPE_NORMAL = 4; // PBR Normal LLGLTFMaterial::TextureInfo texture_info_from_pbrtype(S32 pbr_type) { 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 5b15752eb7..3f4e3e804f 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -217,25 +217,25 @@ height="16" value="1"/> <radio_item - label="Normal" - layout="topleft" - top_pad="1" - height="16" - name="Normal" - value="2"/> - <radio_item label="Metallic/roughness" name="Metallic/roughness" height="16" layout="topleft" top_pad="1" - value="3"/> + value="2"/> <radio_item label="Emissive" name="Emissive" layout="topleft" top_pad="1" height="16" + value="3"/> + <radio_item + label="Normal" + layout="topleft" + top_pad="1" + height="16" + name="Normal" value="4"/> </radio_group> <menu_button |