diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-19 11:38:02 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-19 11:38:02 -0500 |
| commit | 0752cc07921664af2e13588b1aaaf3c47546e3be (patch) | |
| tree | 697d8f9b5384e76a333a6a16f758198e5b33ef07 /indra/newview/llmaterialeditor.cpp | |
| parent | f21666bd9a4fe35b325c23c4b46076be24016bfc (diff) | |
| parent | 586e4cd090b22f11a68fa635e598847ce3b84d21 (diff) | |
DRTVWR-601: Merge branch 'release/gltf-maint2' into DRTVWR-601-gha-libs
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index db9589666c..34f2f77d25 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -43,6 +43,7 @@ #include "llnotificationsutil.h" #include "lltexturectrl.h" #include "lltrans.h" +#include "llviewercontrol.h" #include "llviewermenufile.h" #include "llviewertexture.h" #include "llsdutil.h" @@ -448,6 +449,10 @@ BOOL LLMaterialEditor::postBuild() mEmissiveTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitTexture, this, _1, _2, MATERIAL_EMISIVE_TEX_DIRTY)); mNormalTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitTexture, this, _1, _2, MATERIAL_NORMAL_TEX_DIRTY)); + // should match normal textures from mBumpyTextureCtrl + mNormalTextureCtrl->setDefaultImageAssetID(LLUUID(gSavedSettings.getString("DefaultObjectNormalTexture"))); + mNormalTextureCtrl->setBlankImageAssetID(LLUUID(gSavedSettings.getString("DefaultBlankNormalTexture"))); + if (mIsOverride) { // Live editing needs a recovery mechanism on cancel |