diff --git a/Packages/com.unity.inputsystem/InputSystem/Events.meta b/Packages/com.unity.inputsystem/InputSystem/Events.meta new file mode 100644 index 0000000000..ac4e5eafe1 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Events.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7653f3316f1255f42819d4c8e02e98e7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins.meta b/Packages/com.unity.inputsystem/InputSystem/Plugins.meta new file mode 100644 index 0000000000..d1fe91e0ee --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 401d8983eba242f4c8e016b7e5dfeac0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI.meta b/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI.meta new file mode 100644 index 0000000000..584acef0d5 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 76374aa5e9f191540a1797e8f126fdd9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI.meta b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI.meta new file mode 100644 index 0000000000..088b63af06 --- /dev/null +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 88c00e8fa621c954e90c4f237222e75c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/EnhancedTouch/Touch.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/EnhancedTouch/Touch.cs index 67dd61cc1d..0a2ba28b15 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/EnhancedTouch/Touch.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/EnhancedTouch/Touch.cs @@ -772,6 +772,14 @@ internal struct FingerAndTouchState public void AddFingers(Touchscreen screen) { + // The global touch state may have been reset after EnhancedTouchSupport.Enable() subscribed to device changes. + // A device added through that stale subscription would build a Finger with a None mask, which InputStateHistory.updateMask rejects. + // Skip until the state is set up again. + if (updateMask == InputUpdateType.None) + { + return; + } + var touchCount = screen.touches.Count; ArrayHelpers.EnsureCapacity(ref fingers, totalFingerCount, touchCount); for (var i = 0; i < touchCount; ++i) diff --git a/Packages/manifest.json b/Packages/manifest.json index e4e79f7c35..2f5c250d9b 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -7,6 +7,7 @@ "com.unity.ide.rider": "3.0.39", "com.unity.ide.visualstudio": "2.0.27", "com.unity.multiplayer.center": "1.0.0", + "com.unity.pipeline": "0.4.0-exp.1", "com.unity.render-pipelines.universal": "17.0.4", "com.unity.settings-manager": "2.1.0", "com.unity.test-framework": "1.6.0",