CHANGE: Update from InstanceID to EntityId in PlayerInputEditor.cs (#2325)

Author: josepmariapujol-unity

Assets/Editor/DumpInputActionReferences.cs

@@ -19,8 +19,10 @@ private static void DumpReferences(StringBuilder sb, string prefix, InputActionR
     private static void DumpReferences()
     {
         var sb = new StringBuilder();
+#pragma warning disable CS0618 // Type or member is obsolete
         DumpReferences(sb, "Loaded objects", Object.FindObjectsByType<InputActionReference>(
             FindObjectsInactive.Include, FindObjectsSortMode.InstanceID));
+#pragma warning restore CS0618 // Type or member is obsolete
         DumpReferences(sb, "All objects:", Resources.FindObjectsOfTypeAll<InputActionReference>());
         Debug.Log(sb.ToString());
     }

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -11,12 +11,13 @@ however, it has to be formatted properly to pass verification tests.
 ## [Unreleased] - yyyy-mm-dd
 
 ### Changed
-- Consecutive wildcard characters ('*') used in input control-paths are now collapsed into a single wildcard when multiple consecutive wildcard characters are present.
 
-### Added
+- Updated `m_ActionAssetInstanceID` in PlayerInputEditor.cs to use `EntityId` instead of `InstanceID`.
+- Consecutive wildcard characters ('*') used in input control-paths are now collapsed into a single wildcard when multiple consecutive wildcard characters are present.
 
 ### Fixed
 
+### Added
 
 ## [1.18.0] - 2026-01-14
 

Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs

@@ -97,7 +97,11 @@ public override void OnInspectorGUI()
 
             var assetChanged = CheckIfActionAssetChanged();
             // initialize the editor component if the asset has changed or if it has not been initialized yet
+#if UNITY_6000_4_OR_NEWER
+            if (EditorGUI.EndChangeCheck() || !m_ActionAssetInitialized || assetChanged || m_ActionAssetEntityId == EntityId.None)
+#else
             if (EditorGUI.EndChangeCheck() || !m_ActionAssetInitialized || assetChanged || m_ActionAssetInstanceID == 0)
+#endif
             {
                 InitializeEditorComponent(assetChanged);
                 actionsWereChanged = true;
@@ -276,26 +280,22 @@ public override void OnInspectorGUI()
         // One such case is when the user triggers a "Reset" on the component.
         bool CheckIfActionAssetChanged()
         {
-            if (m_ActionsProperty.objectReferenceValue != null)
-            {
-                // 6.4 deprecates instance id in favour of entity ids (a class)
-                // Fortunately, there is an implicit cast from entity id to an integer so we can have minimum footprint for now.
-                int assetInstanceID;
-
-                #if UNITY_6000_4_OR_NEWER
-                assetInstanceID = m_ActionsProperty.objectReferenceValue.GetEntityId();
-                #else
-                assetInstanceID = m_ActionsProperty.objectReferenceValue.GetInstanceID();
-                #endif
-
-                // if the m_ActionAssetInstanceID is 0 the PlayerInputEditor has not been initialized yet, but the asset did not change
-                bool result = assetInstanceID != m_ActionAssetInstanceID && m_ActionAssetInstanceID != 0;
-                m_ActionAssetInstanceID = (int)assetInstanceID;
-                return result;
-            }
-
-            m_ActionAssetInstanceID = -1;
-            return false;
+            var obj = m_ActionsProperty.objectReferenceValue;
+            if (obj == null)
+                return false;
+
+#if UNITY_6000_4_OR_NEWER
+            EntityId assetEntityId = obj.GetEntityId();
+            bool result = assetEntityId != m_ActionAssetEntityId && m_ActionAssetEntityId != EntityId.None;
+            m_ActionAssetEntityId = assetEntityId;
+            return result;
+#else
+            int assetInstanceID = obj.GetInstanceID();
+            // if the m_ActionAssetInstanceID is 0 the PlayerInputEditor has not been initialized yet, but the asset did not change
+            bool result = assetInstanceID != m_ActionAssetInstanceID && m_ActionAssetInstanceID != 0;
+            m_ActionAssetInstanceID = (int)assetInstanceID;
+            return result;
+#endif
         }
 
         private void DoHelpCreateAssetUI()
@@ -656,7 +656,11 @@ void AddEntry(InputAction action, PlayerInput.ActionEvent actionEvent)
 
         [NonSerialized] private bool m_NotificationBehaviorInitialized;
         [NonSerialized] private bool m_ActionAssetInitialized;
+#if UNITY_6000_4_OR_NEWER
+        [NonSerialized] private EntityId m_ActionAssetEntityId;
+#else
         [NonSerialized] private int m_ActionAssetInstanceID;
+#endif
     }
 }
 #endif // UNITY_EDITOR