Merge branch 'master' into temp-geometry-nodes-curve-sampletemp-geometry-nodes-curve-sample

1 files changed, 46 insertions, 56 deletions

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index e561d0b653c..8d1074d912f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -1496,7 +1496,7 @@ void DepsgraphNodeBuilder::build_object_data_geometry(Object *object, bool is_ob
   add_operation_node(
       &object->id,
       NodeType::BATCH_CACHE,
-      OperationCode::BATCH_UPDATE_SELECT,
+      OperationCode::GEOMETRY_SELECT_UPDATE,
       [object_cow](::Depsgraph *depsgraph) { BKE_object_select_update(depsgraph, object_cow); });
 }
 
@@ -1517,37 +1517,33 @@ void DepsgraphNodeBuilder::build_object_data_geometry_datablock(ID *obdata, bool
   if (key) {
     build_shapekeys(key);
   }
-
-  /* Geometry evaluation. */
-  /* Entry operation, takes care of initialization, and some other
-   * relations which needs to be run prior to actual geometry evaluation. */
-  op_node = add_operation_node(obdata, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL_INIT);
-  op_node->set_as_entry();
-
-  add_operation_node(obdata, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL_DEFORM);
-
+  /* Nodes for result of obdata's evaluation, and geometry
+   * evaluation on object. */
   const ID_Type id_type = GS(obdata->name);
   switch (id_type) {
     case ID_ME: {
-      add_operation_node(obdata,
-                         NodeType::GEOMETRY,
-                         OperationCode::GEOMETRY_EVAL,
-                         [obdata_cow](::Depsgraph *depsgraph) {
-                           BKE_mesh_eval_geometry(depsgraph, (Mesh *)obdata_cow);
-                         });
+      op_node = add_operation_node(obdata,
+                                   NodeType::GEOMETRY,
+                                   OperationCode::GEOMETRY_EVAL,
+                                   [obdata_cow](::Depsgraph *depsgraph) {
+                                     BKE_mesh_eval_geometry(depsgraph, (Mesh *)obdata_cow);
+                                   });
+      op_node->set_as_entry();
       break;
     }
     case ID_MB: {
-      add_operation_node(obdata, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL);
+      op_node = add_operation_node(obdata, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL);
+      op_node->set_as_entry();
       break;
     }
     case ID_CU: {
-      add_operation_node(obdata,
-                         NodeType::GEOMETRY,
-                         OperationCode::GEOMETRY_EVAL,
-                         [obdata_cow](::Depsgraph *depsgraph) {
-                           BKE_curve_eval_geometry(depsgraph, (Curve *)obdata_cow);
-                         });
+      op_node = add_operation_node(obdata,
+                                   NodeType::GEOMETRY,
+                                   OperationCode::GEOMETRY_EVAL,
+                                   [obdata_cow](::Depsgraph *depsgraph) {
+                                     BKE_curve_eval_geometry(depsgraph, (Curve *)obdata_cow);
+                                   });
+      op_node->set_as_entry();
       /* Make sure objects used for bevel.taper are in the graph.
        * NOTE: This objects might be not linked to the scene. */
       Curve *cu = (Curve *)obdata;
@@ -1563,41 +1559,47 @@ void DepsgraphNodeBuilder::build_object_data_geometry_datablock(ID *obdata, bool
       break;
     }
     case ID_LT: {
-      add_operation_node(obdata,
-                         NodeType::GEOMETRY,
-                         OperationCode::GEOMETRY_EVAL,
-                         [obdata_cow](::Depsgraph *depsgraph) {
-                           BKE_lattice_eval_geometry(depsgraph, (Lattice *)obdata_cow);
-                         });
+      op_node = add_operation_node(obdata,
+                                   NodeType::GEOMETRY,
+                                   OperationCode::GEOMETRY_EVAL,
+                                   [obdata_cow](::Depsgraph *depsgraph) {
+                                     BKE_lattice_eval_geometry(depsgraph, (Lattice *)obdata_cow);
+                                   });
+      op_node->set_as_entry();
       break;
     }
 
     case ID_GD: {
       /* GPencil evaluation operations. */
-      add_operation_node(obdata,
-                         NodeType::GEOMETRY,
-                         OperationCode::GEOMETRY_EVAL,
-                         [obdata_cow](::Depsgraph *depsgraph) {
-                           BKE_gpencil_frame_active_set(depsgraph, (bGPdata *)obdata_cow);
-                         });
+      op_node = add_operation_node(obdata,
+                                   NodeType::GEOMETRY,
+                                   OperationCode::GEOMETRY_EVAL,
+                                   [obdata_cow](::Depsgraph *depsgraph) {
+                                     BKE_gpencil_frame_active_set(depsgraph,
+                                                                  (bGPdata *)obdata_cow);
+                                   });
+      op_node->set_as_entry();
       break;
     }
     case ID_HA: {
-      add_operation_node(obdata, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL);
+      op_node = add_operation_node(obdata, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL);
+      op_node->set_as_entry();
       break;
     }
     case ID_PT: {
-      add_operation_node(obdata, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL);
+      op_node = add_operation_node(obdata, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL);
+      op_node->set_as_entry();
       break;
     }
     case ID_VO: {
       /* Volume frame update. */
-      add_operation_node(obdata,
-                         NodeType::GEOMETRY,
-                         OperationCode::GEOMETRY_EVAL,
-                         [obdata_cow](::Depsgraph *depsgraph) {
-                           BKE_volume_eval_geometry(depsgraph, (Volume *)obdata_cow);
-                         });
+      op_node = add_operation_node(obdata,
+                                   NodeType::GEOMETRY,
+                                   OperationCode::GEOMETRY_EVAL,
+                                   [obdata_cow](::Depsgraph *depsgraph) {
+                                     BKE_volume_eval_geometry(depsgraph, (Volume *)obdata_cow);
+                                   });
+      op_node->set_as_entry();
       break;
     }
     default:
@@ -1611,22 +1613,10 @@ void DepsgraphNodeBuilder::build_object_data_geometry_datablock(ID *obdata, bool
   /* Batch cache. */
   add_operation_node(obdata,
                      NodeType::BATCH_CACHE,
-                     OperationCode::BATCH_UPDATE_SELECT,
+                     OperationCode::GEOMETRY_SELECT_UPDATE,
                      [obdata_cow](::Depsgraph *depsgraph) {
                        BKE_object_data_select_update(depsgraph, obdata_cow);
                      });
-  add_operation_node(obdata,
-                     NodeType::BATCH_CACHE,
-                     OperationCode::BATCH_UPDATE_DEFORM,
-                     [obdata_cow](::Depsgraph *depsgraph) {
-                       BKE_object_data_eval_batch_cache_deform_tag(depsgraph, obdata_cow);
-                     });
-  add_operation_node(obdata,
-                     NodeType::BATCH_CACHE,
-                     OperationCode::BATCH_UPDATE_ALL,
-                     [obdata_cow](::Depsgraph *depsgraph) {
-                       BKE_object_data_eval_batch_cache_dirty_tag(depsgraph, obdata_cow);
-                     });
 }
 
 void DepsgraphNodeBuilder::build_armature(bArmature *armature)