diff options
author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2022-11-30 09:27:22 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-30 09:27:22 -0800 |
commit | c99c24939a18b5aa6c29af189a1d91f254c8b5a2 (patch) | |
tree | b0fc7c3b7bd846cb461bfd7045f55411ed8321c3 /indra/newview/llmaterialeditor.cpp | |
parent | 9f7967fcdc5ccb60bd72e8e9e1b7652dc2058524 (diff) | |
parent | fd19fb2f914269a8cbea49db244d633b6d7008bb (diff) |
Merge pull request #16 from secondlife/SL-18732
Sl 18732: Fix responsiveness of GLTF texture transform controls in build floater
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
-rw-r--r-- | indra/newview/llmaterialeditor.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index fe674abeee..07c283e9c2 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -408,6 +408,9 @@ BOOL LLMaterialEditor::postBuild() if (mIsOverride) { + // Material override change success callback + LLGLTFMaterialList::addSelectionUpdateCallback(&LLMaterialEditor::updateLive); + // Live editing needs a recovery mechanism on cancel mBaseColorTextureCtrl->setOnCancelCallback(boost::bind(&LLMaterialEditor::onCancelCtrl, this, _1, _2, MATERIAL_BASE_COLOR_TEX_DIRTY)); mMetallicTextureCtrl->setOnCancelCallback(boost::bind(&LLMaterialEditor::onCancelCtrl, this, _1, _2, MATERIAL_METALLIC_ROUGHTNESS_TEX_DIRTY)); |