Fixed generator bug with null LastGeneratedShaders

Cibbi · Cibbi · commit ff752390565e · 2022-02-22T23:43:05.000+01:00
diff --git a/Editor/ShaderGenerator.cs b/Editor/ShaderGenerator.cs
@@ -72,11 +72,14 @@ public static void GenerateShader(string path, ModularShader shader, Action<Stri
             {
                 AssetDatabase.StartAssetEditing();
                 
-                foreach (Shader generatedShader in shader.LastGeneratedShaders.Where(x => x != null))
+                if (shader.LastGeneratedShaders != null)
                 {
-                    string assetPath = AssetDatabase.GetAssetPath(generatedShader);
-                    if(string.IsNullOrWhiteSpace(assetPath))
-                        File.Delete(assetPath);
+                    foreach (Shader generatedShader in shader.LastGeneratedShaders.Where(x => x != null))
+                    {
+                        string assetPath = AssetDatabase.GetAssetPath(generatedShader);
+                        if (string.IsNullOrWhiteSpace(assetPath))
+                            File.Delete(assetPath);
+                    }
                 }
 
                 shader.LastGeneratedShaders = new List<Shader>();

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,14 @@ public static void GenerateShader(string path, ModularShader shader, Action<Stri`
`72`	`72`	`{`
`73`	`73`	`AssetDatabase.StartAssetEditing();`
`74`	`74`
`75`		`- foreach (Shader generatedShader in shader.LastGeneratedShaders.Where(x => x != null))`
	`75`	`+ if (shader.LastGeneratedShaders != null)`
`76`	`76`	`{`
`77`		`- string assetPath = AssetDatabase.GetAssetPath(generatedShader);`
`78`		`- if(string.IsNullOrWhiteSpace(assetPath))`
`79`		`- File.Delete(assetPath);`
	`77`	`+ foreach (Shader generatedShader in shader.LastGeneratedShaders.Where(x => x != null))`
	`78`	`+ {`
	`79`	`+ string assetPath = AssetDatabase.GetAssetPath(generatedShader);`
	`80`	`+ if (string.IsNullOrWhiteSpace(assetPath))`
	`81`	`+ File.Delete(assetPath);`
	`82`	`+ }`
`80`	`83`	`}`
`81`	`84`
`82`	`85`	`shader.LastGeneratedShaders = new List<Shader>();`