diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-02-07 11:20:06 -0600 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2024-02-07 11:20:06 -0600 |
| commit | 78cc23f89ce01eff6531d4130bdb8016296043a6 (patch) | |
| tree | bc89602fc63bb40b15f76ce91b7cb6d33d4511d8 /indra/newview/llmaterialeditor.cpp | |
| parent | b0c7dc653dc730f1f95aa95fc6df876dfe7b04a0 (diff) | |
| parent | 7a5b0f5acf0b8aee3e73af0eb15d8c6930b98243 (diff) | |
Merge branch 'release/materials_featurette' into materials_featurette/mirrors
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 45bb350e1f..f939418893 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -449,9 +449,7 @@ 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"))); + mNormalTextureCtrl->setBlankImageAssetID(BLANK_OBJECT_NORMAL); if (mIsOverride) { |