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

Xcode build fixes for DRTVWR-559

meow-7.2.2
Brad Kittenbrink 2022-10-25 10:11:21 -07:00
parent 687a012a69
commit caed8871ab
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llgltfmateriallist.cpp
View File

@ -119,7 +119,7 @@ void LLGLTFMaterialList::queueOverrideUpdate(const LLUUID& id, S32 side, LLGLTFM
void LLGLTFMaterialList::applyQueuedOverrides(LLViewerObject* obj)
{
const LLUUID& id = obj->getID();
auto& iter = mQueuedOverrides.find(id);
auto iter = mQueuedOverrides.find(id);
if (iter != mQueuedOverrides.end())
{

2
indra/newview/llviewerobject.cpp
View File

@ -5335,7 +5335,7 @@ 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);
llassert(override_mat ? bool(src_mat) : true);
if (override_mat && src_mat)
{