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

Fixed a bug when trying to deserialize a null type with FromJson.
mackysoft · Feb 16, 2024 · 2934eea · 2934eea
2 parents e5a5157 + f781ad7
commit 2934eea
Showing 1 changed file with 1 addition and 1 deletion.
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);