Skip to content
Snippets Groups Projects
Commit ed6d1cd4 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fox build

parent 58656e5b
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
...@@ -562,7 +562,7 @@ void LLTextureEntry::setGLTFMaterial(LLGLTFMaterial* material, bool local_origin ...@@ -562,7 +562,7 @@ void LLTextureEntry::setGLTFMaterial(LLGLTFMaterial* material, bool local_origin
S32 LLTextureEntry::setGLTFMaterialOverride(LLGLTFMaterial* mat) S32 LLTextureEntry::setGLTFMaterialOverride(LLGLTFMaterial* mat)
{ {
llassert(mat == nullptr || getGLTFMaterial() != nullptr); // if override is not null, base material must not be null llassert(mat == nullptr || getGLTFMaterial() != nullptr); // if override is not null, base material must not be null
if (mat == mGLTFMaterialOverrides) if (mat == mGLTFMaterialOverrides.get())
{ {
return TEM_CHANGE_NONE; return TEM_CHANGE_NONE;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment