Added link to scene API and fixed object field scene references

Author: alelievr

Assets/Examples/GraphBehaviour.cs

@@ -6,9 +6,11 @@ public class GraphBehaviour : MonoBehaviour
 {
     public BaseGraph graph;
 
-    void Start()
+    protected virtual void OnEnable()
     {
         if (graph == null)
             graph = ScriptableObject.CreateInstance<BaseGraph>();
+
+        graph.LinkToScene(gameObject.scene);
     }
 }

Assets/com.alelievr.NodeGraphProcessor/Editor/BaseGraphWindow.cs

@@ -98,8 +98,8 @@ public void InitializeGraph(BaseGraph graph)
 				AssetDatabase.SaveAssets();
 				// Unload the graph
 				graphUnloaded?.Invoke(this.graph);
-				
-				if(this.graph.name != "")	//	Only if it has a file name (GraphBehaviour graphs doesn't have one). This is a temporary solution.
+
+				if (!this.graph.IsLinkedToScene())
 					Resources.UnloadAsset(this.graph);
 			}
 

Assets/com.alelievr.NodeGraphProcessor/Editor/Views/BaseNodeView.cs

@@ -709,16 +709,13 @@ protected VisualElement AddControlField(FieldInfo field, string label = null, bo
 				UpdateOtherFieldValue(field, newValue);
 			}, showInputDrawer ? "" : label);
 
-			/*if(owner.graph.name != "")
+			// Disallow picking scene objects when the graph is not linked to a scene
+			if (!owner.graph.IsLinkedToScene())
 			{
-			//	TODO: Scene Graph vs Asset Graph distinction for scene picking
-				//  If this is a graph file
 				var objectField = element.Q<ObjectField>();
-				// Check field is an ObjectField
-				if(objectField != null)
-					//  Disallow picking scene objects
+				if (objectField != null)
 					objectField.allowSceneObjects = false;
-			}*/
+			}
 
 			if (!fieldControlsMap.TryGetValue(field, out var inputFieldList))
 				inputFieldList = fieldControlsMap[field] = new List<VisualElement>();

Assets/com.alelievr.NodeGraphProcessor/Editor/Views/ExposedParameterFieldFactory.cs

@@ -67,16 +67,13 @@ public VisualElement GetParameterValueField(ExposedParameter parameter, Action<o
                 oldParameterValues[parameter] = parameter.value;
             }));
 
-            /*if(this.graph.name != "")
+			// Disallow picking scene objects when the graph is not linked to a scene
+            if (!this.graph.IsLinkedToScene())
             {
-			//	TODO: Scene Inspector vs Asset Inspector distinction for scene picking
-                //  If this is a graph file
-                var objectField = view.Q<ObjectField>();
-                // Check field is an ObjectField
-                if(objectField != null)
-                    //  Disallow picking scene objects
-                    objectField.allowSceneObjects = false;
-            }*/
+				var objectField = view.Q<ObjectField>();
+				if (objectField != null)
+					objectField.allowSceneObjects = false;
+            }
             return view;
         }
 

Assets/com.alelievr.NodeGraphProcessor/Runtime/Graph/BaseGraph.cs

@@ -4,6 +4,7 @@
 using UnityEngine;
 using System;
 using UnityEngine.Serialization;
+using UnityEngine.SceneManagement;
 
 namespace GraphProcessor
 {
@@ -123,6 +124,9 @@ public class BaseGraph : ScriptableObject, ISerializationCallbackReceiver
 		[System.NonSerialized]
 		Dictionary< BaseNode, int >						computeOrderDictionary = new Dictionary< BaseNode, int >();
 
+		[NonSerialized]
+		Scene							linkedScene;
+
 		//graph visual properties
 		public Vector3					position = Vector3.zero;
 		public Vector3					scale = Vector3.one;
@@ -676,6 +680,15 @@ public bool SetParameterValue(string name, object value)
 		/// <returns>value</returns>
 		public T GetParameterValue< T >(string name) => (T)GetParameterValue(name);
 
+		/// <summary>
+		/// Link the current graph to the scene in parameter, allowing the graph to pick and serialize objects from the scene.
+		/// </summary>
+		/// <param name="scene">Target scene to link</param>
+		public void LinkToScene(Scene scene)
+			=> linkedScene = scene;
+		
+		public bool IsLinkedToScene() => linkedScene.IsValid();
+
 		HashSet<BaseNode> infiniteLoopTracker = new HashSet<BaseNode>();
 		int UpdateComputeOrderBreadthFirst(int depth, BaseNode node)
 		{