Skip to content

Commit 4412578

Browse files
stefanunitystefanunity
committed
Merge branch 'develop' into stable
2 parents dc62f2e + 52bc149 commit 4412578

File tree

12 files changed

+18
-10
lines changed

12 files changed

+18
-10
lines changed

‎Assets/Samples/InGameHints/InGameHintsActions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
4-
// version 1.8.0
4+
// version 1.8.1
55
// from Assets/Samples/InGameHints/InGameHintsActions.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Assets/Samples/SimpleDemo/SimpleControls.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
4-
// version 1.8.0
4+
// version 1.8.1
55
// from Assets/Samples/SimpleDemo/SimpleControls.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
4-
// version 1.8.0
4+
// version 1.8.1
55
// from Assets/Tests/InputSystem/InputActionCodeGeneratorActions.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Packages/com.unity.inputsystem/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
88
Due to package verification, the latest version below is the unpublished version and the date is meaningless.
99
however, it has to be formatted properly to pass verification tests.
1010

11+
## [1.8.1] - 2024-03-14
12+
13+
### Fixed
14+
- NullReferenceException thrown when editing a binding path in InputActionAsset windows.
15+
1116
## [1.8.0] - 2024-03-12
1217

1318
### Changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static partial class InputSystem
1515
// Keep this in sync with "Packages/com.unity.inputsystem/package.json".
1616
// NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include
1717
// "-preview" suffixes here.
18-
internal const string kAssemblyVersion = "1.8.0";
18+
internal const string kAssemblyVersion = "1.8.1";
1919
internal const string kDocUrl = "https://docs.unity3d.com/Packages/[email protected]";
2020
}
2121
}

‎Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
4-
// version 1.8.0
4+
// version 1.8.1
55
// from "Keyboard" layout
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
4-
// version 1.8.0
4+
// version 1.8.1
55
// from "Mouse" layout
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
4-
// version 1.8.0
4+
// version 1.8.1
55
// from "Touchscreen" layout
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ void SaveAssetOnFocusLost()
112112

113113
public static void SetIMGUIDropdownVisible(bool visible, bool optionWasSelected)
114114
{
115+
if (m_ActiveSettingsProvider == null)
116+
return;
117+
115118
// If we selected an item from the dropdown, we *should* still be focused on this settings window - but
116119
// since the IMGUI dropdown is technically a separate window, we have to refocus manually.
117120
//

‎Packages/com.unity.inputsystem/LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Input System © 2023 Unity Technologies
1+
Input System © 2024 Unity Technologies
22

33
Licensed under the Unity Companion License for Unity-dependent projects (see [https://unity3d.com/legal/licenses/unity_companion_license](https://unity3d.com/legal/licenses/unity_companion_license)).
44

0 commit comments

Comments
 (0)