pengtaihao
/
SoftMaskForUGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed cloned material cache erroneously used null entries as valid materials (leading to invisibility)

pull/77/head
phoenix 2020-04-17 20:51:47 +02:00
parent 5207e9882d
commit 4009c3c28b
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/Coffee/UIExtensions/SoftMaskForUGUI/Scripts/SoftMaskable.cs
View File

@ -78,7 +78,22 @@ namespace Coffee.UIExtensions
{ {
Material clonedMat; Material clonedMat;
if (dictBySoftMask.TryGetValue(_softMask, out clonedMat)) if (dictBySoftMask.TryGetValue(_softMask, out clonedMat))
{
// we need to check for null, because the material might have been disposed in ReleaseMaterial()
if (clonedMat != null)
return clonedMat; return clonedMat;
// When we have found a null entry, we remove it from the dicts.
// We do that here and not in ReleaseMaterial(), because here we have the baseMaterial ready
// and don't need to iterate the whole dict.
dictBySoftMask.Remove(_softMask);
if (dictBySoftMask.Count == 0)
{
s_clonedMaterials.Remove(baseMaterial);
dictBySoftMask = null;
}
}
} }
result = new Material(baseMaterial); result = new Material(baseMaterial);