diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-03-19 10:08:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-19 10:08:34 -0700 |
| commit | 052a8a78e8b024bda1db6e5359c0d091b2a72d06 (patch) | |
| tree | 26e676bedf2fd31d00ee0274483e1bc13ef3f766 /indra/newview/llselectmgr.cpp | |
| parent | 2a325fdebadd32a230f10b372b25ec5474e50f63 (diff) | |
| parent | d0458c4853a6b1923439af8ebc2701410d838473 (diff) | |
Merge pull request #1014 from secondlife/v-1006
secondlife/viewer#1006: Review feedback: Move blank material constant to indra_constants.h
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 620dcad760..a4c43d8ddc 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1782,7 +1782,7 @@ bool LLObjectSelection::applyRestrictedPbrMaterialToTEs(LLViewerInventoryItem* i LLUUID asset_id = item->getAssetUUID(); if (asset_id.isNull()) { - asset_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID; + asset_id = BLANK_MATERIAL_ASSET_ID; } bool material_copied_all_faces = true; @@ -1987,7 +1987,7 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id) asset_id = mItem->getAssetUUID(); if (asset_id.isNull()) { - asset_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID; + asset_id = BLANK_MATERIAL_ASSET_ID; } } |