From cf2baa585cc8788b29147d6e34fa8c46609e5bf9 Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Thu, 8 Apr 2021 15:51:08 +0200 Subject: Fix T81707: Spline IK Joints "Floating" above curve The issue was that where_on_path uses a resampled curve to get the data from the curve. This leads to disconnects between the curve the user sees and the evaluated location data. To fix this we simply use the actual curve data the user can see. The older code needed a cleanup either way as there were hacks in other parts of the code trying to work around some brokenness. This is now fixed and we no longer need to clamp the evaluation range to 0-1 or make helper functions to make it do what we actually want. Reviewed By: Campbell, Sybren Differential Revision: http://developer.blender.org/D10898 --- source/blender/modifiers/intern/MOD_array.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/modifiers') diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index b48bf722526..0282f0d2934 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -39,6 +39,7 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "BKE_anim_path.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_displist.h" @@ -471,9 +472,9 @@ static Mesh *arrayModifier_doArray(ArrayModifierData *amd, if (amd->fit_type == MOD_ARR_FITCURVE && amd->curve_ob != NULL) { Object *curve_ob = amd->curve_ob; CurveCache *curve_cache = curve_ob->runtime.curve_cache; - if (curve_cache != NULL && curve_cache->path != NULL) { + if (curve_cache != NULL && curve_cache->anim_path_accum_length != NULL) { float scale_fac = mat4_to_scale(curve_ob->obmat); - length = scale_fac * curve_cache->path->totdist; + length = scale_fac * BKE_anim_path_get_length(curve_cache); } } -- cgit v1.2.3