Start

This will be added properly in the next step of development,
using session_uid properties to avoid having pointer operator
properties.

@@ -1055,6 +1055,17 @@ bool BKE_collection_has_object_recursive_instanced(Collection *collection, Objec
   return BLI_findptr(&objects, ob, offsetof(Base, object));
 }
 
+bool BKE_collection_has_object_recursive_instanced_orig_id(Collection *collection, Object *ob)

@@ -1058,0 +1059,4 @@
+{
+  const ListBase objects = BKE_collection_object_cache_instanced_get(collection);
+  LISTBASE_FOREACH (Base *, base, &objects) {
+    if (base->object->id.orig_id == ob->id.orig_id) {

@@ -314,0 +299,4 @@
+static bool deg_has_evaluated_id(const Depsgraph &depsgraph, ID *id)
+{
+  if (!ID_TYPE_USE_COPY_ON_EVAL(GS(id->name))) {
+    return true;

@@ -72,2 +72,3 @@
   if (params.output_is_required("Geometry")) {
-    if (object == self_object) {
+    /* Compare by `orig_id` because objects may be copied into separate depsgraphs. */
+    if (object->id.orig_id == self_object->id.orig_id) {

@@ -104,0 +105,4 @@
+ * Find whether an evaluated object's original ID is contained or instanced by any object in this
+ * collection. The collection is expected to be an evaluated data-block too.
+ */
+bool BKE_collection_has_object_recursive_instanced_orig_id(Collection *collection, Object *ob);

@@ -295,0 +297,4 @@
+  return DEG_get_evaluated_id(&depsgraph, id) == id;
+}
+
+static void gather_input_ids(const Depsgraph &depsgraph_active,

@@ -423,3 +439,1 @@
-      return OPERATOR_CANCELLED;
-    }
-  }
+  // for (const bNodeTreeInterfaceSocket *input : node_tree->interface_inputs()) {

@@ -4330,0 +4343,4 @@
+  return id;
+}
+
+const ID *GeoNodesOperatorDepsgraphs::get_evaluated_id(const ID &id_orig) const

@@ -343,0 +345,4 @@
+bool DEG_id_is_fully_evaluated(const Depsgraph *depsgraph, const ID *id_eval)
+{
+  const deg::Depsgraph *deg_graph = reinterpret_cast<const deg::Depsgraph *>(depsgraph);
+  const deg::IDNode *id_node = deg_graph->find_id_node(deg::get_original_id(id_eval));

@@ -172,2 +190,2 @@
-  Depsgraph *depsgraph = nullptr;
-  Scene *scene = nullptr;
+  const Object *self_object_orig = nullptr;
+  const GeoNodesOperatorDepsgraphs *depsgraphs;