Merge branch 'hotfix/null_list_on_asset_creation'

nicloay · Mar 21, 2016 · 297bcbc · 297bcbc
2 parents f1b27b2 + 619df58
commit 297bcbc
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Assets/NodeInspector/Scripts/Editor/GraphData.cs b/Assets/NodeInspector/Scripts/Editor/GraphData.cs
@@ -30,12 +30,8 @@ public void AddNewAsset(Type nodeType){
         }
 
         public static bool CanCreateGraphData(ScriptableObject parentObject, FieldInfo fieldInfo, out GraphData graphData){
-            graphData = null;
-            object fieldValue = fieldInfo.GetValue(parentObject);
-            if (fieldValue == null){
-                return false;
-            }
-            Type fieldValueType = fieldValue.GetType();
+            graphData = null;          
+            Type fieldValueType = fieldInfo.FieldType;
             if (fieldValueType.IsGenericType && (fieldValueType.GetGenericTypeDefinition() == typeof(List<>))
                 && typeof(ScriptableObject).IsAssignableFrom( fieldValueType.GetGenericArguments()[0])){
 
@@ -46,6 +42,12 @@ public static bool CanCreateGraphData(ScriptableObject parentObject, FieldInfo f
                 GraphAttribute attribute =  attributes
                     .ToList().First((arg) => arg.GetType() == typeof(GraphAttribute)) as GraphAttribute;
                 if (attribute != null){
+                    object fieldValue = fieldInfo.GetValue(parentObject);
+                    if (fieldValue == null){                        
+                        var newList = Activator.CreateInstance(fieldValueType);
+                        fieldInfo.SetValue(parentObject, newList);
+                        fieldValue = newList;
+                    }
                     SerializedObject serializedObject = new SerializedObject(parentObject);
                     graphData = new GraphData();
                     graphData.ItemBaseType = fieldValueType.GetGenericArguments()[0];