From 1e1c56cf65cabae1d2516e79707b1b23627872d9 Mon Sep 17 00:00:00 2001 From: Trudy Spiller Date: Fri, 6 Dec 2024 11:39:45 +0000 Subject: [PATCH 1/2] Provide explicit selected device requirement index for a new control scheme with no devices --- .../Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs index 3dfa009b1b..33d186f8a3 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs @@ -18,7 +18,7 @@ public static Command AddNewControlScheme() { state.m_Analytics?.RegisterControlSchemeEdit(); return state.With(selectedControlScheme: new InputControlScheme( - MakeUniqueControlSchemeName(state, kNewControlSchemeName))); + MakeUniqueControlSchemeName(state, kNewControlSchemeName)), selectedDeviceRequirementIndex: -1); }; } From e9ad9b0fbfd3d6a829140e6881bf3bc58776c342 Mon Sep 17 00:00:00 2001 From: Trudy Spiller Date: Fri, 6 Dec 2024 11:47:30 +0000 Subject: [PATCH 2/2] Update CHANGELOG.md --- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 865e7ba999..9fa27599f6 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -30,6 +30,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed tooltip support in the UI Toolkit version of the Input Actions Asset editor. - Fixed documentation to clarify bindings with modifiers `overrideModifiersNeedToBePressedFirst` configuration [ISXB-806](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-806). - Fixed an issue in `Samples/Visualizers/GamepadVisualizer.unity` sample where the visualization wouldn't handle device disconnects or current device changes properly (ISXB-1243). +- Fixed an issue with default device selection when adding new Control Scheme. ### Changed - Added back the InputManager to InputSystem project-wide asset migration code with performance improvement (ISX-2086).