diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-05-06 15:34:16 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-05-06 15:34:16 -0400 |
| commit | d679e7f3bacd7bba5493257f0e6c1c2366bf960a (patch) | |
| tree | b351be1516815a9ebd49bf57e86d7f7125537bec /indra/newview/lltexturectrl.cpp | |
| parent | 47a5c7a41340a18d90a5a8724762ff32f9ac8afd (diff) | |
| parent | 9180a110bd5b0e41f182c32017b5dccd2eb265be (diff) | |
Merge branch 'release/2025.04' into geenz/gltf-mesh-import
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; } |