Skip to content

Commit 321b510

Browse files
committed
Revert "Maybe fixed rare error with Fresh Assets Check on templates"
This reverts commit 4752b0c.
1 parent 4752b0c commit 321b510

File tree

4 files changed

+1
-8
lines changed

4 files changed

+1
-8
lines changed

Editor/Scriptables/TemplateAsset.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ public class TemplateAsset : ScriptableObject
1717
/// Template string.
1818
/// </summary>
1919
public string Template;
20-
21-
/// <summary>
22-
/// Name of the template.
23-
/// </summary>
24-
public string Name;
2520

2621
/// <summary>
2722
/// Keywords found in the template

Editor/Scriptables/TemplateAssetImporter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public override void OnImportAsset(AssetImportContext ctx)
3030
mkr[mk.Count + i] = mki[i].Value;
3131

3232
subAsset.Keywords = mkr.Distinct().ToArray();
33-
subAsset.Name = Path.GetFileNameWithoutExtension(ctx.assetPath);
3433

3534
//Texture2D icon = Resources.Load<Texture2D>("Editor/Icons/Icon");
3635
ctx.AddObjectToAsset("Template", subAsset/*, icon*/);

Editor/Scriptables/TemplateCollectionAssetImporter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ private static void SaveSubAsset(AssetImportContext ctx, TemplateCollectionAsset
6868
var templateAsset = ScriptableObject.CreateInstance<TemplateAsset>();
6969
templateAsset.Template = builder.ToString();
7070
templateAsset.name = name;
71-
templateAsset.Name = name;
7271

7372
MatchCollection mk = Regex.Matches(templateAsset.Template, @"#K#\w*", RegexOptions.Multiline);
7473
MatchCollection mki = Regex.Matches(templateAsset.Template, @"#KI#\w*", RegexOptions.Multiline);

Editor/ShaderGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ private static void AddFreshShaderToList(this Dictionary<TemplateAsset, Template
334334
switch (genericAsset)
335335
{
336336
case TemplateCollectionAsset collection:
337-
template = collection.Templates.FirstOrDefault(x => x.Name.Equals(asset.Name));
337+
template = collection.Templates.FirstOrDefault(x => x.name.Equals(asset.name));
338338
break;
339339
case TemplateAsset t:
340340
template = t;

0 commit comments

Comments
 (0)