Merge pull request #716 from ThomasAunvik/origin/fixes/ui/node-icon-file

Icons not showing DefaultAsset Icon

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs

@@ -90,7 +90,6 @@ class Styles
                                  favoriteIconOff,
                                  smallLogoIcon,
                                  bigLogoIcon,
-                                 defaultAssetIcon,
                                  folderIcon,
                                  mergeIcon,
                                  dotIcon,
@@ -784,19 +783,6 @@ public static Texture2D LocalCommitIcon
             }
         }
 
-        public static Texture2D DefaultAssetIcon
-        {
-            get
-            {
-                if (defaultAssetIcon == null)
-                {
-                    defaultAssetIcon = EditorGUIUtility.FindTexture("DefaultAsset Icon");
-                }
-
-                return defaultAssetIcon;
-            }
-        }
-
         public static Texture2D FolderIcon
         {
             get

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesTreeControl.cs

@@ -163,17 +163,13 @@ protected Texture GetNodeIcon(ChangesTreeNode node)
             {
                 if (!string.IsNullOrEmpty(node.ProjectPath))
                 {
-                    nodeIcon = AssetDatabase.GetCachedIcon(node.ProjectPath);
+                    nodeIcon = UnityEditorInternal.InternalEditorUtility.GetIconForFile(node.ProjectPath);
                 }
 
                 if (nodeIcon != null)
                 {
                     nodeIcon.hideFlags = HideFlags.HideAndDontSave;
                 }
-                else
-                {
-                    nodeIcon = Styles.DefaultAssetIcon;
-                }
             }
 
             return nodeIcon;