From 1ed8f7cd0ca41ab655aaeeaf141eb4ef20f16bd0 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 9 Nov 2022 17:10:31 -0600 Subject: SL-18602 Fix for applying material asset not removing overrides on drag-and-drop --- indra/newview/llmaterialeditor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llmaterialeditor.cpp') diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 675ca610ce..17da7e8853 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -2526,7 +2526,7 @@ public: { mSuccess = true; } - LLGLTFMaterialList::queueModifyMaterial(objectp->getID(), te, *material); + LLGLTFMaterialList::queueModifyMaterial(objectp->getID(), te, material); #else std::string overrides_json = material->asJSON(); @@ -2598,7 +2598,7 @@ void LLMaterialEditor::applyToSelection() void(*done_callback)(bool) = LLRenderMaterialOverrideFunctor::modifyCallback; - LLGLTFMaterialList::flushModifyMaterialQueue(done_callback); + LLGLTFMaterialList::flushUpdates(done_callback); if (!override_func.getResult()) { -- cgit v1.2.3