diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-01 12:39:10 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-01 17:40:19 +0300 |
| commit | a86001c56a30fa436bdf30710d232532971aa90e (patch) | |
| tree | 3add48a6d8a2a814bb6200b82c1ca9f76932b759 /source/blender/depsgraph | |
| parent | 700e3cc2a87a20f2ce3f8af31ece4df1b13e0ba8 (diff) | |
Depsgraph: Use operation code for geometry evaluation
Affects object data datablocks. Similar to previous commit.
Should not have any functional changes, just some sanitization
to make code more clear.
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 15 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 6 |
2 files changed, 7 insertions, 14 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 26169b5b900..8b29ebcd89b 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -1314,8 +1314,7 @@ void DepsgraphNodeBuilder::build_object_data_geometry_datablock( function_bind(BKE_mesh_eval_geometry, _1, (Mesh *)obdata_cow), - OperationCode::PLACEHOLDER, - "Geometry Eval"); + OperationCode::GEOMETRY_EVAL); op_node->set_as_entry(); break; } @@ -1324,8 +1323,7 @@ void DepsgraphNodeBuilder::build_object_data_geometry_datablock( op_node = add_operation_node(obdata, NodeType::GEOMETRY, NULL, - OperationCode::PLACEHOLDER, - "Geometry Eval"); + OperationCode::GEOMETRY_EVAL); op_node->set_as_entry(); break; } @@ -1336,8 +1334,7 @@ void DepsgraphNodeBuilder::build_object_data_geometry_datablock( function_bind(BKE_curve_eval_geometry, _1, (Curve *)obdata_cow), - OperationCode::PLACEHOLDER, - "Geometry Eval"); + OperationCode::GEOMETRY_EVAL); 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. */ @@ -1369,8 +1366,7 @@ void DepsgraphNodeBuilder::build_object_data_geometry_datablock( function_bind(BKE_lattice_eval_geometry, _1, (Lattice *)obdata_cow), - OperationCode::PLACEHOLDER, - "Geometry Eval"); + OperationCode::GEOMETRY_EVAL); op_node->set_as_entry(); break; } @@ -1383,8 +1379,7 @@ void DepsgraphNodeBuilder::build_object_data_geometry_datablock( function_bind(BKE_gpencil_eval_geometry, _1, (bGPdata *)obdata_cow), - OperationCode::PLACEHOLDER, - "Geometry Eval"); + OperationCode::GEOMETRY_EVAL); op_node->set_as_entry(); break; } diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 75b4ae44169..cb5c8111c08 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -2121,10 +2121,8 @@ void DepsgraphRelationBuilder::build_object_data_geometry_datablock(ID *obdata) build_shapekeys(key); } /* Link object data evaluation node to exit operation. */ - OperationKey obdata_geom_eval_key(obdata, - NodeType::GEOMETRY, - OperationCode::PLACEHOLDER, - "Geometry Eval"); + OperationKey obdata_geom_eval_key( + obdata, NodeType::GEOMETRY, OperationCode::PLACEHOLDER); OperationKey obdata_geom_done_key(obdata, NodeType::GEOMETRY, OperationCode::PLACEHOLDER, |