Skip to content

Commit 2b0274b

Browse files
committed
check for null values when loading list for upgrade
1 parent cb63f0d commit 2b0274b

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

Editor/UpgradeSOVariantHelper.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Linq;
44
using Newtonsoft.Json;
55
using Sirenix.Serialization;
6+
using Sirenix.Utilities;
67
using UnityEditor;
78
using UnityEngine;
89

@@ -14,7 +15,12 @@ public class UpgradeSOVariantHelper
1415
[MenuItem("Tools/GieziTools/SOVariant/Upgrade user data to new version")]
1516
public static void UpgradeSOVariantUserData()
1617
{
17-
IEnumerable<ScriptableObject> scriptableObjects = AssetDatabase.GetAllAssetPaths().Where(s => s.EndsWith(".asset") && s.StartsWith("Assets/")).Select(s => AssetDatabase.LoadAssetAtPath<ScriptableObject>(s)).Where(o => o.GetType().IsDefined(typeof(SOVariantAttribute), true));
18+
IEnumerable<ScriptableObject> scriptableObjects =
19+
AssetDatabase.GetAllAssetPaths()
20+
.Where(s => s.EndsWith(".asset") && s.StartsWith("Assets/"))
21+
.Select(AssetDatabase.LoadAssetAtPath<ScriptableObject>)
22+
.Where(o => o != null)
23+
.Where(o => o.GetType().IsDefined(typeof(SOVariantAttribute), true));
1824

1925
foreach (ScriptableObject scriptableObject in scriptableObjects)
2026
{

0 commit comments

Comments
 (0)