diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-01-11 10:36:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 10:36:35 -0800 |
| commit | 7e1f4e4cc7588131e12b3fc7542e10d066aad93f (patch) | |
| tree | d1abc294fe0a7508d6d3b9d0b6661694b11719d9 /indra/newview/llpanelface.cpp | |
| parent | b4f53334141b179bdb1762636ce313f14d9e2b10 (diff) | |
| parent | 693925ef23ef41e3927a9654a7f423d0e24ce19a (diff) | |
Merge pull request #48 from secondlife/SL-18820
Sl 18820: Build floater should preserve GLTF transforms when changing the PBR material
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 0b18bdc6e6..cf02f3c4e4 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -4527,8 +4527,8 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te) tep->setGLTFRenderMaterial(nullptr); tep->setGLTFMaterialOverride(nullptr); - // blank out any override data on the server - LLGLTFMaterialList::queueApply(objectp->getID(), te, LLUUID::null); + // blank out most override data on the server + LLGLTFMaterialList::queueApply(objectp, te, LLUUID::null); } // Texture map |