Continuing work on SL-17697 Live editing with material overrides.

* Fixed Selection usage so material editor no longer hardcoded to a single object/face
* made local preview hack the fallback for when the ModifyMaterialParams cap is missing

1 files changed, 2 insertions, 9 deletions

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index f93a0e7142..fd8bf044f8 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -4587,23 +4587,16 @@ void LLPanelFace::onPbrStartEditing() {
         dynamic_cast<LLMaterialEditor *>(LLFloaterReg::showInstance("material_editor", LLSD(LLUUID::null), TAKE_FOCUS_YES));
     if (editor)
     {
-        LLObjectSelection *select = LLSelectMgr::getInstance()->getSelection();
-        LLViewerObject * objectp = select->getFirstObject();
-        LLUUID object_id = objectp->getID();
-
         bool   identical;
         LLUUID material_id;
         LLSelectedTE::getPbrMaterialId(material_id, identical);
 
-        S32 face = 0;
-
-        LL_DEBUGS() << "loading material live editor with asset " << material_id << " on object " << object_id << LL_ENDL;
+        LL_DEBUGS() << "loading material live editor with asset " << material_id << LL_ENDL;
 
         LLGLTFMaterial* material = gGLTFMaterialList.getMaterial(material_id);
-        editor->setTitle("Editing material on "s + object_id.asString());
+        editor->setTitle("Editing material on selection"s);
         editor->setAssetId(material_id);
         editor->setFromGLTFMaterial(material);
-        editor->setOverrideTarget(objectp->getLocalID(), face);
     }
 }