diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-08-04 04:15:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-04 04:15:25 +0400 |
commit | 7848bf00b8fa2789f80b10f423c255f4aa4b5852 (patch) | |
tree | 960e4cb1f60f141210fa87489f36a186a7d36e41 | |
parent | 784c99f53c1dbc27e5ffa04bda2410d74ce6d43a (diff) |
Correct cu->pathlen treated as a float
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 5281b0b9b74..98a197b9e02 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1994,17 +1994,20 @@ static void ob_parcurve(Scene *scene, Object *ob, Object *par, float mat[4][4]) * we divide the curvetime calculated in the previous step by the length of the path, to get a time * factor, which then gets clamped to lie within 0.0 - 1.0 range */ - if (IS_EQF(cu->pathlen, 0.0f) == 0) + if (cu->pathlen) { ctime = cu->ctime / cu->pathlen; - else + } + else { ctime = cu->ctime; + } CLAMP(ctime, 0.0f, 1.0f); } else { ctime = BKE_scene_frame_get(scene); - if (IS_EQF(cu->pathlen, 0.0f) == 0) + if (cu->pathlen) { ctime /= cu->pathlen; + } CLAMP(ctime, 0.0f, 1.0f); } |