Merge branch 'develop' into isxb-1208-InvalidOperation-enter-playmode

Author: smnwttbr

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -12,6 +12,11 @@ however, it has to be formatted properly to pass verification tests.
 ### Fixed
 - Fixed an issue causing InvalidOperationException when entering playmode with domain reload disabled. [ISXB-1208](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1208).
 
+### Fixed
+- Fixed an issue where the prompt to enable the InputSystem backends would interrupt the import of large assets.
+- Fixed Cut Mode for Action Maps and Actions to make renaming disabled. [ISXB-1155](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1155)
+
+
 ## [1.12.0] - 2025-01-15
 
 ### Fixed

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs

@@ -32,6 +32,7 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
                 treeViewItem.EditTextFinished += treeViewItem.EditTextFinishedCallback;
                 treeViewItem.userData = i;
                 element.SetEnabled(!mapData.isDisabled);
+                treeViewItem.isDisabledActionMap = mapData.isDisabled;
 
                 ContextMenu.GetContextMenuForActionMapItem(this, treeViewItem, i);
             };

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs

@@ -94,6 +94,7 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
                             EditorInputControlLayoutCache.GetIconForLayout("Control"));
 
                 e.SetEnabled(!item.isCut);
+                treeViewItem.isCut = item.isCut;
             };
 
             m_ActionsTreeView.itemsChosen += objects =>

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionMapsTreeViewItem.cs

@@ -26,6 +26,8 @@ internal class InputActionMapsTreeViewItem : VisualElement
         private bool m_IsEditing;
         private static InputActionMapsTreeViewItem s_EditingItem = null;
 
+        internal bool isDisabledActionMap { get; set; }
+
         public InputActionMapsTreeViewItem()
         {
             var template = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
@@ -98,7 +100,7 @@ public void Reset()
 
         public void FocusOnRenameTextField()
         {
-            if (m_IsEditing)
+            if (m_IsEditing || isDisabledActionMap)
                 return;
             delegatesFocus = true;
 

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs

@@ -20,6 +20,8 @@ internal class InputActionsTreeViewItem : VisualElement
         private bool m_IsEditing;
         private static InputActionsTreeViewItem s_EditingItem = null;
 
+        internal bool isCut { get; set; }
+
         public InputActionsTreeViewItem()
         {
             var template = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
@@ -42,7 +44,6 @@ public InputActionsTreeViewItem()
         public Label label => this.Q<Label>();
         private TextField renameTextfield => this.Q<TextField>(kRenameTextField);
 
-
         public void UnregisterInputField()
         {
             renameTextfield.SetEnabled(false);
@@ -77,7 +78,7 @@ public void Reset()
 
         public void FocusOnRenameTextField()
         {
-            if (m_IsEditing)
+            if (m_IsEditing || isCut)
                 return;
             delegatesFocus = true;
 

Packages/com.unity.inputsystem/InputSystem/InputSystem.cs

@@ -3599,14 +3599,29 @@ internal static void InitializeInEditor(IInputRuntime runtime = null)
             }
 
             Debug.Assert(settings != null);
-            #if UNITY_EDITOR
             Debug.Assert(EditorUtility.InstanceIDToObject(settings.GetInstanceID()) != null,
                 "InputSettings has lost its native object");
-            #endif
 
             // If native backends for new input system aren't enabled, ask user whether we should
             // enable them (requires restart). We only ask once per session and don't ask when
             // running in batch mode.
+            // The warning is delayed to delay call (called a short while after the Asset are loaded, on Inspector update) to make sure it doesn't pop up while the editor is still loading or assets are not fully loaded -
+            // this would cancel the import of large assets that are dependent on the InputSystem package and import it as a dependency.
+            EditorApplication.delayCall += ShowRestartWarning;
+
+#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
+            // Make sure project wide input actions are enabled.
+            // Note that this will always fail if entering play-mode within editor since not yet in play-mode.
+            EnableActions();
+#endif
+
+            RunInitialUpdate();
+
+            k_InputInitializeInEditorMarker.End();
+        }
+
+        private static void ShowRestartWarning()
+        {
             if (!s_SystemObject.newInputBackendsCheckedAsEnabled &&
                 !EditorPlayerSettingHelpers.newSystemBackendsEnabled &&
                 !s_Manager.m_Runtime.isInBatchMode)
@@ -3622,16 +3637,7 @@ internal static void InitializeInEditor(IInputRuntime runtime = null)
                 }
             }
             s_SystemObject.newInputBackendsCheckedAsEnabled = true;
-
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
-            // Make sure project wide input actions are enabled.
-            // Note that this will always fail if entering play-mode within editor since not yet in play-mode.
-            EnableActions();
-#endif
-
-            RunInitialUpdate();
-
-            k_InputInitializeInEditorMarker.End();
+            EditorApplication.delayCall -= ShowRestartWarning;
         }
 
         internal static void OnPlayModeChange(PlayModeStateChange change)