livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#3846 Crash at updateGLTFMaterials

master
Andrey Kleshchev 2025-04-01 16:30:21 +03:00 committed by Andrey Kleshchev
parent 4ddd9d1fef
commit 27fd726fae
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lllocalbitmaps.cpp
View File

@ -680,11 +680,15 @@ void LLLocalBitmap::updateGLTFMaterials(LLUUID old_id, LLUUID new_id)
// do not create a new material, reuse existing pointer
// so that mTextureEntires remains untouched
LLGLTFMaterial* render_mat = entry->getGLTFRenderMaterial();
if (render_mat)
if (render_mat && render_mat != mat)
{
*render_mat = *mat;
render_mat->applyOverride(*override_mat); // can update mGLTFMaterialWithLocalTextures
}
else
{
LL_WARNS() << "A TE had an override, but no render material" << LL_ENDL;
}
}
}
}