Skip to content

Commit 42bb20c

Browse files
committed
Remove commented code and fix misplaced enums.
1 parent 261cbd6 commit 42bb20c

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,11 +399,7 @@ public void LoadFromJson(string json)
399399
throw new ArgumentNullException(nameof(json));
400400

401401
var parsedJson = JsonUtility.FromJson<ReadFileJson>(json);
402-
//if ((parsedJson.maps?.Length ?? 0) > 0 && (parsedJson.version ?? 0) < JsonVersion.Version1)
403-
//{
404402
MigrateJson(ref parsedJson);
405-
//}
406-
407403
parsedJson.ToAsset(this);
408404
}
409405

@@ -1016,8 +1012,8 @@ public void ToAsset(InputActionAsset asset)
10161012
/// </summary>
10171013
internal void MigrateJson(ref ReadFileJson parsedJson)
10181014
{
1019-
var existing = parsedJson.version ?? JsonVersion.Version1;
1020-
if (existing >= JsonVersion.Current)
1015+
var existing = parsedJson.version ?? JsonVersion.Version0;
1016+
if (existing >= JsonVersion.Version1)
10211017
return;
10221018

10231019
if ((parsedJson.maps?.Length ?? 0) > 0 && (parsedJson.version ?? 0) < JsonVersion.Version1)

0 commit comments

Comments
 (0)