@@ -314,10 +314,10 @@ static class JsonVersion
314
314
/// <seealso cref="FromJson"/>
315
315
public string ToJson ( )
316
316
{
317
- var hasContent = ( m_ActionMaps ? . Length ?? 0 ) > 0 || ( m_ControlSchemes ? . Length ?? 0 ) > 0 ;
317
+ var hasContent = m_ActionMaps . LengthSafe ( ) > 0 || m_ControlSchemes . LengthSafe ( ) > 0 ;
318
318
return JsonUtility . ToJson ( new WriteFileJson
319
319
{
320
- version = hasContent ? JsonVersion . Current : null ,
320
+ version = hasContent ? JsonVersion . Current : JsonVersion . Version0 ,
321
321
name = name ,
322
322
maps = InputActionMap . WriteFileJson . FromMaps ( m_ActionMaps ) . maps ,
323
323
controlSchemes = InputControlScheme . SchemeJson . ToJson ( m_ControlSchemes ) ,
@@ -971,7 +971,7 @@ private void OnDestroy()
971
971
[ Serializable ]
972
972
internal struct WriteFileJson
973
973
{
974
- public int ? version ;
974
+ public int version ;
975
975
public string name ;
976
976
public InputActionMap . WriteMapJson [ ] maps ;
977
977
public InputControlScheme . SchemeJson [ ] controlSchemes ;
@@ -987,7 +987,7 @@ internal struct WriteFileJsonNoName
987
987
[ Serializable ]
988
988
internal struct ReadFileJson
989
989
{
990
- public int ? version ;
990
+ public int version ;
991
991
public string name ;
992
992
public InputActionMap . ReadMapJson [ ] maps ;
993
993
public InputControlScheme . SchemeJson [ ] controlSchemes ;
@@ -1012,11 +1012,9 @@ public void ToAsset(InputActionAsset asset)
1012
1012
/// </summary>
1013
1013
internal void MigrateJson ( ref ReadFileJson parsedJson )
1014
1014
{
1015
- var existing = parsedJson . version ?? JsonVersion . Version0 ;
1016
- if ( existing >= JsonVersion . Version1 )
1015
+ if ( parsedJson . version >= JsonVersion . Version1 )
1017
1016
return ;
1018
-
1019
- if ( ( parsedJson . maps ? . Length ?? 0 ) > 0 && ( parsedJson . version ?? 0 ) < JsonVersion . Version1 )
1017
+ if ( ( parsedJson . maps ? . Length ?? 0 ) > 0 && ( parsedJson . version ) < JsonVersion . Version1 )
1020
1018
{
1021
1019
for ( var mi = 0 ; mi < parsedJson . maps . Length ; ++ mi )
1022
1020
{
0 commit comments