File tree Expand file tree Collapse file tree 2 files changed +3
-1
lines changed
Assets/Tests/InputSystem/Plugins
Packages/com.unity.inputsystem/InputSystem/Actions Expand file tree Collapse file tree 2 files changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -1793,13 +1793,15 @@ public IEnumerator UI_CanReleaseAndPressTouchesOnSameFrame()
17931793 . Matches ( ( UICallbackReceiver . Event e ) => e . pointerData . pointerType == UIPointerType . Touch ) . And
17941794 . Matches ( ( UICallbackReceiver . Event e ) => e . pointerData . position == secondPosition ) ) ;
17951795
1796+ #if UNITY_2021_2_OR_NEWER
17961797 Assert . That ( scene . rightChildReceiver . events ,
17971798 Has . Exactly ( 1 ) . With . Property ( "type" ) . EqualTo ( EventType . PointerMove ) . And
17981799 . Matches ( ( UICallbackReceiver . Event e ) => e . pointerData . device == touchScreen ) . And
17991800 . Matches ( ( UICallbackReceiver . Event e ) => e . pointerData . touchId == 2 ) . And
18001801 . Matches ( ( UICallbackReceiver . Event e ) => e . pointerData . pointerId == pointerIdTouch2 ) . And
18011802 . Matches ( ( UICallbackReceiver . Event e ) => e . pointerData . pointerType == UIPointerType . Touch ) . And
18021803 . Matches ( ( UICallbackReceiver . Event e ) => e . pointerData . position == secondPosition ) ) ;
1804+ #endif
18031805
18041806 // Pointer 3
18051807 Assert . That ( scene . rightChildReceiver . events ,
Original file line number Diff line number Diff line change @@ -1305,7 +1305,7 @@ internal bool ResolveBindingsIfNecessary()
13051305 /// </remarks>
13061306 internal void ResolveBindings ( )
13071307 {
1308- // using (k_ResolveBindingsProfilerMarker.Auto())
1308+ using ( k_ResolveBindingsProfilerMarker . Auto ( ) )
13091309 {
13101310 // Make sure that if we trigger callbacks as part of disabling and re-enabling actions,
13111311 // we don't trigger a re-resolve while we're already resolving bindings.
You can’t perform that action at this time.
0 commit comments