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

SL-18008 Placeholder functionality for PBR Edit button

meow-7.2.2
Andrey Kleshchev 2022-10-17 23:55:59 +03:00
parent a27e701530
commit 77eba62335
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llmaterialeditor.cpp
View File

@ -1537,7 +1537,28 @@ void LLMaterialEditor::loadMaterial(LLGLTFMaterial * material, bool make_copy)
{
setTitle(LLTrans::getString("New Material"));
}
// else ??? Think of a name for live editing
else
{
setTitle(getString("material_override_title"));
// TODO: Save whole selection
LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
LLViewerObject* object = selection->getFirstNode()->getObject();
if (object)
{
const S32 num_tes = llmin((S32)object->getNumTEs(), (S32)object->getNumFaces()); // avatars have TEs but no faces
for (S32 face = 0; face < num_tes; ++face)
{
LLTextureEntry *te = object->getTE(face);
if (te->isSelected())
{
// TEMP
setOverrideTarget(object->getLocalID(), face);
break;
}
}
}
}
// Todo: At the moment it always makes a 'copy'
// Will need a way to expand existing material

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

@ -15,6 +15,7 @@
<string name="upload_fee_string">L$[FEE] upload fee</string>
<string name="material_selection_title">Material selection</string>
<string name="material_selection_text">Select material:</string>
<string name="material_override_title">Material override</string>
<scroll_container
name="materials_scroll"