diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-11-15 10:32:18 -0600 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-11-15 10:32:18 -0600 |
| commit | 361efcb9267f2c91f88198081bbe6ac2264766fd (patch) | |
| tree | 1b91985a7aa1bd48137fd493d6ce9444a7afb21b /indra/newview/llviewerobject.cpp | |
| parent | 0edb7cad6bdeaf02cbd89d1f2dd38c47d6078c03 (diff) | |
| parent | 843866d193a0fb5ea882408c8862335ab9c5539b (diff) | |
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 3b5b986725..2bcd0858d3 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5475,6 +5475,11 @@ S32 LLViewerObject::setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* override_ma tep->setGLTFRenderMaterial(render_mat); retval = TEM_CHANGE_TEXTURE; + for (LLGLTFMaterial::local_tex_map_t::value_type &val : override_mat->mTrackingIdToLocalTexture) + { + LLLocalBitmapMgr::getInstance()->associateGLTFMaterial(val.first, override_mat); + } + } else if (tep->setGLTFRenderMaterial(nullptr)) { |