Depsgraph: Cleanup, get rid of relation type

It was never actually used apart from being stored at a construciton time.
This caused some redundancy and ncertanty about which relation type to use
during construciton (often existing types were not close enough to particular
use case).

1 files changed, 36 insertions, 36 deletions

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
index 2b4c000f483..df1d19e59dc 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
@@ -102,19 +102,19 @@ void DepsgraphRelationBuilder::build_ik_pose(Object *ob,
 			if (data->tar != ob) {
 				/* different armature - can just read the results */
 				ComponentKey target_key(&data->tar->id, DEPSNODE_TYPE_BONE, data->subtarget);
-				add_relation(target_key, pose_key, DEPSREL_TYPE_TRANSFORM, con->name);
+				add_relation(target_key, pose_key, con->name);
 			}
 			else {
 				/* same armature - we'll use the ready state only, just in case this bone is in the chain we're solving */
 				OperationKey target_key(&data->tar->id, DEPSNODE_TYPE_BONE, data->subtarget, DEG_OPCODE_BONE_DONE);
-				add_relation(target_key, solver_key, DEPSREL_TYPE_TRANSFORM, con->name);
+				add_relation(target_key, solver_key, con->name);
 			}
 		}
 		else if (ELEM(data->tar->type, OB_MESH, OB_LATTICE) && (data->subtarget[0])) {
 			/* vertex group target */
 			/* NOTE: for now, we don't need to represent vertex groups separately... */
 			ComponentKey target_key(&data->tar->id, DEPSNODE_TYPE_GEOMETRY);
-			add_relation(target_key, solver_key, DEPSREL_TYPE_GEOMETRY_EVAL, con->name);
+			add_relation(target_key, solver_key, con->name);
 
 			if (data->tar->type == OB_MESH) {
 				OperationDepsNode *node2 = find_operation_node(target_key);
@@ -126,7 +126,7 @@ void DepsgraphRelationBuilder::build_ik_pose(Object *ob,
 		else {
 			/* Standard Object Target */
 			ComponentKey target_key(&data->tar->id, DEPSNODE_TYPE_TRANSFORM);
-			add_relation(target_key, pose_key, DEPSREL_TYPE_TRANSFORM, con->name);
+			add_relation(target_key, pose_key, con->name);
 		}
 
 		if ((data->tar == ob) && (data->subtarget[0])) {
@@ -143,13 +143,13 @@ void DepsgraphRelationBuilder::build_ik_pose(Object *ob,
 		if ((data->poletar->type == OB_ARMATURE) && (data->polesubtarget[0])) {
 			// XXX: same armature issues - ready vs done?
 			ComponentKey target_key(&data->poletar->id, DEPSNODE_TYPE_BONE, data->polesubtarget);
-			add_relation(target_key, solver_key, DEPSREL_TYPE_TRANSFORM, con->name);
+			add_relation(target_key, solver_key, con->name);
 		}
 		else if (ELEM(data->poletar->type, OB_MESH, OB_LATTICE) && (data->polesubtarget[0])) {
 			/* vertex group target */
 			/* NOTE: for now, we don't need to represent vertex groups separately... */
 			ComponentKey target_key(&data->poletar->id, DEPSNODE_TYPE_GEOMETRY);
-			add_relation(target_key, solver_key, DEPSREL_TYPE_GEOMETRY_EVAL, con->name);
+			add_relation(target_key, solver_key, con->name);
 
 			if (data->poletar->type == OB_MESH) {
 				OperationDepsNode *node2 = find_operation_node(target_key);
@@ -160,7 +160,7 @@ void DepsgraphRelationBuilder::build_ik_pose(Object *ob,
 		}
 		else {
 			ComponentKey target_key(&data->poletar->id, DEPSNODE_TYPE_TRANSFORM);
-			add_relation(target_key, solver_key, DEPSREL_TYPE_TRANSFORM, con->name);
+			add_relation(target_key, solver_key, con->name);
 		}
 	}
 
@@ -173,7 +173,7 @@ void DepsgraphRelationBuilder::build_ik_pose(Object *ob,
 		OperationKey tip_transforms_key(&ob->id, DEPSNODE_TYPE_BONE,
 		                                parchan->name, DEG_OPCODE_BONE_LOCAL);
 		add_relation(solver_key, tip_transforms_key,
-		             DEPSREL_TYPE_TRANSFORM, "IK Solver Result");
+		             "IK Solver Result");
 		parchan = pchan->parent;
 	}
 
@@ -182,7 +182,7 @@ void DepsgraphRelationBuilder::build_ik_pose(Object *ob,
 	OperationKey parchan_transforms_key(&ob->id, DEPSNODE_TYPE_BONE,
 	                                    parchan->name, DEG_OPCODE_BONE_READY);
 	add_relation(parchan_transforms_key, solver_key,
-	             DEPSREL_TYPE_TRANSFORM, "IK Solver Owner");
+	             "IK Solver Owner");
 
 	/* Walk to the chain's root */
 	//size_t segcount = 0;
@@ -197,14 +197,14 @@ void DepsgraphRelationBuilder::build_ik_pose(Object *ob,
 		 */
 		if (parchan != pchan) {
 			OperationKey parent_key(&ob->id, DEPSNODE_TYPE_BONE, parchan->name, DEG_OPCODE_BONE_READY);
-			add_relation(parent_key, solver_key, DEPSREL_TYPE_TRANSFORM, "IK Chain Parent");
+			add_relation(parent_key, solver_key, "IK Chain Parent");
 
 			OperationKey done_key(&ob->id, DEPSNODE_TYPE_BONE, parchan->name, DEG_OPCODE_BONE_DONE);
-			add_relation(solver_key, done_key, DEPSREL_TYPE_TRANSFORM, "IK Chain Result");
+			add_relation(solver_key, done_key, "IK Chain Result");
 		}
 		else {
 			OperationKey final_transforms_key(&ob->id, DEPSNODE_TYPE_BONE, parchan->name, DEG_OPCODE_BONE_DONE);
-			add_relation(solver_key, final_transforms_key, DEPSREL_TYPE_TRANSFORM, "IK Solver Result");
+			add_relation(solver_key, final_transforms_key, "IK Solver Result");
 		}
 		parchan->flag |= POSE_DONE;
 
@@ -220,7 +220,7 @@ void DepsgraphRelationBuilder::build_ik_pose(Object *ob,
 	}
 
 	OperationKey flush_key(&ob->id, DEPSNODE_TYPE_EVAL_POSE, DEG_OPCODE_POSE_DONE);
-	add_relation(solver_key, flush_key, DEPSREL_TYPE_OPERATION, "PoseEval Result-Bone Link");
+	add_relation(solver_key, flush_key, "PoseEval Result-Bone Link");
 }
 
 /* Spline IK Eval Steps */
@@ -238,7 +238,7 @@ void DepsgraphRelationBuilder::build_splineik_pose(Object *ob,
 	 * - assume that owner is always part of chain
 	 * - see notes on direction of rel below...
 	 */
-	add_relation(transforms_key, solver_key, DEPSREL_TYPE_TRANSFORM, "Spline IK Solver Owner");
+	add_relation(transforms_key, solver_key, "Spline IK Solver Owner");
 
 	/* attach path dependency to solver */
 	if (data->tar) {
@@ -249,12 +249,12 @@ void DepsgraphRelationBuilder::build_splineik_pose(Object *ob,
 		// TODO: the bigggest point here is that we need the curve PATH and not just the general geometry...
 		ComponentKey target_key(&data->tar->id, DEPSNODE_TYPE_GEOMETRY);
 		ComponentKey pose_key(&ob->id, DEPSNODE_TYPE_EVAL_POSE);
-		add_relation(target_key, pose_key, DEPSREL_TYPE_TRANSFORM, "[Curve.Path -> Spline IK] DepsRel");
+		add_relation(target_key, pose_key, "[Curve.Path -> Spline IK] DepsRel");
 	}
 
 	pchan->flag |= POSE_DONE;
 	OperationKey final_transforms_key(&ob->id, DEPSNODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_DONE);
-	add_relation(solver_key, final_transforms_key, DEPSREL_TYPE_TRANSFORM, "Spline IK Result");
+	add_relation(solver_key, final_transforms_key, "Spline IK Result");
 
 	root_map->add_bone(pchan->name, rootchan->name);
 
@@ -271,15 +271,15 @@ void DepsgraphRelationBuilder::build_splineik_pose(Object *ob,
 		 */
 		if (parchan != pchan) {
 			OperationKey parent_key(&ob->id, DEPSNODE_TYPE_BONE, parchan->name, DEG_OPCODE_BONE_READY);
-			add_relation(parent_key, solver_key, DEPSREL_TYPE_TRANSFORM, "Spline IK Solver Update");
+			add_relation(parent_key, solver_key, "Spline IK Solver Update");
 
 			OperationKey done_key(&ob->id, DEPSNODE_TYPE_BONE, parchan->name, DEG_OPCODE_BONE_DONE);
-			add_relation(solver_key, done_key, DEPSREL_TYPE_TRANSFORM, "IK Chain Result");
+			add_relation(solver_key, done_key, "IK Chain Result");
 		}
 		parchan->flag |= POSE_DONE;
 
 		OperationKey final_transforms_key(&ob->id, DEPSNODE_TYPE_BONE, parchan->name, DEG_OPCODE_BONE_DONE);
-		add_relation(solver_key, final_transforms_key, DEPSREL_TYPE_TRANSFORM, "Spline IK Solver Result");
+		add_relation(solver_key, final_transforms_key, "Spline IK Solver Result");
 
 		root_map->add_bone(parchan->name, rootchan->name);
 
@@ -289,7 +289,7 @@ void DepsgraphRelationBuilder::build_splineik_pose(Object *ob,
 	}
 
 	OperationKey flush_key(&ob->id, DEPSNODE_TYPE_EVAL_POSE, DEG_OPCODE_POSE_DONE);
-	add_relation(solver_key, flush_key, DEPSREL_TYPE_OPERATION, "PoseEval Result-Bone Link");
+	add_relation(solver_key, flush_key, "PoseEval Result-Bone Link");
 }
 
 /* Pose/Armature Bones Graph */
@@ -304,18 +304,18 @@ void DepsgraphRelationBuilder::build_rig(Scene *scene, Object *ob)
 	OperationKey init_key(&ob->id, DEPSNODE_TYPE_EVAL_POSE, DEG_OPCODE_POSE_INIT);
 	OperationKey flush_key(&ob->id, DEPSNODE_TYPE_EVAL_POSE, DEG_OPCODE_POSE_DONE);
 
-	add_relation(init_key, flush_key, DEPSREL_TYPE_COMPONENT_ORDER, "[Pose Init -> Pose Cleanup]");
+	add_relation(init_key, flush_key, "[Pose Init -> Pose Cleanup]");
 
 	/* Make sure pose is up-to-date with armature updates. */
 	OperationKey armature_key(&arm->id,
 	                          DEPSNODE_TYPE_PARAMETERS,
 	                          DEG_OPCODE_PLACEHOLDER,
 	                          "Armature Eval");
-	add_relation(armature_key, init_key, DEPSREL_TYPE_COMPONENT_ORDER, "Data dependency");
+	add_relation(armature_key, init_key, "Data dependency");
 
 	if (needs_animdata_node(&ob->id)) {
 		ComponentKey animation_key(&ob->id, DEPSNODE_TYPE_ANIMATION);
-		add_relation(animation_key, init_key, DEPSREL_TYPE_OPERATION, "Rig Animation");
+		add_relation(animation_key, init_key, "Rig Animation");
 	}
 
 	/* IK Solvers...
@@ -372,7 +372,7 @@ void DepsgraphRelationBuilder::build_rig(Scene *scene, Object *ob)
 		 */
 		ComponentKey pose_key(&ob->id, DEPSNODE_TYPE_EVAL_POSE);
 		ComponentKey local_transform_key(&ob->id, DEPSNODE_TYPE_TRANSFORM);
-		add_relation(local_transform_key, pose_key, DEPSREL_TYPE_TRANSFORM, "Local Transforms");
+		add_relation(local_transform_key, pose_key, "Local Transforms");
 	}
 
 
@@ -386,10 +386,10 @@ void DepsgraphRelationBuilder::build_rig(Scene *scene, Object *ob)
 		pchan->flag &= ~POSE_DONE;
 
 		/* pose init to bone local */
-		add_relation(init_key, bone_local_key, DEPSREL_TYPE_OPERATION, "PoseEval Source-Bone Link");
+		add_relation(init_key, bone_local_key, "PoseEval Source-Bone Link");
 
 		/* local to pose parenting operation */
-		add_relation(bone_local_key, bone_pose_key, DEPSREL_TYPE_OPERATION, "Bone Local - PoseSpace Link");
+		add_relation(bone_local_key, bone_pose_key, "Bone Local - PoseSpace Link");
 
 		/* parent relation */
 		if (pchan->parent != NULL) {
@@ -404,7 +404,7 @@ void DepsgraphRelationBuilder::build_rig(Scene *scene, Object *ob)
 			}
 
 			OperationKey parent_key(&ob->id, DEPSNODE_TYPE_BONE, pchan->parent->name, parent_key_opcode);
-			add_relation(parent_key, bone_pose_key, DEPSREL_TYPE_TRANSFORM, "[Parent Bone -> Child Bone]");
+			add_relation(parent_key, bone_pose_key, "[Parent Bone -> Child Bone]");
 		}
 
 		/* constraints */
@@ -414,15 +414,15 @@ void DepsgraphRelationBuilder::build_rig(Scene *scene, Object *ob)
 
 			/* pose -> constraints */
 			OperationKey constraints_key(&ob->id, DEPSNODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_CONSTRAINTS);
-			add_relation(bone_pose_key, constraints_key, DEPSREL_TYPE_OPERATION, "Constraints Stack");
+			add_relation(bone_pose_key, constraints_key, "Constraints Stack");
 
 			/* constraints -> ready */
 			// TODO: when constraint stack is exploded, this step should occur before the first IK solver
-			add_relation(constraints_key, bone_ready_key, DEPSREL_TYPE_OPERATION, "Constraints -> Ready");
+			add_relation(constraints_key, bone_ready_key, "Constraints -> Ready");
 		}
 		else {
 			/* pose -> ready */
-			add_relation(bone_pose_key, bone_ready_key, DEPSREL_TYPE_OPERATION, "Pose -> Ready");
+			add_relation(bone_pose_key, bone_ready_key, "Pose -> Ready");
 		}
 
 		/* bone ready -> done
@@ -430,10 +430,10 @@ void DepsgraphRelationBuilder::build_rig(Scene *scene, Object *ob)
 		 *       For IK chains however, an additional rel is created from IK to done,
 		 *       with transitive reduction removing this one...
 		 */
-		add_relation(bone_ready_key, bone_done_key, DEPSREL_TYPE_OPERATION, "Ready -> Done");
+		add_relation(bone_ready_key, bone_done_key, "Ready -> Done");
 
 		/* assume that all bones must be done for the pose to be ready (for deformers) */
-		add_relation(bone_done_key, flush_key, DEPSREL_TYPE_OPERATION, "PoseEval Result-Bone Link");
+		add_relation(bone_done_key, flush_key, "PoseEval Result-Bone Link");
 	}
 }
 
@@ -445,10 +445,10 @@ void DepsgraphRelationBuilder::build_proxy_rig(Object *ob)
 		OperationKey bone_local_key(&ob->id, DEPSNODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_LOCAL);
 		OperationKey bone_ready_key(&ob->id, DEPSNODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_READY);
 		OperationKey bone_done_key(&ob->id, DEPSNODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_DONE);
-		add_relation(pose_init_key, bone_local_key, DEPSREL_TYPE_OPERATION, "Pose Init -> Bone Local");
-		add_relation(bone_local_key, bone_ready_key, DEPSREL_TYPE_OPERATION, "Local -> Ready");
-		add_relation(bone_ready_key, bone_done_key, DEPSREL_TYPE_OPERATION, "Ready -> Done");
-		add_relation(bone_done_key, pose_done_key, DEPSREL_TYPE_OPERATION, "Bone Done -> Pose Done");
+		add_relation(pose_init_key, bone_local_key, "Pose Init -> Bone Local");
+		add_relation(bone_local_key, bone_ready_key, "Local -> Ready");
+		add_relation(bone_ready_key, bone_done_key, "Ready -> Done");
+		add_relation(bone_done_key, pose_done_key, "Bone Done -> Pose Done");
 	}
 }