Fix object identity APIs for Unity 6.4 and newer (#1136)

* Fix object identity APIs for Unity 6.4 and newer

* Update changelogs

* Update FindObjectUtility to avoid obsolete sorting APIs on Unity 6.4

---------

Co-authored-by: Kurtis <keveleig@qti.qualcomm.com>

Author: gdgeek

org.mixedrealitytoolkit.core/CHANGELOG.md

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ### Fixed
 
 * Fixed "The type `MixedReality.Toolkit.Core MixedReality.Toolkit.Experimental.BubbleChildHoverEvents/TrickleChildHoverEvents/BubbleChildSelectEvents/TrickleChildSelectEvents` is being serialized by `[SerializeReference]`, but is missing the `[Serializable]` attribute." on Unity 6.3. [PR #1107](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1107)
+* Fixed object identity API usages and obsolete sorting warnings for Unity 6.4 and newer in `FindObjectUtility`. [PR #1136](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1136)
 
 ## Deprecated
 

org.mixedrealitytoolkit.core/Utilities/FindObjectUtility.cs

@@ -16,15 +16,17 @@ public static class FindObjectUtility
         /// Returns the first object matching the specified type.
         /// </summary>
         /// <remarks>
-        /// If Unity >= 2021.3.18, calls FindFirstObjectByType. Otherwise calls FindObjectOfType.
+        /// If Unity >= 6000.4, calls FindAnyObjectByType. If Unity >= 2021.3.18, calls FindFirstObjectByType. Otherwise calls FindObjectOfType.
         /// </remarks>
         /// <param name="includeInactive">If true, inactive objects will be included in the search. False by default.</param>
         public static T FindFirstObjectByType<T>(bool includeInactive = false) where T : Component
         {
-#if UNITY_2021_3_18_OR_NEWER
-        return UnityEngine.Object.FindFirstObjectByType<T>(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude);
+#if UNITY_6000_4_OR_NEWER
+            return UnityEngine.Object.FindAnyObjectByType<T>(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude);
+#elif UNITY_2021_3_18_OR_NEWER
+            return UnityEngine.Object.FindFirstObjectByType<T>(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude);
 #else
-        return UnityEngine.Object.FindObjectOfType<T>(includeInactive);
+            return UnityEngine.Object.FindObjectOfType<T>(includeInactive);
 #endif
         }
 
@@ -38,24 +40,26 @@ public static T FindFirstObjectByType<T>(bool includeInactive = false) where T :
         public static T FindAnyObjectByType<T>(bool includeInactive = false) where T : Component
         {
 #if UNITY_2021_3_18_OR_NEWER
-        return UnityEngine.Object.FindAnyObjectByType<T>(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude);
+            return UnityEngine.Object.FindAnyObjectByType<T>(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude);
 #else
-        return UnityEngine.Object.FindObjectOfType<T>(includeInactive);
+            return UnityEngine.Object.FindObjectOfType<T>(includeInactive);
 #endif
         }
 
         /// <summary>
         /// Returns all objects matching the specified type.
         /// </summary>
         /// <remarks>
-        /// If Unity >= 2021.3.18, calls FindObjectsByType. Otherwise calls FindObjectsOfType.
+        /// If Unity >= 6000.4, calls FindObjectsByType without sorting. If Unity >= 2021.3.18, calls FindObjectsByType. Otherwise calls FindObjectsOfType.
         /// </remarks>
         /// <param name="includeInactive">If true, inactive objects will be included in the search. False by default.</param>
-        /// <param name="sort">If false, results will not sorted by InstanceID. True by default.</param>
+        /// <param name="sort">If false, results will not sorted by InstanceID. True by default. Ignored on Unity 6.4 and newer.</param>
         public static T[] FindObjectsByType<T>(bool includeInactive = false, bool sort = true) where T : Component
         {
-#if UNITY_2021_3_18_OR_NEWER
-        return UnityEngine.Object.FindObjectsByType<T>(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude, sort ? FindObjectsSortMode.InstanceID : FindObjectsSortMode.None);
+#if UNITY_6000_4_OR_NEWER
+            return UnityEngine.Object.FindObjectsByType<T>(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude);
+#elif UNITY_2021_3_18_OR_NEWER
+            return UnityEngine.Object.FindObjectsByType<T>(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude, sort ? FindObjectsSortMode.InstanceID : FindObjectsSortMode.None);
 #else
             return UnityEngine.Object.FindObjectsOfType<T>(includeInactive);
 #endif
@@ -65,14 +69,16 @@ public static T[] FindObjectsByType<T>(bool includeInactive = false, bool sort =
         /// Returns all objects matching the specified type.
         /// </summary>
         /// <remarks>
-        /// If Unity >= 2021.3.18, calls FindObjectsByType. Otherwise calls FindObjectsOfType.
+        /// If Unity >= 6000.4, calls FindObjectsByType without sorting. If Unity >= 2021.3.18, calls FindObjectsByType. Otherwise calls FindObjectsOfType.
         /// </remarks>
         /// <param name="includeInactive">If true, inactive objects will be included in the search. False by default.</param>
-        /// <param name="sort">If false, results will not sorted by InstanceID. True by default.</param>
+        /// <param name="sort">If false, results will not sorted by InstanceID. True by default. Ignored on Unity 6.4 and newer.</param>
         /// <param name="type">The type to search for.</param>
         public static UnityEngine.Object[] FindObjectsByType(Type type, bool includeInactive = false, bool sort = true)
         {
-#if UNITY_2021_3_18_OR_NEWER
+#if UNITY_6000_4_OR_NEWER
+            return UnityEngine.Object.FindObjectsByType(type, includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude);
+#elif UNITY_2021_3_18_OR_NEWER
             return UnityEngine.Object.FindObjectsByType(type, includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude, sort ? FindObjectsSortMode.InstanceID : FindObjectsSortMode.None);
 #else
             return UnityEngine.Object.FindObjectsOfType(type, includeInactive);

org.mixedrealitytoolkit.input/CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 * Fixed "leaked managed shell" issue in `InteractionModeManager`. [PR #1096](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1096)
 * Fixed `EyeCalibrationChecker` build issue on UWP when the Mixed Reality OpenXR Plugin wasn't installed. [PR #1106](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1106)
+* Fixed object identity API usages for Unity 6.4 and newer in `InteractionModeManagerEditor`. [PR #1136](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1136)
 
 ## [3.3.0] - 2025-11-12
 

org.mixedrealitytoolkit.input/Editor/Inspectors/InteractionModeManagerEditor.cs

@@ -80,15 +80,24 @@ private HashSet<string> GetDuplicateControllerMappings()
 
             if (entries != null && entries.arraySize > 0)
             {
+#if UNITY_6000_4_OR_NEWER
+                HashSet<EntityId> seenInstanceIDs = new HashSet<EntityId>();
+#else
                 HashSet<int> seenInstanceIDs = new HashSet<int>();
+#endif
 
                 for (int i = 0; i < entries.arraySize; ++i)
                 {
                     SerializedProperty entry = entries.GetArrayElementAtIndex(i);
                     SerializedProperty key = entry.FindPropertyRelative("key");
 
+#if UNITY_6000_4_OR_NEWER
+                    EntityId instanceID = key != null && key.objectReferenceValue != null ?
+                        key.objectReferenceValue.GetEntityId() : EntityId.None;
+#else
                     int instanceID = key != null && key.objectReferenceValue != null ?
                         key.objectReferenceValue.GetInstanceID() : 0;
+#endif
 
                     if (seenInstanceIDs.Contains(instanceID))
                     {

org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md

@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ### Fixed
 
 * Fixed "leaked managed shell" issue in `BoundsCalculator`. [PR #1096](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1096)
+* Fixed object identity API usages for Unity 6.4 and newer in `ConstraintManagerEditor`. [PR #1136](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1136)
 
 ### Changed
 

org.mixedrealitytoolkit.spatialmanipulation/Editor/Constraints/ConstraintManagerEditor.cs

@@ -283,12 +283,16 @@ public override void OnInspectorGUI()
                             break;
                     }
 
-                    // we render the instance id of this component so our highlighting function can distinguish between 
+                    // we render the object id of this component so our highlighting function can distinguish between
                     // the different instances of constraint manager - highlighting in the inspector is currently 
                     // only available for string search which causes problems with multiple components of the same type 
                     // attached to the same GameObject.
                     EditorGUILayout.Space();
+#if UNITY_6000_4_OR_NEWER
+                    EditorGUILayout.LabelField("ComponentId: " + constraintManager.GetEntityId(), EditorStyles.miniLabel);
+#else
                     EditorGUILayout.LabelField("ComponentId: " + constraintManager.GetInstanceID(), EditorStyles.miniLabel);
+#endif
 
                     // deferred delete elements from array to not break unity layout
                     for (int i = indicesToRemove.Count - 1; i > -1; i--)
@@ -370,7 +374,11 @@ public static bool DrawConstraintManagerFoldout(GameObject gameObject, Serialize
                     if (GUILayout.Button("Go to component"))
                     {
                         EditorGUIUtility.PingObject(selectedConstraintManager);
+#if UNITY_6000_4_OR_NEWER
+                        Highlighter.Highlight("Inspector", $"ComponentId: {selectedConstraintManager.GetEntityId()}");
+#else
                         Highlighter.Highlight("Inspector", $"ComponentId: {selectedConstraintManager.GetInstanceID()}");
+#endif
                         GUIUtility.ExitGUI();
                     }
                 }