Fix EntityLinkHierarchyIcon #843

sschmid · Dec 15, 2018 · 732251f · 732251f
1 parent da2ce12
commit 732251f
Show file tree

Hide file tree

Showing 11 changed files with 512 additions and 89 deletions.
diff --git a/Addons/Entitas.Unity.Editor/Entitas.Unity.Editor/Images/EntitasHeader.png.meta b/Addons/Entitas.Unity.Editor/Entitas.Unity.Editor/Images/EntitasHeader.png.meta
diff --git a/...VisualDebugging.Unity.Editor/Entitas.VisualDebugging.Unity.Editor/EntitasHierarchyIcon.cs b/...VisualDebugging.Unity.Editor/Entitas.VisualDebugging.Unity.Editor/EntitasHierarchyIcon.cs
@@ -60,6 +60,16 @@ static Texture2D entityLinkHierarchyIcon {
             }
         }
 
+        static Texture2D entityLinkWarnHierarchyIcon {
+            get {
+                if (_entityLinkWarnHierarchyIcon == null)
+                {
+                    _entityLinkWarnHierarchyIcon = EditorLayout.LoadTexture("l:EntitasEntityLinkWarnHierarchyIcon");
+                }
+                return _entityLinkWarnHierarchyIcon;
+            }
+        }
+
         static Texture2D systemsHierarchyIcon {
             get {
                 if (_systemsHierarchyIcon == null)
@@ -85,6 +95,7 @@ static Texture2D systemsErrorHierarchyIcon {
         static Texture2D _entityHierarchyIcon;
         static Texture2D _entityErrorHierarchyIcon;
         static Texture2D _entityLinkHierarchyIcon;
+        static Texture2D _entityLinkWarnHierarchyIcon;
         static Texture2D _systemsHierarchyIcon;
         static Texture2D _systemsErrorHierarchyIcon;
 
@@ -148,13 +159,13 @@ static void onHierarchyWindowItemOnGUI(int instanceID, Rect selectionRect)
                 var entityLink = gameObject.GetComponent<EntityLink>();
                 if (entityLink != null)
                 {
-                    if (entityLink.entity.isEnabled)
+                    if (entityLink.entity != null)
                     {
                         GUI.DrawTexture(rect, entityLinkHierarchyIcon);
                     }
                     else
                     {
-                        GUI.DrawTexture(rect, entityLinkHierarchyIcon);
+                        GUI.DrawTexture(rect, entityLinkWarnHierarchyIcon);
                     }
 
                     return;

diff --git a/...tor/Entitas.VisualDebugging.Unity.Editor/Images/EntitasContextErrorHierarchyIcon.png.meta b/...tor/Entitas.VisualDebugging.Unity.Editor/Images/EntitasContextErrorHierarchyIcon.png.meta