diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-19 00:08:27 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-19 01:01:03 +0300 |
| commit | 58472180696401155159414c20a307cf97f7df44 (patch) | |
| tree | e19a13561730db2915bdbd8ef5152e8881848944 /indra/newview/llmaterialeditor.cpp | |
| parent | 0b177c27a07344d81cb52806695b2348b6f33b0a (diff) | |
SL-18391 Basic GLTF lifetime management
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 319f98b816..c5cdb81d67 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -1422,7 +1422,8 @@ void LLMaterialEditor::loadFromGLTFMaterial(LLUUID &asset_id) return; } LLMaterialEditor* me = (LLMaterialEditor*)LLFloaterReg::getInstance("material_editor"); - me->setTitle(LLTrans::getString("New Material")); + me->mMaterialName = LLTrans::getString("New Material"); + me->setTitle(me->mMaterialName); me->setHasUnsavedChanges(true); me->setFromGLTFMaterial(gGLTFMaterialList.getMaterial(asset_id)); me->openFloater(); @@ -1943,7 +1944,7 @@ void LLMaterialEditor::applyToSelection() LL_WARNS() << "not connected to materials capable region, missing ModifyMaterialParams cap" << LL_ENDL; // Fallback local preview. Will be removed once override systems is finished and new cap is deployed everywhere. - LLPointer<LLGLTFMaterial> mat = new LLGLTFMaterial(); + LLPointer<LLFetchedGLTFMaterial> mat = new LLFetchedGLTFMaterial(); getGLTFMaterial(mat); static const LLUUID placeholder("984e183e-7811-4b05-a502-d79c6f978a98"); gGLTFMaterialList.addMaterial(placeholder, mat); |