Depsgraph: Remove workarounds used for cyclic dependencies

This was dangerous to do such calculations, and now it is solvable by making
dependency graph more granular in this case. Removing the workaround also saves
us a hassle of passing lots of extra arguments down the evaluation routines.

In theory, we can also remove EvaluationCOntext from constraints evaluation as
well now. But probably better to wait with such removal for now.

This commit effectively reverts 1130c53. Will do a proper fix in dependency
graph itself.

1 files changed, 9 insertions, 17 deletions

diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 0f26f53113f..d92d0d9edbf 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -66,11 +66,6 @@
 
 #include "BKE_deform.h"
 
-/* Workaround for cyclic dependency with curves.
- * In such case curve_cache might not be ready yet,
- */
-#define CYCLIC_DEPENDENCY_WORKAROUND
-
 int BKE_lattice_index_from_uvw(Lattice *lt,
                                const int u, const int v, const int w)
 {
@@ -603,7 +598,7 @@ static bool where_on_path_deform(Object *ob, float ctime, float vec[4], float di
 /* co: local coord, result local too */
 /* returns quaternion for rotation, using cd->no_rot_axis */
 /* axis is using another define!!! */
-static bool calc_curve_deform(const struct EvaluationContext *eval_ctx, Scene *scene, Object *par, float co[3],
+static bool calc_curve_deform(Object *par, float co[3],
                               const short axis, CurveDeform *cd, float r_quat[4])
 {
 	Curve *cu = par->data;
@@ -611,12 +606,10 @@ static bool calc_curve_deform(const struct EvaluationContext *eval_ctx, Scene *s
 	short index;
 	const bool is_neg_axis = (axis > 2);
 
-	/* to be sure, mostly after file load, also cyclic dependencies */
-#ifdef CYCLIC_DEPENDENCY_WORKAROUND
 	if (par->curve_cache == NULL) {
-		BKE_displist_make_curveTypes(eval_ctx, scene, par, false);
+		/* Happens with a cyclic dependencies. */
+		return false;
 	}
-#endif
 
 	if (par->curve_cache->path == NULL) {
 		return false;  /* happens on append, cyclic dependencies and empty curves */
@@ -707,7 +700,6 @@ static bool calc_curve_deform(const struct EvaluationContext *eval_ctx, Scene *s
 }
 
 void curve_deform_verts(
-        const struct EvaluationContext *eval_ctx, Scene *scene,
         Object *cuOb, Object *target, DerivedMesh *dm, float (*vertexCos)[3],
         int numVerts, const char *vgroup, short defaxis)
 {
@@ -767,7 +759,7 @@ void curve_deform_verts(
 				if (weight > 0.0f) {
 					mul_m4_v3(cd.curvespace, vertexCos[a]);
 					copy_v3_v3(vec, vertexCos[a]);
-					calc_curve_deform(eval_ctx, scene, cuOb, vec, defaxis, &cd, NULL);
+					calc_curve_deform(cuOb, vec, defaxis, &cd, NULL);
 					interp_v3_v3v3(vertexCos[a], vertexCos[a], vec, weight);
 					mul_m4_v3(cd.objectspace, vertexCos[a]);
 				}
@@ -790,7 +782,7 @@ void curve_deform_verts(
 				if (weight > 0.0f) {
 					/* already in 'cd.curvespace', prev for loop */
 					copy_v3_v3(vec, vertexCos[a]);
-					calc_curve_deform(eval_ctx, scene, cuOb, vec, defaxis, &cd, NULL);
+					calc_curve_deform(cuOb, vec, defaxis, &cd, NULL);
 					interp_v3_v3v3(vertexCos[a], vertexCos[a], vec, weight);
 					mul_m4_v3(cd.objectspace, vertexCos[a]);
 				}
@@ -801,7 +793,7 @@ void curve_deform_verts(
 		if (cu->flag & CU_DEFORM_BOUNDS_OFF) {
 			for (a = 0; a < numVerts; a++) {
 				mul_m4_v3(cd.curvespace, vertexCos[a]);
-				calc_curve_deform(eval_ctx, scene, cuOb, vertexCos[a], defaxis, &cd, NULL);
+				calc_curve_deform(cuOb, vertexCos[a], defaxis, &cd, NULL);
 				mul_m4_v3(cd.objectspace, vertexCos[a]);
 			}
 		}
@@ -816,7 +808,7 @@ void curve_deform_verts(
 	
 			for (a = 0; a < numVerts; a++) {
 				/* already in 'cd.curvespace', prev for loop */
-				calc_curve_deform(eval_ctx, scene, cuOb, vertexCos[a], defaxis, &cd, NULL);
+				calc_curve_deform(cuOb, vertexCos[a], defaxis, &cd, NULL);
 				mul_m4_v3(cd.objectspace, vertexCos[a]);
 			}
 		}
@@ -826,7 +818,7 @@ void curve_deform_verts(
 /* input vec and orco = local coord in armature space */
 /* orco is original not-animated or deformed reference point */
 /* result written in vec and mat */
-void curve_deform_vector(const struct EvaluationContext *eval_ctx, Scene *scene, Object *cuOb, Object *target,
+void curve_deform_vector(Object *cuOb, Object *target,
                          float orco[3], float vec[3], float mat[3][3], int no_rot_axis)
 {
 	CurveDeform cd;
@@ -845,7 +837,7 @@ void curve_deform_vector(const struct EvaluationContext *eval_ctx, Scene *scene,
 
 	mul_m4_v3(cd.curvespace, vec);
 	
-	if (calc_curve_deform(eval_ctx, scene, cuOb, vec, target->trackflag, &cd, quat)) {
+	if (calc_curve_deform(cuOb, vec, target->trackflag, &cd, quat)) {
 		float qmat[3][3];
 		
 		quat_to_mat3(qmat, quat);