Skip to content

Commit e9658cc

Browse files
committed
fix compilation errors on 2022.1
1 parent 4777c94 commit e9658cc

41 files changed

Lines changed: 43 additions & 43 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Assets/Samples/CustomComposite/CustomComposite.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public override void OnGUI()
177177
target.scaleFactor = EditorGUILayout.Slider(m_ScaleFactorLabel, currentValue, 0, 2);
178178
}
179179

180-
#if UNITY_2022_1_OR_NEWER
180+
#if UNITY_2022_2_OR_NEWER
181181
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
182182
{
183183
var slider = new Slider(m_ScaleFactorLabel.text, 0, 2)

Assets/Tests/InputSystem.Editor/ControlSchemeEditorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if UNITY_2022_1_OR_NEWER
1+
#if UNITY_2022_2_OR_NEWER
22
using NUnit.Framework;
33
using UnityEngine.InputSystem;
44
using UnityEngine.InputSystem.Editor;

Assets/Tests/InputSystem.Editor/SelectorsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// UITK TreeView is not supported in earlier versions
22
// Therefore the UITK version of the InputActionAsset Editor is not available on earlier Editor versions either.
3-
#if UNITY_EDITOR && UNITY_2022_1_OR_NEWER
3+
#if UNITY_EDITOR && UNITY_2022_2_OR_NEWER
44
using System.Linq;
55
using NUnit.Framework;
66
using UnityEngine;

Assets/Tests/InputSystem.Editor/TestData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if UNITY_2022_1_OR_NEWER
1+
#if UNITY_2022_2_OR_NEWER
22
using System.Collections.Generic;
33
using UnityEditor;
44
using UnityEngine;

Assets/Tests/InputSystem.Editor/TestDataGenerators.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if UNITY_2022_1_OR_NEWER
1+
#if UNITY_2022_2_OR_NEWER
22
using System.Collections.Generic;
33
using UnityEngine.InputSystem;
44

Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector2Composite.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public override void OnGUI()
204204
target.mode = (Vector2Composite.Mode)EditorGUILayout.EnumPopup(m_ModeLabel, target.mode);
205205
}
206206

207-
#if UNITY_2022_1_OR_NEWER
207+
#if UNITY_2022_2_OR_NEWER
208208
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
209209
{
210210
var modeField = new EnumField("Mode", target.mode)

Packages/com.unity.inputsystem/InputSystem/Actions/Composites/Vector3Composite.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public override void OnGUI()
177177
target.mode = (Vector2Composite.Mode)EditorGUILayout.EnumPopup(m_ModeLabel, target.mode);
178178
}
179179

180-
#if UNITY_2022_1_OR_NEWER
180+
#if UNITY_2022_2_OR_NEWER
181181
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
182182
{
183183
var modeField = new EnumField("Mode", target.mode)

Packages/com.unity.inputsystem/InputSystem/Actions/InputControlScheme.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public InputControlScheme(string name, IEnumerable<DeviceRequirement> devices =
112112
}
113113
}
114114

115-
#if UNITY_EDITOR && UNITY_2022_1_OR_NEWER
115+
#if UNITY_EDITOR && UNITY_2022_2_OR_NEWER
116116
internal InputControlScheme(SerializedProperty sp)
117117
{
118118
var requirements = new List<DeviceRequirement>();

Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/HoldInteraction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public override void OnGUI()
128128
m_DurationSetting.OnGUI();
129129
}
130130

131-
#if UNITY_2022_1_OR_NEWER
131+
#if UNITY_2022_2_OR_NEWER
132132
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
133133
{
134134
m_PressPointSetting.OnDrawVisualElements(root, onChangedCallback);

Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/MultiTapInteraction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public override void OnGUI()
202202
m_PressPointSetting.OnGUI();
203203
}
204204

205-
#if UNITY_2022_1_OR_NEWER
205+
#if UNITY_2022_2_OR_NEWER
206206
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
207207
{
208208
var tapCountField = new IntegerField(m_TapCountLabel.text) { value = target.tapCount };

0 commit comments

Comments
 (0)