[UUM-98657] Fix missing SG icons during initial asset name entry

Author: dhsavell

Packages/com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderSubGraph.cs

@@ -10,7 +10,7 @@ class CreateShaderSubGraph : EndNameEditAction
         public static void CreateMaterialSubGraph()
         {
             ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, CreateInstance<CreateShaderSubGraph>(),
-                string.Format("New Shader Sub Graph.{0}", ShaderSubGraphImporter.Extension), null, null);
+                string.Format("New Shader Sub Graph.{0}", ShaderSubGraphImporter.Extension), ShaderSubGraphImporter.GetIcon(), null);
         }
 
         public override void Action(int instanceId, string pathName, string resourceFile)

Packages/com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs

@@ -188,7 +188,7 @@ public static void CreateNewGraph()
             var graphItem = ScriptableObject.CreateInstance<NewGraphAction>();
             graphItem.targets = null;
             ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, graphItem,
-                string.Format("New Shader Graph.{0}", ShaderGraphImporter.Extension), null, null);
+                string.Format("New Shader Graph.{0}", ShaderGraphImporter.Extension), ShaderGraphImporter.GetIcon(), null);
         }
 
         public static void CreateNewGraphWithOutputs(Target[] targets, BlockFieldDescriptor[] blockDescriptors)
@@ -197,7 +197,7 @@ public static void CreateNewGraphWithOutputs(Target[] targets, BlockFieldDescrip
             graphItem.targets = targets;
             graphItem.blocks = blockDescriptors;
             ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, graphItem,
-                string.Format("New Shader Graph.{0}", ShaderGraphImporter.Extension), null, null);
+                string.Format("New Shader Graph.{0}", ShaderGraphImporter.Extension), ShaderGraphImporter.GetIcon(), null);
         }
 
         public static bool TryGetMetadataOfType<T>(this Shader shader, out T obj) where T : ScriptableObject

Packages/com.unity.shadergraph/Editor/Importers/ShaderGraphImporter.cs

@@ -64,6 +64,8 @@ fixed4 frag (v2f i) : SV_Target
     Fallback Off
 }";
 
+        public static Texture2D GetIcon() => EditorGUIUtility.IconContent(IconBasePath)?.image as Texture2D;
+
         [SuppressMessage("ReSharper", "UnusedMember.Local")]
         static string[] GatherDependenciesFromSourceFile(string assetPath)
         {
@@ -237,11 +239,7 @@ public override void OnImportAsset(AssetImportContext ctx)
                 mainObject = ShaderUtil.CreateShaderAsset(ctx, k_ErrorShader, false);
             }
 
-            if (EditorGUIUtility.IconContent(IconBasePath)?.image is Texture2D icon)
-            {
-                ctx.AddObjectToAsset("MainAsset", mainObject, icon);
-            }
-
+            ctx.AddObjectToAsset("MainAsset", mainObject, GetIcon());
             ctx.SetMainObject(mainObject);
 
             var graphDataReadOnly = new GraphDataReadOnly(graph);

Packages/com.unity.shadergraph/Editor/Importers/ShaderSubGraphImporter.cs

@@ -25,6 +25,8 @@ class ShaderSubGraphImporter : ScriptedImporter
         public const string Extension = "shadersubgraph";
         const string IconBasePath = "Packages/com.unity.shadergraph/Editor/Resources/Icons/sg_subgraph_icon.png";
 
+        public static Texture2D GetIcon() => EditorGUIUtility.IconContent(IconBasePath)?.image as Texture2D;
+
         [SuppressMessage("ReSharper", "UnusedMember.Local")]
         static string[] GatherDependenciesFromSourceFile(string assetPath)
         {
@@ -113,11 +115,7 @@ public override void OnImportAsset(AssetImportContext ctx)
                 messageManager.ClearAll();
             }
 
-            if (EditorGUIUtility.IconContent(IconBasePath)?.image is Texture2D icon)
-            {
-                ctx.AddObjectToAsset("MainAsset", graphAsset, icon);
-            }
-
+            ctx.AddObjectToAsset("MainAsset", graphAsset, GetIcon());
             ctx.SetMainObject(graphAsset);
 
             var metadata = ScriptableObject.CreateInstance<ShaderSubGraphMetadata>();