diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-04 02:58:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-04 02:58:05 +0400 |
| commit | 70b74022528868342836fe0ea2bba573d350e260 (patch) | |
| tree | 636ae77810d5ab028fcc1f20f748dfb2f890bd45 /source/blender/blenkernel/intern/constraint.c | |
| parent | a9dc6038e07c550f5968d2adcc6d441e4992929b (diff) | |
| parent | 224c26f891cb2495a0d94a092e46f13784af6e6b (diff) | |
svn merge -r41480:41503 ^/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/intern/constraint.c')
| -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 2de44cad640..21d84245610 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -1256,10 +1256,7 @@ static void followpath_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstr float quat[4]; if ((data->followflag & FOLLOWPATH_STATIC) == 0) { /* animated position along curve depending on time */ - if (cob->scene) - curvetime= bsystem_time(cob->scene, ct->tar, cu->ctime, 0.0) - data->offset; - else - curvetime= cu->ctime - data->offset; + curvetime= cu->ctime - data->offset; /* ctime is now a proper var setting of Curve which gets set by Animato like any other var that's animated, * but this will only work if it actually is animated... |