Merge branch 'develop' into stable

Unity-Technologies · Mar 14, 2024 · 4412578 · 4412578
2 parents dc62f2e + 52bc149
commit 4412578
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 10 deletions.
diff --git a/Assets/Samples/InGameHints/InGameHintsActions.cs b/Assets/Samples/InGameHints/InGameHintsActions.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.8.0
+//     version 1.8.1
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

diff --git a/Assets/Samples/SimpleDemo/SimpleControls.cs b/Assets/Samples/SimpleDemo/SimpleControls.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.8.0
+//     version 1.8.1
 //     from Assets/Samples/SimpleDemo/SimpleControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

diff --git a/Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs b/Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.8.0
+//     version 1.8.1
 //     from Assets/Tests/InputSystem/InputActionCodeGeneratorActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 Due to package verification, the latest version below is the unpublished version and the date is meaningless.
 however, it has to be formatted properly to pass verification tests.
 
+## [1.8.1] - 2024-03-14
+
+### Fixed
+- NullReferenceException thrown when editing a binding path in InputActionAsset windows.
+
 ## [1.8.0] - 2024-03-12
 
 ### Changed

diff --git a/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs b/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs
@@ -15,7 +15,7 @@ public static partial class InputSystem
         // Keep this in sync with "Packages/com.unity.inputsystem/package.json".
         // NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include
         //       "-preview" suffixes here.
-        internal const string kAssemblyVersion = "1.8.0";
+        internal const string kAssemblyVersion = "1.8.1";
         internal const string kDocUrl = "https://docs.unity3d.com/Packages/[email protected]";
     }
 }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
-//     version 1.8.0
+//     version 1.8.1
 //     from "Keyboard" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
-//     version 1.8.0
+//     version 1.8.1
 //     from "Mouse" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
-//     version 1.8.0
+//     version 1.8.1
 //     from "Touchscreen" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

diff --git a/...nity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs b/...nity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs
@@ -112,6 +112,9 @@ void SaveAssetOnFocusLost()
 
         public static void SetIMGUIDropdownVisible(bool visible, bool optionWasSelected)
         {
+            if (m_ActiveSettingsProvider == null)
+                return;
+
             // If we selected an item from the dropdown, we *should* still be focused on this settings window - but
             // since the IMGUI dropdown is technically a separate window, we have to refocus manually.
             //

diff --git a/Packages/com.unity.inputsystem/LICENSE.md b/Packages/com.unity.inputsystem/LICENSE.md
@@ -1,4 +1,4 @@
-Input System © 2023 Unity Technologies
+Input System © 2024 Unity Technologies
 
 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)).
 

diff --git a/Packages/com.unity.inputsystem/Tests/TestFixture/AssemblyInfo.cs b/Packages/com.unity.inputsystem/Tests/TestFixture/AssemblyInfo.cs
@@ -4,7 +4,7 @@
 // Keep this in sync with "Packages/com.unity.inputsystem/package.json".
 // NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include
 //       "-preview" suffixes here.
-[assembly: AssemblyVersion("1.8.0")]
+[assembly: AssemblyVersion("1.8.1")]
 [assembly: InternalsVisibleTo("Unity.InputSystem.Tests.Editor")]
 [assembly: InternalsVisibleTo("Unity.InputSystem.Tests")]
 [assembly: InternalsVisibleTo("Unity.InputSystem.IntegrationTests")]
diff --git a/Packages/com.unity.inputsystem/package.json b/Packages/com.unity.inputsystem/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "com.unity.inputsystem",
 	"displayName": "Input System",
-	"version": "1.8.0",
+	"version": "1.8.1",
 	"unity": "2019.4",
 	"description": "A new input system which can be used as a more extensible and customizable alternative to Unity's classic input system in UnityEngine.Input.",
 	"keywords": [