Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .yamato/upm-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ build_ios_{{ editor.version }}_{{ category.name }}:
flavor: b1.large
variables:
EDITOR_VERSION: {{ editor.version }}
UTR_VERSION: 1.35.1
commands:
- {{ utr_install_nix }}
- {{ unity_downloader_install }}
Expand Down Expand Up @@ -170,6 +171,7 @@ build_tvos_{{ editor.version }}_{{ category.name }}:
flavor: b1.large
variables:
EDITOR_VERSION: {{ editor.version }}
UTR_VERSION: 1.35.1
commands:
- {{ utr_install_nix }}
- {{ unity_downloader_install }}
Expand Down
1 change: 1 addition & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ however, it has to be formatted properly to pass verification tests.
- 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).
- Fixed Gamepad stick up/down inputs that were not recognized in WebGL. [ISXB-1090](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1090)
- Fixed reenabling the VirtualMouseInput component may sometimes lead to NullReferenceException. [ISXB-1096](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1096)
- Fixed the default button press point not being respected in Editor (as well as some other Touchscreen properties). [ISXB-1152](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1152)
- Fixed PlayerInput component automatically switching away from the default ActionMap set to 'None'.
- Fixed a console error being shown when targeting visionOS builds in 2022.3.
- Fixed a Tap Interaction issue with analog controls. The Tap interaction would keep re-starting after timeout. [ISXB-627](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-627)
Expand Down
3 changes: 2 additions & 1 deletion Packages/com.unity.inputsystem/InputSystem/InputManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4122,7 +4122,8 @@ internal void RestoreStateWithoutDevices(SerializedState state)

if (m_Settings != null)
Object.DestroyImmediate(m_Settings);
m_Settings = state.settings;

settings = state.settings;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the theory here is that using the property instead of a direct setter makes sure we update all the derived data (static caches) -- that happens in ApplySettings that is ignored in here.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good catch, since the property setter triggers the apply settings.


#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
// Note that we just reassign actions and never destroy them since always mapped to persisted asset
Expand Down
2 changes: 1 addition & 1 deletion Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3878,7 +3878,7 @@ private static void Reset(bool enableRemoting = false, IInputRuntime runtime = n
s_Manager.UninstallGlobals();
}

// Create temporary settings. In the tests, this is all we need. But outside of tests,d
// Create temporary settings. In the tests, this is all we need. But outside of tests,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Always good to fix a typo.

// this should get replaced with an actual InputSettings asset.
var settings = ScriptableObject.CreateInstance<InputSettings>();
settings.hideFlags = HideFlags.HideAndDontSave;
Expand Down