livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-20541 Reorder radio buttons in Edit tools Texture tab to match order in a Material

master
Maxim Nikolenko 2023-10-30 16:40:04 +02:00 committed by GitHub
parent fb0bbba9c9
commit e154fee226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llpanelface.cpp
View File

@ -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)
{

16
indra/newview/skins/default/xui/en/panel_tools_texture.xml
View File

@ -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