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

Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559

meow-7.2.2
Dave Parks 2022-08-08 14:55:35 -05:00
parent 963566821d 3e7946bbbf
commit eeb3b4daa6
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llgltfmateriallist.cpp
View File

@ -99,13 +99,13 @@ static void set_from_model(LLGLTFMaterial* mat, tinygltf::Model& model)
}
mat->setAlphaMode(material_in.alphaMode);
mat->mAlphaCutoff = material_in.alphaCutoff;
mat->mAlphaCutoff = llclamp((F32)material_in.alphaCutoff, 0.f, 1.f);
mat->mAlbedoColor = get_color(material_in.pbrMetallicRoughness.baseColorFactor);
mat->mEmissiveColor = get_color(material_in.emissiveFactor);
mat->mMetallicFactor = material_in.pbrMetallicRoughness.metallicFactor;
mat->mRoughnessFactor = material_in.pbrMetallicRoughness.roughnessFactor;
mat->mMetallicFactor = llclamp((F32)material_in.pbrMetallicRoughness.metallicFactor, 0.f, 1.f);
mat->mRoughnessFactor = llclamp((F32)material_in.pbrMetallicRoughness.roughnessFactor, 0.f, 1.f);
mat->mDoubleSided = material_in.doubleSided;
}

5
indra/newview/skins/default/xui/en/floater_material_editor.xml
View File

@ -111,6 +111,7 @@
layout="topleft"
left_delta="0"
top_pad="5"
min_val="0"
max_val="1"
name="transparency"
width="64"
@ -169,6 +170,7 @@
layout="topleft"
left_delta="0"
top_pad="5"
min_val="0"
max_val="1"
name="alpha cutoff"
width="64"
@ -245,6 +247,7 @@
layout="topleft"
left_delta="0"
top_pad="5"
min_val="0"
max_val="1"
name="metalness factor"
width="64"
@ -270,7 +273,7 @@
layout="topleft"
left_delta="0"
top_pad="5"
min_val="0"
max_val="1"
name="roughness factor"
width="64"

4
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -820,7 +820,7 @@
width="282"/>
<tab_container
follows="left|top"
height="471"
height="476"
halign="center"
left="0"
name="Object Info Tabs"
@ -2749,7 +2749,7 @@ even though the user gets a free copy.
border_visible="true"
bevel_style="in"
follows="left|top|right"
height="335"
height="387"
layout="topleft"
left="10"
name="contents_inventory"