bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Depsgraph: Use operation code for geometry evaluation

Browse Source 
Affects object data datablocks. Similar to previous commit.

Should not have any functional changes, just some sanitization
to make code more clear.
This commit is contained in:
Sergey Sharybin 2019-02-01 10:39:10 +01:00
parent 700e3cc2a8
commit a86001c56a
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@ -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;
}

6
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@ -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,