Skip to content

Commit 97b41f9

Browse files
committed
Merge branch 'ekcoh/rebinding-issues-events' of github.com:Unity-Technologies/InputSystem into ekcoh/rebinding-issues-events
2 parents c39c1c0 + 3dfda93 commit 97b41f9

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

Packages/com.unity.inputsystem/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ however, it has to be formatted properly to pass verification tests.
2525
- Fixed Inspector Window being refreshed all the time when a PlayerInput component is present with Invoke Unity Events nofication mode chosen [ISXB-1448](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1448)
2626
- Fixed an issue where an action with a name containing a slash "/" could not be found via `InputActionAsset.FindAction(string,bool)`. [ISXB-1306](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1306).
2727
- Fixed Gamepad stick up/down inputs that were not recognized in WebGL. [ISXB-1090](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1090)
28+
- Fixed PlayerInput component automatically switching away from the default ActionMap set to 'None'.
29+
- Fixed a console error being shown when targeting visionOS builds in 2022.3.
2830
- Fixed an issue in `RebindingUISample` that fired actions bound to the same control as the target control in a rebinding process. ISXB-1524.
2931

3032
## [1.14.0] - 2025-03-20

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private static void CheckForExtension()
4040
#if UNITY_2022_1_OR_NEWER
4141
BuildTarget.QNX,
4242
#endif
43-
#if UNITY_2023_3_OR_NEWER
43+
#if UNITY_2022_3_OR_NEWER
4444
BuildTarget.VisionOS,
4545
#endif
4646
(BuildTarget)49,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ void AddEntry(InputAction action, PlayerInput.ActionEvent actionEvent)
551551
var selectedDefaultActionMap = !string.IsNullOrEmpty(playerInput.defaultActionMap)
552552
? asset.FindActionMap(playerInput.defaultActionMap)
553553
: null;
554-
m_SelectedDefaultActionMap = asset.actionMaps.Count > 0 ? 1 : 0;
554+
m_SelectedDefaultActionMap = (asset.actionMaps.Count > 0 && m_SelectedDefaultActionMap == -1) ? 1 : 0;
555555
var actionMaps = asset.actionMaps;
556556
m_ActionMapOptions = new GUIContent[actionMaps.Count + 1];
557557
m_ActionMapOptions[0] = new GUIContent(EditorGUIUtility.TrTextContent("<None>"));

0 commit comments

Comments
 (0)