diff options
| author | Martin Poirier <theeth@yahoo.com> | 2004-04-04 20:20:49 +0400 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2004-04-04 20:20:49 +0400 |
| commit | 9bb2ad02ad0c1f15d9326b308bd07ddf701fcfa1 (patch) | |
| tree | 5082eeb64138012f73a8913b6d09c29d06ad50cb /source | |
| parent | 05707df10cb9054ff0d7d9202f475bcb6a748c70 (diff) | |
Fix for bug #1109 FollowPath not working with motion blur
http://projects.blender.org/tracker/index.php?func=detail&aid=1109&group_id=9&atid=125
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 053034d9620..c50e654465e 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -306,7 +306,6 @@ void Mat4BlendMat4(float out[][4], float dst[][4], float src[][4], float srcweig float qmat[3][3], smat[3][3]; int i; - dstweight = 1.0F-srcweight; Mat3CpyMat4(mat3, dst); @@ -633,7 +632,7 @@ short get_constraint_target (bConstraint *con, short ownertype, void* ownerdata, if(cu->path==0 || cu->path->data==0) calc_curvepath(data->tar); - curvetime = ctime - data->offset; + curvetime= bsystem_time(data->tar, data->tar->parent, (float)ctime, 0.0) - data->offset; if(calc_ipo_spec(cu->ipo, CU_SPEED, &curvetime)==0) { curvetime /= cu->pathlen; @@ -933,8 +932,6 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype, Mat4CpyMat4(tmat, ob->obmat); Mat4MulMat34(ob->obmat, totmat, tmat); - - } } break; |