Merge pull request #152 from nnra6864/6.5-fixes

6.5 Fixes

Author: arimger

Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs

@@ -1,24 +1,42 @@
 using System;
 using System.Collections.Generic;
 
+// NOTE: Needed for EntityId
+#if UNITY_6000_4_OR_NEWER
+using UnityEngine;
+#endif
+
 namespace Toolbox.Editor
 {
     using Editor = UnityEditor.Editor;
     using Object = UnityEngine.Object;
 
     public static class ToolboxEditorHandler
     {
+#if UNITY_6000_4_OR_NEWER
+        private static EntityId lastCachedEditorId;
+#else
         private static int lastCachedEditorId;
+#endif
         private static Editor lastCachedEditor;
         private static readonly Stack<Editor> cachedEditors = new Stack<Editor>();
 
         private static void OnBeginEditor(Editor editor)
         {
             //NOTE: it means that last Editor was null or disposed, anyway we probably want to reload drawers-related cache
-            if (lastCachedEditor == null || lastCachedEditorId != lastCachedEditor.GetInstanceID())
+#if UNITY_6000_4_OR_NEWER
+            var lastId = lastCachedEditor.GetEntityId();
+#else
+            var lastId = lastCachedEditor.GetInstanceID();
+#endif
+            if (lastCachedEditor == null || lastCachedEditorId != lastId)
             {
                 lastCachedEditor = editor;
+#if UNITY_6000_4_OR_NEWER
+                lastCachedEditorId = editor.GetEntityId();
+#else
                 lastCachedEditorId = editor.GetInstanceID();
+#endif
                 OnEditorReload?.Invoke();
             }
 

Assets/Editor Toolbox/Editor/ToolboxEditorHierarchy.cs

@@ -26,8 +26,13 @@ internal enum LabelType
 
         static ToolboxEditorHierarchy()
         {
+#if UNITY_6000_4_OR_NEWER
+            EditorApplication.hierarchyWindowItemByEntityIdOnGUI -= OnItemCallback;
+            EditorApplication.hierarchyWindowItemByEntityIdOnGUI += OnItemCallback;
+#else
             EditorApplication.hierarchyWindowItemOnGUI -= OnItemCallback;
             EditorApplication.hierarchyWindowItemOnGUI += OnItemCallback;
+#endif
         }
 
         /// <summary>
@@ -38,7 +43,11 @@ static ToolboxEditorHierarchy()
         /// <summary>
         /// Tries to display item label in the Hierarchy Window.
         /// </summary>
+#if UNITY_6000_4_OR_NEWER
+        private static void OnItemCallback(EntityId instanceId, Rect rect)
+#else
         private static void OnItemCallback(int instanceId, Rect rect)
+#endif
         {
             if (!IsOverlayAllowed)
             {