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

Fix for SL-19620 & SL-19768 material overrides incorrectly affecting other faces

meow-7.2.2
Brad Linden 2023-06-26 14:07:16 -07:00
parent 774c2d0f88
commit 77ea8eedb8
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llvocache.cpp
View File

@ -105,7 +105,7 @@ bool LLGLTFOverrideCacheEntry::fromLLSD(const LLSD& data)
std::string error, warn;
if (override_mat->fromJSON(gltf_json_str, warn, error))
{
mGLTFMaterial[i] = override_mat;
mGLTFMaterial[side_idx] = override_mat;
}
else
{
@ -126,6 +126,16 @@ bool LLGLTFOverrideCacheEntry::fromLLSD(const LLSD& data)
LL_WARNS_IF(sides.size() != 0, "GLTF") << "broken override cache entry" << LL_ENDL;
}
}
llassert(mSides.size() == mGLTFMaterial.size());
#ifdef SHOW_ASSERT
for (auto const & side : mSides)
{
// check that mSides and mGLTFMaterial have exactly the same keys present
llassert(mGLTFMaterial.count(side.first) == 1);
}
#endif
return true;
}
@ -141,8 +151,11 @@ LLSD LLGLTFOverrideCacheEntry::toLLSD() const
data["object_id"] = mObjectId;
data["local_id"] = (LLSD::Integer) mLocalId;
llassert(mSides.size() == mGLTFMaterial.size());
for (auto const & side : mSides)
{
// check that mSides and mGLTFMaterial have exactly the same keys present
llassert(mGLTFMaterial.count(side.first) == 1);
data["sides"].append(LLSD::Integer(side.first));
data["gltf_json"].append(side.second);
}