[Bf-blender-cvs] [a86001c56a3] master: Depsgraph: Use operation code for geometry evaluation

[Sergey Sharybin]

Commit: a86001c56a30fa436bdf30710d232532971aa90e
Author: Sergey Sharybin
Date:   Fri Feb 1 10:39:10 2019 +0100
Branches: master
https://developer.blender.org/rBa86001c56a30fa436bdf30710d232532971aa90e

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.

===================================================================

M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc

===================================================================

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,