diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-29 11:54:56 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-29 11:54:56 +0800 |
| commit | 11d75418fce8372e9976b069070d9d0506766d0d (patch) | |
| tree | d0fc6b405dbcffefcd85f3ba52a8248c0128acde /indra/newview/lltexturectrl.cpp | |
| parent | b6c3d47c007c59cbd3c9913a0b99f9d42bdb8d75 (diff) | |
| parent | 0421e7b846b03d316740d759348c3aaa723d0b14 (diff) | |
Merge branch '2025.04'
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 35057a910a..20127f5f27 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -88,7 +88,8 @@ bool get_is_predefined_texture(LLUUID asset_id) || asset_id == DEFAULT_OBJECT_NORMAL || asset_id == BLANK_OBJECT_NORMAL || asset_id == IMG_WHITE - || asset_id == LLUUID(SCULPT_DEFAULT_TEXTURE)) + || asset_id == LLUUID(SCULPT_DEFAULT_TEXTURE) + || asset_id == BLANK_MATERIAL_ASSET_ID) { return true; } |