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

SL-18008 Edit PBR in menu should not be enabled if selection has no pbr materials

meow-7.2.2
Andrey Kleshchev 2022-10-27 21:35:46 +03:00
parent 6860df0b98
commit 414efe56bd
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llviewermenu.cpp
View File

@ -2809,37 +2809,39 @@ void handle_object_open()
LLFloaterReg::showInstance("openobject");
}
struct LLSelectedTEGetmatIdAndPermissions : public LLSelectedTEGetFunctor<LLUUID>
struct LLSelectedTEGetmatIdAndPermissions : public LLSelectedTEFunctor
{
LLSelectedTEGetmatIdAndPermissions() : mCanCopy(true), mCanModify(true), mCanTransfer(true) {}
LLUUID get(LLViewerObject* object, S32 te_index)
bool apply(LLViewerObject* objectp, S32 te_index)
{
mCanCopy &= (bool)object->permCopy();
mCanTransfer &= (bool)object->permTransfer();
mCanModify &= (bool)object->permModify();
// return true if all ids are identical
return object->getRenderMaterialID(te_index);
mCanCopy &= (bool)objectp->permCopy();
mCanTransfer &= (bool)objectp->permTransfer();
mCanModify &= (bool)objectp->permModify();
LLUUID mat_id = objectp->getRenderMaterialID(te_index);
if (mat_id.notNull())
{
mMaterialId = mat_id;
}
return true;
}
bool mCanCopy;
bool mCanModify;
bool mCanTransfer;
LLUUID mMaterialId;
};
bool enable_object_edit_gltf_material()
{
LLSelectedTEGetmatIdAndPermissions func;
LLUUID mat_id;
LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&func, mat_id);
return func.mCanModify;
LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func);
return func.mCanModify && func.mMaterialId.notNull();
}
bool enable_object_save_gltf_material()
{
LLSelectedTEGetmatIdAndPermissions func;
LLUUID mat_id;
LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&func, mat_id);
return func.mCanCopy && mat_id.notNull();
LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func);
return func.mCanCopy && func.mMaterialId.notNull();
}
bool enable_object_open()