Depsgraph: Cleanup, use DEG_NODE_TYPE prefix for depsgraph node types

1 files changed, 16 insertions, 16 deletions

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
index e307909cb11..29d80290bd3 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
@@ -67,7 +67,7 @@ namespace DEG {
 void DepsgraphNodeBuilder::build_pose_constraints(Scene *scene, Object *ob, bPoseChannel *pchan)
 {
 	/* create node for constraint stack */
-	add_operation_node(&ob->id, DEPSNODE_TYPE_BONE, pchan->name,
+	add_operation_node(&ob->id, DEG_NODE_TYPE_BONE, pchan->name,
 	                   DEPSOP_TYPE_EXEC,
 	                   function_bind(BKE_pose_constraints_evaluate, _1, scene, ob, pchan),
 	                   DEG_OPCODE_BONE_CONSTRAINTS);
@@ -81,14 +81,14 @@ void DepsgraphNodeBuilder::build_ik_pose(Scene *scene, Object *ob, bPoseChannel
 	/* Find the chain's root. */
 	bPoseChannel *rootchan = BKE_armature_ik_solver_find_root(pchan, data);
 
-	if (has_operation_node(&ob->id, DEPSNODE_TYPE_EVAL_POSE, rootchan->name,
+	if (has_operation_node(&ob->id, DEG_NODE_TYPE_EVAL_POSE, rootchan->name,
 	                       DEG_OPCODE_POSE_IK_SOLVER))
 	{
 		return;
 	}
 
 	/* Operation node for evaluating/running IK Solver. */
-	add_operation_node(&ob->id, DEPSNODE_TYPE_EVAL_POSE, rootchan->name,
+	add_operation_node(&ob->id, DEG_NODE_TYPE_EVAL_POSE, rootchan->name,
 	                   DEPSOP_TYPE_SIM, function_bind(BKE_pose_iktree_evaluate, _1, scene, ob, rootchan),
 	                   DEG_OPCODE_POSE_IK_SOLVER);
 }
@@ -104,7 +104,7 @@ void DepsgraphNodeBuilder::build_splineik_pose(Scene *scene, Object *ob, bPoseCh
 	/* Operation node for evaluating/running Spline IK Solver.
 	 * Store the "root bone" of this chain in the solver, so it knows where to start.
 	 */
-	add_operation_node(&ob->id, DEPSNODE_TYPE_EVAL_POSE, rootchan->name,
+	add_operation_node(&ob->id, DEG_NODE_TYPE_EVAL_POSE, rootchan->name,
 	                   DEPSOP_TYPE_SIM, function_bind(BKE_pose_splineik_evaluate, _1, scene, ob, rootchan),
 	                   DEG_OPCODE_POSE_SPLINE_IK_SOLVER);
 }
@@ -125,7 +125,7 @@ void DepsgraphNodeBuilder::build_rig(Scene *scene, Object *ob)
 
 		/* Make sure pose is up-to-date with armature updates. */
 		add_operation_node(&arm->id,
-		                   DEPSNODE_TYPE_PARAMETERS,
+		                   DEG_NODE_TYPE_PARAMETERS,
 		                   DEPSOP_TYPE_EXEC,
 		                   NULL,
 		                   DEG_OPCODE_PLACEHOLDER,
@@ -175,28 +175,28 @@ void DepsgraphNodeBuilder::build_rig(Scene *scene, Object *ob)
 	 */
 
 	/* pose eval context */
-	add_operation_node(&ob->id, DEPSNODE_TYPE_EVAL_POSE,
+	add_operation_node(&ob->id, DEG_NODE_TYPE_EVAL_POSE,
 	                   DEPSOP_TYPE_INIT, function_bind(BKE_pose_eval_init, _1, scene, ob, ob->pose), DEG_OPCODE_POSE_INIT);
 
-	add_operation_node(&ob->id, DEPSNODE_TYPE_EVAL_POSE,
+	add_operation_node(&ob->id, DEG_NODE_TYPE_EVAL_POSE,
 	                   DEPSOP_TYPE_POST, function_bind(BKE_pose_eval_flush, _1, scene, ob, ob->pose), DEG_OPCODE_POSE_DONE);
 
 	/* bones */
 	LINKLIST_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
 		/* node for bone eval */
-		add_operation_node(&ob->id, DEPSNODE_TYPE_BONE, pchan->name,
+		add_operation_node(&ob->id, DEG_NODE_TYPE_BONE, pchan->name,
 		                   DEPSOP_TYPE_INIT, NULL, // XXX: BKE_pose_eval_bone_local
 		                   DEG_OPCODE_BONE_LOCAL);
 
-		add_operation_node(&ob->id, DEPSNODE_TYPE_BONE, pchan->name,
+		add_operation_node(&ob->id, DEG_NODE_TYPE_BONE, pchan->name,
 		                   DEPSOP_TYPE_EXEC, function_bind(BKE_pose_eval_bone, _1, scene, ob, pchan), // XXX: BKE_pose_eval_bone_pose
 		                   DEG_OPCODE_BONE_POSE_PARENT);
 
-		add_operation_node(&ob->id, DEPSNODE_TYPE_BONE, pchan->name,
+		add_operation_node(&ob->id, DEG_NODE_TYPE_BONE, pchan->name,
 		                   DEPSOP_TYPE_OUT, NULL, /* NOTE: dedicated noop for easier relationship construction */
 		                   DEG_OPCODE_BONE_READY);
 
-		add_operation_node(&ob->id, DEPSNODE_TYPE_BONE, pchan->name,
+		add_operation_node(&ob->id, DEG_NODE_TYPE_BONE, pchan->name,
 		                   DEPSOP_TYPE_POST, function_bind(BKE_pose_bone_done, _1, pchan),
 		                   DEG_OPCODE_BONE_DONE);
 
@@ -247,27 +247,27 @@ void DepsgraphNodeBuilder::build_proxy_rig(Object *ob)
 	}
 
 	add_operation_node(&ob->id,
-	                   DEPSNODE_TYPE_EVAL_POSE,
+	                   DEG_NODE_TYPE_EVAL_POSE,
 	                   DEPSOP_TYPE_INIT,
 	                   function_bind(BKE_pose_eval_proxy_copy, _1, ob),
 	                   DEG_OPCODE_POSE_INIT);
 
 	LINKLIST_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
-		add_operation_node(&ob->id, DEPSNODE_TYPE_BONE, pchan->name,
+		add_operation_node(&ob->id, DEG_NODE_TYPE_BONE, pchan->name,
 		                   DEPSOP_TYPE_INIT, NULL,
 		                   DEG_OPCODE_BONE_LOCAL);
 
-		add_operation_node(&ob->id, DEPSNODE_TYPE_BONE, pchan->name,
+		add_operation_node(&ob->id, DEG_NODE_TYPE_BONE, pchan->name,
 		                   DEPSOP_TYPE_EXEC, NULL,
 		                   DEG_OPCODE_BONE_READY);
 
-		add_operation_node(&ob->id, DEPSNODE_TYPE_BONE, pchan->name,
+		add_operation_node(&ob->id, DEG_NODE_TYPE_BONE, pchan->name,
 		                   DEPSOP_TYPE_POST, NULL,
 		                   DEG_OPCODE_BONE_DONE);
 	}
 
 	add_operation_node(&ob->id,
-	                   DEPSNODE_TYPE_EVAL_POSE,
+	                   DEG_NODE_TYPE_EVAL_POSE,
 	                   DEPSOP_TYPE_POST,
 	                   NULL,
 	                   DEG_OPCODE_POSE_DONE);