diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-22 15:25:03 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-22 15:25:03 -0500 |
| commit | 88659e9fe793a02fb4edcbf8ef07307c25119604 (patch) | |
| tree | 101a4f72c45ce3bce4bde6b3a391d32e69ccf70a /indra/newview/llviewerobject.cpp | |
| parent | 7135934e50bf2727c2366687af7427d44483e984 (diff) | |
SL-18105 When saving an object's material to inventory, save the version that as overrides applied.
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index eaf0287dae..603dcc4fa7 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5333,6 +5333,9 @@ S32 LLViewerObject::setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* override_ma tep->setGLTFMaterialOverride(override_mat); + // if override mat exists, we must also have a source mat + llassert(override_mat ? src_mat : true); + if (override_mat && src_mat) { LLFetchedGLTFMaterial* render_mat = new LLFetchedGLTFMaterial(*src_mat); |