diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-01 13:31:13 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-01 13:31:13 +0400 |
commit | 4aa82806effa9e114f14f88d7b2da23b0a2bcca6 (patch) | |
tree | 6741012808ab0c83f96ff7e52c8168cb62b8c8b7 /source/blender/blenkernel/intern/anim.c | |
parent | 35678eaae52a8436469b06307eaaf4d8503863f1 (diff) | |
parent | ed0d2b5e9205fc99ed38957f01acaa62c3811333 (diff) |
svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_loop.c from this range still
Diffstat (limited to 'source/blender/blenkernel/intern/anim.c')
-rw-r--r-- | source/blender/blenkernel/intern/anim.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 82c9b0c4691..11700d7f072 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -586,11 +586,14 @@ int interval_test(int min, int max, int p1, int cycl) } -/* calculate the deformation implied by the curve path at a given parametric position, and returns whether this operation succeeded - * - *vec needs FOUR items! - * - ctime is normalized range <0-1> +/* calculate the deformation implied by the curve path at a given parametric position, + * and returns whether this operation succeeded. + * + * note: ctime is normalized range <0-1> + * + * returns OK: 1/0 */ -int where_on_path(Object *ob, float ctime, float *vec, float *dir, float *quat, float *radius, float *weight) /* returns OK */ +int where_on_path(Object *ob, float ctime, float vec[4], float dir[3], float quat[4], float *radius, float *weight) { Curve *cu; Nurb *nu; |