diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-01-30 15:49:35 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 15:49:35 -0600 |
| commit | 9c378ca1e74229b5b1bb25fd63be5f1cf8349184 (patch) | |
| tree | 8f0f4a865fb04ef1e6ca8550b5fcefded689c162 /indra/newview/llmaterialeditor.cpp | |
| parent | c8547ad8a588fca0a22b2194ad1b18b66153f32d (diff) | |
| parent | a5a4fd0c1026a994dd81ea6b703bcabcd8ed9501 (diff) | |
Merge pull request #703 from secondlife/release/gltf-maint2
Release/gltf maint2
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) { |