1 files changed, 24 insertions, 0 deletions

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 39dad18ff2b..e5b03bd5291 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1723,6 +1723,11 @@ void DepsgraphRelationBuilder::build_driver_data(ID *id, FCurve *fcu)
   if (GS(id_ptr->name) == ID_NT) {
     ComponentKey ntree_output_key(id_ptr, NodeType::NTREE_OUTPUT);
     add_relation(driver_key, ntree_output_key, "Drivers -> NTree Output");
+    if (reinterpret_cast<bNodeTree *>(id_ptr)->type == NTREE_GEOMETRY) {
+      OperationKey ntree_geo_preprocess_key(
+          id, NodeType::NTREE_GEOMETRY_PREPROCESS, OperationCode::NTREE_GEOMETRY_PREPROCESS);
+      add_relation(driver_key, ntree_geo_preprocess_key, "Drivers -> NTree Geo Preprocess");
+    }
   }
 }
 
@@ -2611,6 +2616,16 @@ void DepsgraphRelationBuilder::build_nodetree(bNodeTree *ntree)
   build_animdata(&ntree->id);
   build_parameters(&ntree->id);
   OperationKey ntree_output_key(&ntree->id, NodeType::NTREE_OUTPUT, OperationCode::NTREE_OUTPUT);
+  OperationKey ntree_geo_preprocess_key(
+      &ntree->id, NodeType::NTREE_GEOMETRY_PREPROCESS, OperationCode::NTREE_GEOMETRY_PREPROCESS);
+  if (ntree->type == NTREE_GEOMETRY) {
+    OperationKey ntree_cow_key(&ntree->id, NodeType::COPY_ON_WRITE, OperationCode::COPY_ON_WRITE);
+    add_relation(ntree_cow_key, ntree_geo_preprocess_key, "COW -> Preprocess");
+    add_relation(ntree_geo_preprocess_key,
+                 ntree_output_key,
+                 "Preprocess -> Output",
+                 RELATION_FLAG_NO_FLUSH);
+  }
   /* nodetree's nodes... */
   LISTBASE_FOREACH (bNode *, bnode, &ntree->nodes) {
     build_idproperties(bnode->prop);
@@ -2687,6 +2702,12 @@ void DepsgraphRelationBuilder::build_nodetree(bNodeTree *ntree)
        * the output). Currently, we lack the infrastructure to check for these cases efficiently.
        * That can be added later. */
       add_relation(group_output_key, ntree_output_key, "Group Node");
+      if (group_ntree->type == NTREE_GEOMETRY) {
+        OperationKey group_preprocess_key(&group_ntree->id,
+                                          NodeType::NTREE_GEOMETRY_PREPROCESS,
+                                          OperationCode::NTREE_GEOMETRY_PREPROCESS);
+        add_relation(group_preprocess_key, ntree_geo_preprocess_key, "Group Node Preprocess");
+      }
     }
     else {
       BLI_assert_msg(0, "Unknown ID type used for node");
@@ -2703,6 +2724,9 @@ void DepsgraphRelationBuilder::build_nodetree(bNodeTree *ntree)
   if (check_id_has_anim_component(&ntree->id)) {
     ComponentKey animation_key(&ntree->id, NodeType::ANIMATION);
     add_relation(animation_key, ntree_output_key, "NTree Shading Parameters");
+    if (ntree->type == NTREE_GEOMETRY) {
+      add_relation(animation_key, ntree_geo_preprocess_key, "NTree Animation -> Preprocess");
+    }
   }
 }