Skip to content

Commit f5edac5

Browse files
committed
Fixed issue with templateCollections loading
1 parent ee611ce commit f5edac5

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

Editor/ShaderGenerator.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,12 +324,24 @@ private static void AddFreshShaderToList(this Dictionary<TemplateAsset, Template
324324
if ((object)asset == null) return;
325325
if (dictionary.ContainsKey(asset)) return;
326326
string assetPath = AssetDatabase.GetAssetPath(asset);
327-
dictionary.Add(asset, AssetDatabase.LoadAssetAtPath<TemplateAsset>(assetPath));
327+
var genericAsset = AssetDatabase.LoadMainAssetAtPath(assetPath);
328+
TemplateAsset template = null;
329+
switch (genericAsset)
330+
{
331+
case TemplateCollectionAsset collection:
332+
template = collection.Templates.FirstOrDefault(x => x.name.Equals(asset.name));
333+
break;
334+
case TemplateAsset t:
335+
template = t;
336+
break;
337+
}
338+
dictionary.Add(asset, template);
328339
}
329340

330341
// Retrieves the new version of the asset from the dictionary if available
331342
private static TemplateAsset GetTemplate(this Dictionary<TemplateAsset, TemplateAsset> dictionary, TemplateAsset asset)
332343
{
344+
if ((object)asset == null) return null;
333345
return dictionary.TryGetValue(asset, out TemplateAsset result) ? result : null;
334346
}
335347

0 commit comments

Comments
 (0)