Merge pull request #52 from mackysoft/fix/nullreference-when-fromjson

mackysoft · web-flow · commit 2934eea84ef0 · 2024-02-16T21:58:54.000+09:00
Fixed a bug when trying to deserialize a null type with FromJson.
diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceUtility.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceUtility.cs
@@ -12,7 +12,7 @@ public static object SetManagedReference (this SerializedProperty property,Type
 
 #if UNITY_2021_3_OR_NEWER
 			// NOTE: managedReferenceValue getter is available only in Unity 2021.3 or later.
-			if (property.managedReferenceValue != null)
+			if (property.managedReferenceValue != null && type != null)
 			{
 				// Restore an previous values from json.
 				string json = JsonUtility.ToJson(property.managedReferenceValue);

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public static object SetManagedReference (this SerializedProperty property,Type`
`12`	`12`
`13`	`13`	`#if UNITY_2021_3_OR_NEWER`
`14`	`14`	`// NOTE: managedReferenceValue getter is available only in Unity 2021.3 or later.`
`15`		`- if (property.managedReferenceValue != null)`
	`15`	`+ if (property.managedReferenceValue != null && type != null)`
`16`	`16`	`{`
`17`	`17`	`// Restore an previous values from json.`
`18`	`18`	`string json = JsonUtility.ToJson(property.managedReferenceValue);`